Changeset 1248

Timestamp:

Sep 9, 2011, 2:15:30 PM (13 years ago)

Author:

Sam Habiel

Message:

Scheduling v 1.61. Dll and exes. Added new control to handle print previewing; control located in PrintPreview.dll.
PrintPreview.dll is now added to project.
DPatientLetter.cs now uses the new print preview control.

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• AssemblyInfo.cs (modified) (2 diffs)
• ClinicalScheduling.csproj (modified) (1 diff)
• ClinicalScheduling.csproj.user (modified) (1 diff)
• ClinicalScheduling.sln (modified) (2 diffs)
• ClinicalScheduling.suo (modified) ( previous)
• DPatientLetter.cs (modified) (7 diffs)
• bin/Release/BMXNet23.dll (modified) ( previous)
• bin/Release/ClinicalScheduling.exe (modified) ( previous)
• bin/Release/PrintPreview.dll (added)
• bin/Release/ar/ClinicalScheduling.resources.dll (modified) ( previous)

Scheduling/trunk/cs/bsdx0200GUISourceCode/AssemblyInfo.cs

@@ -28 +28 @@
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.6.0.*")]
+[assembly: AssemblyVersion("1.6.1.*")]
 
 //
@@ -58 +58 @@
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("1.6.0.0")]
+[assembly: AssemblyFileVersionAttribute("1.6.1.0")]
 [assembly: ComVisibleAttribute(false)]

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj

@@ -483 +483 @@
       <Name>BMXNet</Name>
     </ProjectReference>
+    <ProjectReference Include="..\EnhancedPrintPreview2\PrintPreview\PrintPreview.csproj">
+      <Project>{9E8D433B-EFD1-4253-BD2C-C4E0DB0BFD0E}</Project>
+      <Name>PrintPreview</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -37 +37 @@
     </RemoteDebugMachine>
     <StartAction>Project</StartAction>
-    <StartArguments>/s=172.16.16.108 /p=9250 /a=sal,123 /v=abc.123@</StartArguments>
+    <StartArguments>/s=10.10.10.103 /p=9260 /a=shabiel12 /v=catdog.66</StartArguments>
     <StartPage>
     </StartPage>

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln

@@ -4 +4 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMXNet", "..\BMX2\BMXNet\BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrintPreview", "..\EnhancedPrintPreview2\PrintPreview\PrintPreview.csproj", "{9E8D433B-EFD1-4253-BD2C-C4E0DB0BFD0E}"
 EndProject
 Global
@@ -19 +21 @@
                 {DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}.Release|Any CPU.Build.0 = Release|Any CPU
+                {9E8D433B-EFD1-4253-BD2C-C4E0DB0BFD0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {9E8D433B-EFD1-4253-BD2C-C4E0DB0BFD0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {9E8D433B-EFD1-4253-BD2C-C4E0DB0BFD0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {9E8D433B-EFD1-4253-BD2C-C4E0DB0BFD0E}.Release|Any CPU.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

Scheduling/trunk/cs/bsdx0200GUISourceCode/DPatientLetter.cs

@@ -10 +10 @@
         /// Handles Printing of letters (Reminder, Rebook, Cancellation) and a Report. Contains a Print Preview dialog.
         /// </summary>
-        public class DPatientLetter : System.Windows.Forms.PrintPreviewDialog
+        public class DPatientLetter : VR.PrintPreview.EnhancedPrintPreviewDialog
     {
                 /// <summary>
@@ -111 +111 @@
                 _dsApptDisplay.BSDXResource.Merge(Resources);
 
-                this.PrintPreviewControl.Document = printAppts;
+                this.Document = printAppts;
             }
                         catch (Exception ex)
@@ -152 +152 @@
                         }
 
-            PrintPreviewControl.Document = printRebookLetters;
+            this.Document = printRebookLetters;
 
                 }
@@ -185 +185 @@
             }
 
-            PrintPreviewControl.Document = printRebookLetters;
+            this.Document = printRebookLetters;
         }
 
@@ -214 +214 @@
                 _dsRebookAppts.BSDXResource.Merge(Resources);
                 
-                PrintPreviewControl.Document = printCancelLetters;
+                this.Document = printCancelLetters;
 
                         }
@@ -256 +256 @@
                 _dsApptDisplay.BSDXResource.Merge(Resources);
 
-                this.PrintPreviewControl.Document = printReminderLetters;
+                this.Document = printReminderLetters;
                                 
                         }
@@ -297 +297 @@
 
         private void printAppts_PrintPage(object sender, System.Drawing.Printing.PrintPageEventArgs e)
-        {
+        {            
             //Each time we enter here, we start off with a new page number - we start off with zero
             _pageNumber++; //becomes one first time through