Changeset 884

Timestamp:

Jul 18, 2010, 8:27:35 AM (14 years ago)

Author:

Sam Habiel

Message:

Merged Changes from branch 1.2.1 to new version 1.3.
Changed version from 1.2 to 1.3.

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• AssemblyInfo.cs (modified) (2 diffs)
• ClinicalScheduling.csproj (modified) (2 diffs)
• ClinicalScheduling.csproj.user (modified) (2 diffs)
• ClinicalScheduling.sln (modified) (1 diff)
• ClinicalScheduling.suo (modified) ( previous)
• DPatientLetter.cs (modified) (4 diffs)

Scheduling/trunk/cs/bsdx0200GUISourceCode/AssemblyInfo.cs

@@ -28 +28 @@
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyVersion("1.3.*")]
 
 //
@@ -58 +58 @@
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("1.2.0.0")]
+[assembly: AssemblyFileVersionAttribute("1.3.0.0")]
 [assembly: ComVisibleAttribute(false)]

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj

@@ -97 +97 @@
     <NoWarn>
     </NoWarn>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <RegisterForComInterop>false</RegisterForComInterop>
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
@@ -429 +429 @@
   </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>

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user

@@ -36 +36 @@
     </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>
@@ -55 +55 @@
     </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>

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln

@@ -4 +4 @@
 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

Scheduling/trunk/cs/bsdx0200GUISourceCode/DPatientLetter.cs

@@ -317 +317 @@
                 _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;
         }
 
@@ -336 +343 @@
                 _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; 
             
         }
@@ -357 +370 @@
                 _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; 
         }
 
@@ -379 +396 @@
                 _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; 
         }
         }