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.
This commit is contained in:
parent
b06f6af3c7
commit
a4b56e9080
|
@ -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.6.0.*")]
|
||||
[assembly: AssemblyVersion("1.6.1.*")]
|
||||
|
||||
//
|
||||
// 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.6.0.0")]
|
||||
[assembly: AssemblyFileVersionAttribute("1.6.1.0")]
|
||||
[assembly: ComVisibleAttribute(false)]
|
||||
|
|
|
@ -482,6 +482,10 @@
|
|||
<Project>{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}</Project>
|
||||
<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" />
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
<RemoteDebugMachine>
|
||||
</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>
|
||||
<StartProgram>C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe</StartProgram>
|
||||
|
|
|
@ -4,6 +4,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClinicalScheduling", "Clini
|
|||
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
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
@ -18,6 +20,10 @@ Global
|
|||
{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{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
|
||||
HideSolutionNode = FALSE
|
||||
|
|
Binary file not shown.
|
@ -9,7 +9,7 @@ namespace IndianHealthService.ClinicalScheduling
|
|||
/// <summary>
|
||||
/// 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>
|
||||
/// Required designer variable.
|
||||
|
@ -110,7 +110,7 @@ namespace IndianHealthService.ClinicalScheduling
|
|||
_dsApptDisplay.PatientAppts.Merge(PatientAppts);
|
||||
_dsApptDisplay.BSDXResource.Merge(Resources);
|
||||
|
||||
this.PrintPreviewControl.Document = printAppts;
|
||||
this.Document = printAppts;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
@ -151,7 +151,7 @@ namespace IndianHealthService.ClinicalScheduling
|
|||
throw ex;
|
||||
}
|
||||
|
||||
PrintPreviewControl.Document = printRebookLetters;
|
||||
this.Document = printRebookLetters;
|
||||
|
||||
}
|
||||
|
||||
|
@ -184,7 +184,7 @@ namespace IndianHealthService.ClinicalScheduling
|
|||
throw ex;
|
||||
}
|
||||
|
||||
PrintPreviewControl.Document = printRebookLetters;
|
||||
this.Document = printRebookLetters;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -213,7 +213,7 @@ namespace IndianHealthService.ClinicalScheduling
|
|||
_dsRebookAppts.PatientAppts.Merge(PatientAppts);
|
||||
_dsRebookAppts.BSDXResource.Merge(Resources);
|
||||
|
||||
PrintPreviewControl.Document = printCancelLetters;
|
||||
this.Document = printCancelLetters;
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -255,7 +255,7 @@ namespace IndianHealthService.ClinicalScheduling
|
|||
_dsApptDisplay.PatientAppts.Merge(PatientAppts);
|
||||
_dsApptDisplay.BSDXResource.Merge(Resources);
|
||||
|
||||
this.PrintPreviewControl.Document = printReminderLetters;
|
||||
this.Document = printReminderLetters;
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -296,7 +296,7 @@ namespace IndianHealthService.ClinicalScheduling
|
|||
|
||||
|
||||
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
|
||||
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue