iSharkFly-Open
/
VistA-Scheduling
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged Changes from branch 1.2.1 to new version 1.3. 

Changed version from 1.2 to 1.3.
This commit is contained in:
sam 2010-07-18 12:27:35 +00:00
parent 45867dd2cf
commit f7635c7adb
6 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cs/bsdx0200GUISourceCode/AssemblyInfo.cs
View File

@ -27,7 +27,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.*")]
[assembly: AssemblyVersion("1.3.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@ -57,5 +57,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
[assembly: AssemblyFileVersionAttribute("1.2.0.0")]
[assembly: AssemblyFileVersionAttribute("1.3.0.0")]
[assembly: ComVisibleAttribute(false)]

4
cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj
View File

@ -96,7 +96,7 @@
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>true</Optimize>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@ -428,7 +428,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\bmx_rep\BMX2\BMXNet\BMXNet.csproj">
<ProjectReference Include="..\..\..\BMX\bmx_0200scr\BMX2\BMXNet\BMXNet.csproj">
<Project>{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}</Project>
<Name>BMXNet</Name>
</ProjectReference>

4
cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user
View File

@ -35,7 +35,7 @@
<RemoteDebugMachine>
</RemoteDebugMachine>
<StartAction>Project</StartAction>
<StartArguments>/s=192.168.254.129 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256</StartArguments>
<StartArguments>/s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments>
<StartPage>
</StartPage>
<StartProgram>C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe</StartProgram>
@ -54,7 +54,7 @@
<RemoteDebugMachine>
</RemoteDebugMachine>
<StartAction>Project</StartAction>
<StartArguments>/s=192.168.254.129 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256</StartArguments>
<StartArguments>/s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments>
<StartPage>
</StartPage>
<StartProgram>

2
cs/bsdx0200GUISourceCode/ClinicalScheduling.sln
View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C# Express 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClinicalScheduling", "ClinicalScheduling.csproj", "{8C05C4F7-FE81-479F-87A0-44E04C7F6E0F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMXNet", "..\..\..\bmx_rep\BMX2\BMXNet\BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMXNet", "..\..\..\BMX\bmx_0200scr\BMX2\BMXNet\BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

BIN
cs/bsdx0200GUISourceCode/ClinicalScheduling.suo
View File

Binary file not shown.

26
cs/bsdx0200GUISourceCode/DPatientLetter.cs
View File

@ -316,7 +316,14 @@ namespace IndianHealthService.ClinicalScheduling
//reset _currentApptPrinting
_currentApptPrinting = 0;
e.HasMorePages = true;
}
return;
}
// if neither of these conditions is true, then we are done with printing.
// So reset counters for next one. Fixes ticket #15 on https://trac.opensourcevista.net/ticket/15
_currentResourcePrinting = 0;
_currentApptPrinting = 0;
_pageNumber = 0;
}
private void printReminderLetters_PrintPage(object sender, PrintPageEventArgs e)
@ -335,8 +342,14 @@ namespace IndianHealthService.ClinicalScheduling
ClinicalScheduling.Printing.PrintReminderLetter(_dsApptDisplay.PatientAppts[_currentApptPrinting], e, c.LETTER_TEXT, "Reminder Letter");
_currentApptPrinting++;
if (_currentApptPrinting < _dsApptDisplay.PatientAppts.Count)
{
e.HasMorePages = true;
return;
}
}
// If we reach this point, we need to reset the counter (ticket #15 on https://trac.opensourcevista.net/ticket/15)
_currentApptPrinting = 0;
}
@ -356,9 +369,13 @@ namespace IndianHealthService.ClinicalScheduling
ClinicalScheduling.Printing.PrintCancelLetter(_dsRebookAppts.PatientAppts[_currentApptPrinting], e, c.CLINIC_CANCELLATION_LETTER, "Cancellation Letter");
_currentApptPrinting++;
if (_currentApptPrinting < _dsRebookAppts.PatientAppts.Count)
{
e.HasMorePages = true;
return;
}
}
// If we reach this point, we need to reset the counter (ticket #15 on https://trac.opensourcevista.net/ticket/15)
_currentApptPrinting = 0;
}
private void printRebookLetters_PrintPage(object sender, PrintPageEventArgs e)
@ -378,8 +395,13 @@ namespace IndianHealthService.ClinicalScheduling
ClinicalScheduling.Printing.PrintRebookLetter(_dsRebookAppts.PatientAppts[_currentApptPrinting], e, c.NO_SHOW_LETTER, "Rebook Letter");
_currentApptPrinting++;
if (_currentApptPrinting < _dsRebookAppts.PatientAppts.Count)
{
e.HasMorePages = true;
return;
}
}
// If we reach this point, we need to reset the counter (ticket #15 on https://trac.opensourcevista.net/ticket/15)
_currentApptPrinting = 0;
}
}
}