diff --git a/cs/bsdx0200GUISourceCode/AssemblyInfo.cs b/cs/bsdx0200GUISourceCode/AssemblyInfo.cs
index a2b2e74..be803a1 100644
--- a/cs/bsdx0200GUISourceCode/AssemblyInfo.cs
+++ b/cs/bsdx0200GUISourceCode/AssemblyInfo.cs
@@ -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)]
diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj
index f9044dc..70a2686 100644
--- a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj
+++ b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj
@@ -96,7 +96,7 @@
false
- true
+ false
false
false
false
@@ -428,7 +428,7 @@
-
+
{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}
BMXNet
diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user
index fd8e75c..944ade4 100644
--- a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user
+++ b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user
@@ -35,7 +35,7 @@
Project
- /s=192.168.254.129 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256
+ /s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256
C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe
@@ -54,7 +54,7 @@
Project
- /s=192.168.254.129 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256
+ /s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256
diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln b/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln
index 52cd3e1..3bc7432 100644
--- a/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln
+++ b/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln
@@ -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
diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.suo b/cs/bsdx0200GUISourceCode/ClinicalScheduling.suo
index c3451c8..11b7360 100644
Binary files a/cs/bsdx0200GUISourceCode/ClinicalScheduling.suo and b/cs/bsdx0200GUISourceCode/ClinicalScheduling.suo differ
diff --git a/cs/bsdx0200GUISourceCode/DPatientLetter.cs b/cs/bsdx0200GUISourceCode/DPatientLetter.cs
index 4187039..f8e8cf3 100644
--- a/cs/bsdx0200GUISourceCode/DPatientLetter.cs
+++ b/cs/bsdx0200GUISourceCode/DPatientLetter.cs
@@ -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;
}
}
}