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

Fixes for i18n.

This commit is contained in:
sam 2010-07-13 13:07:11 +00:00
parent afe56d8b84
commit 8f926bf537
9 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cs/bsdx0200GUISourceCode/CGAVDocument.cs
View File

@ -219,8 +219,11 @@ namespace IndianHealthService.ClinicalScheduling
string sTypeID; string sTypeID;
string sSlots; string sSlots;
sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm"); //sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm");
sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm"); //sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm");
// i18n support
sStart = FMDateTime.Create(rApptInfo.StartTime).FMDateString;
sEnd = FMDateTime.Create(rApptInfo.EndTime).FMDateString;
sNote = rApptInfo.Note; sNote = rApptInfo.Note;
sResource = rApptInfo.Resource; sResource = rApptInfo.Resource;
sTypeID = rApptInfo.AccessTypeID.ToString(); sTypeID = rApptInfo.AccessTypeID.ToString();
@ -233,7 +236,7 @@ namespace IndianHealthService.ClinicalScheduling
aCopy.IsAccessBlock = true; aCopy.IsAccessBlock = true;
string sSql = "BSDX ADD NEW AVAILABILITY^" + sStart + "^" + sEnd + "^" + sTypeID + "^" + sResource + "^" + sSlots + "^" + sNote; string sSql = "BSDX ADD NEW AVAILABILITY^" + sStart + "^" + sEnd + "^" + sTypeID + "^" + sResource + "^" + sSlots + "^" + sNote;
DataTable dtAppt =m_DocManager.RPMSDataTable(sSql, "NewAvailability"); DataTable dtAppt = m_DocManager.RPMSDataTable(sSql, "NewAvailability");
int nApptID; int nApptID;
int nErrorID; int nErrorID;
@ -272,8 +275,11 @@ namespace IndianHealthService.ClinicalScheduling
string sTypeID; string sTypeID;
string sSlots; string sSlots;
sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm"); //sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm");
sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm"); //sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm");
// i18n support
sStart = FMDateTime.Create(rApptInfo.StartTime).FMDateString;
sEnd = FMDateTime.Create(rApptInfo.EndTime).FMDateString;
sNote = rApptInfo.Note; sNote = rApptInfo.Note;
sResource = rApptInfo.Resource; sResource = rApptInfo.Resource;
sTypeID = rApptInfo.AccessTypeID.ToString(); sTypeID = rApptInfo.AccessTypeID.ToString();

8
cs/bsdx0200GUISourceCode/CGAVView.cs
View File

@ -1008,9 +1008,11 @@ namespace IndianHealthService.ClinicalScheduling
for (int j=1; j < nWeeksToApply + 1; j++) for (int j=1; j < nWeeksToApply + 1; j++)
{ {
//Convert start and end to string //Convert start and end to string
string sStart = dtStart.ToString("M/d/yyyy"); //string sStart = dtStart.ToString("M/d/yyyy");
string sEnd = dtEnd.ToString("M/d/yyyy"); //string sEnd = dtEnd.ToString("M/d/yyyy");
//i18n
string sStart = FMDateTime.Create(dtStart).DateOnly.FMDateString;
string sEnd = FMDateTime.Create(dtEnd).DateOnly.FMDateString;
//Cancel all existing access blocks in the date range //Cancel all existing access blocks in the date range
string sSql = "BSDX CANCEL AV BY DATE^" + sResourceID + "^" + sStart + "^" + sEnd; string sSql = "BSDX CANCEL AV BY DATE^" + sResourceID + "^" + sStart + "^" + sEnd;
dt = this.m_DocManager.RPMSDataTable(sSql, "Cancelled"); dt = this.m_DocManager.RPMSDataTable(sSql, "Cancelled");

17
cs/bsdx0200GUISourceCode/CGDocument.cs
View File

@ -719,8 +719,13 @@ namespace IndianHealthService.ClinicalScheduling
string sLen; string sLen;
string sApptID; string sApptID;
sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm"); //sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm");
sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm"); //sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm");
// i18n code -- Use culture neutral FMDates
sStart = FMDateTime.Create(rApptInfo.StartTime).FMDateString;
sEnd = FMDateTime.Create(rApptInfo.EndTime).FMDateString;
TimeSpan sp = rApptInfo.EndTime - rApptInfo.StartTime; TimeSpan sp = rApptInfo.EndTime - rApptInfo.StartTime;
sLen = sp.TotalMinutes.ToString(); sLen = sp.TotalMinutes.ToString();
sPatID = rApptInfo.PatientID.ToString(); sPatID = rApptInfo.PatientID.ToString();
@ -911,10 +916,12 @@ namespace IndianHealthService.ClinicalScheduling
bool bFound = false; bool bFound = false;
DateTime dStart = a.StartTime.AddDays(nMinimumDays); DateTime dStart = a.StartTime.AddDays(nMinimumDays);
// v 1.3 i18n support - FM Date passed insated of American Date
string sStart = FMDateTime.Create(dStart).DateOnly.FMDateString;
DateTime dEnd = dStart.AddDays(nIncrement); DateTime dEnd = dStart.AddDays(nIncrement);
do do
{ {
string sSql = "BSDX REBOOK NEXT BLOCK^" + dStart.ToString("M/d/yyyy@H:mm")+ "^" + a.Resource + "^" + nAVType.ToString(); string sSql = "BSDX REBOOK NEXT BLOCK^" + sStart + "^" + a.Resource + "^" + nAVType.ToString();
DataTable dtNextBlock = this.DocManager.RPMSDataTable(sSql, "NextBlock"); DataTable dtNextBlock = this.DocManager.RPMSDataTable(sSql, "NextBlock");
Debug.Assert(dtNextBlock.Rows.Count == 1); Debug.Assert(dtNextBlock.Rows.Count == 1);
DataRow drNextBlockRow = dtNextBlock.Rows[0]; DataRow drNextBlockRow = dtNextBlock.Rows[0];
@ -992,7 +999,9 @@ namespace IndianHealthService.ClinicalScheduling
private void SetAutoRebook(CGAppointment a, DateTime dtRebookedTo) private void SetAutoRebook(CGAppointment a, DateTime dtRebookedTo)
{ {
string sApptKey = a.AppointmentKey.ToString(); string sApptKey = a.AppointmentKey.ToString();
string sRebookedTo = dtRebookedTo.ToString("M/d/yyyy@HH:mm"); //string sRebookedTo = dtRebookedTo.ToString("M/d/yyyy@HH:mm");
// i18n
string sRebookedTo = FMDateTime.Create(dtRebookedTo).FMDateString;
string sSql = "BSDX REBOOK SET^" + sApptKey + "^" + sRebookedTo; string sSql = "BSDX REBOOK SET^" + sApptKey + "^" + sRebookedTo;
System.Data.DataTable dtRebook = m_DocManager.RPMSDataTable(sSql, "AutoRebook"); System.Data.DataTable dtRebook = m_DocManager.RPMSDataTable(sSql, "AutoRebook");

2
cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj
View File

@ -432,7 +432,7 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\BMX\bmx_0200scr\BMX2\BMXNet\BMXNet.csproj"> <ProjectReference Include="..\..\..\bmx_rep\BMX2\BMXNet\BMXNet.csproj">
<Project>{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}</Project> <Project>{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}</Project>
<Name>BMXNet</Name> <Name>BMXNet</Name>
</ProjectReference> </ProjectReference>

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

@ -35,7 +35,7 @@
<RemoteDebugMachine> <RemoteDebugMachine>
</RemoteDebugMachine> </RemoteDebugMachine>
<StartAction>Project</StartAction> <StartAction>Project</StartAction>
<StartArguments>/s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments> <StartArguments>/s=192.168.2.106 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256</StartArguments>
<StartPage> <StartPage>
</StartPage> </StartPage>
<StartProgram>C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe</StartProgram> <StartProgram>C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe</StartProgram>
@ -54,7 +54,7 @@
<RemoteDebugMachine> <RemoteDebugMachine>
</RemoteDebugMachine> </RemoteDebugMachine>
<StartAction>Project</StartAction> <StartAction>Project</StartAction>
<StartArguments>/s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments> <StartArguments>/s=192.168.2.106 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256</StartArguments>
<StartPage> <StartPage>
</StartPage> </StartPage>
<StartProgram> <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 # Visual C# Express 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClinicalScheduling", "ClinicalScheduling.csproj", "{8C05C4F7-FE81-479F-87A0-44E04C7F6E0F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClinicalScheduling", "ClinicalScheduling.csproj", "{8C05C4F7-FE81-479F-87A0-44E04C7F6E0F}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMXNet", "..\..\..\BMX\bmx_0200scr\BMX2\BMXNet\BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMXNet", "..\..\..\bmx_rep\BMX2\BMXNet\BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

BIN
cs/bsdx0200GUISourceCode/ClinicalScheduling.suo
View File

Binary file not shown.

12
cs/bsdx0200GUISourceCode/DCopyAppts.cs
View File

@ -23,8 +23,6 @@ namespace IndianHealthService.ClinicalScheduling
private System.Windows.Forms.Label lblProgress; private System.Windows.Forms.Label lblProgress;
private System.ComponentModel.IContainer components; private System.ComponentModel.IContainer components;
delegate DataTable RPMSDataTableDelegate(string CommandString, string TableName);
#region Fields #region Fields
private DateTime m_dtBegin; private DateTime m_dtBegin;
@ -196,13 +194,13 @@ namespace IndianHealthService.ClinicalScheduling
//string sSql = "BSDX COPY APPOINTMENTS^" + m_ResourceID + "^" + m_HospLocationID + "^" + m_dtBegin.ToShortDateString() + "^" + m_dtEnd.ToShortDateString(); //string sSql = "BSDX COPY APPOINTMENTS^" + m_ResourceID + "^" + m_HospLocationID + "^" + m_dtBegin.ToShortDateString() + "^" + m_dtEnd.ToShortDateString();
string sSql = "BSDX COPY APPOINTMENTS^" + m_ResourceID + "^" + m_HospLocationID + "^" + sFMBeginDate + "^" + sFMEndDate; string sSql = "BSDX COPY APPOINTMENTS^" + m_ResourceID + "^" + m_HospLocationID + "^" + sFMBeginDate + "^" + sFMEndDate;
//DataTable dt = m_DocManager.RPMSDataTable(sSql, "ApptCopy"); DataTable dt = m_DocManager.RPMSDataTable(sSql, "ApptCopy");
//Debug.Assert(dt.Rows.Count == 1); Debug.Assert(dt.Rows.Count == 1);
// TODO (later): delegate is supposed to support cross thread communication -- but this doesn't work. // TODO (later): delegate is supposed to support cross thread communication -- but this doesn't work.
RPMSDataTableDelegate d = new RPMSDataTableDelegate(m_DocManager.RPMSDataTable); //m_DocManager d = new RPMSDataTableDelegate(m_DocManager.RPMSDataTable);
DataTable dt = d.Invoke(sSql, "ApptCopy"); //DataTable dt = d.Invoke(sSql, "ApptCopy");
Debug.Assert(dt.Rows.Count == 1); //Debug.Assert(dt.Rows.Count == 1);
DataRow dr = dt.Rows[0]; DataRow dr = dt.Rows[0];
m_sTask = "0"; m_sTask = "0";

12
cs/bsdx0200GUISourceCode/RPC_Calls.txt
View File

@ -1,22 +1,22 @@
Find all ""BSDX ", Subfolders, Find Results 1, "Current Project" Find all ""BSDX ", Subfolders, Find Results 1, "Current Project"
CGAVDocument.cs(196): string sSql = "BSDX CANCEL AVAILABILITY^" + nApptID.ToString(); CGAVDocument.cs(196): string sSql = "BSDX CANCEL AVAILABILITY^" + nApptID.ToString();
* CGAVDocument.cs(235): string sSql = "BSDX ADD NEW AVAILABILITY^" + sStart + "^" + sEnd + "^" + sTypeID + "^" + sResource + "^" + sSlots + "^" + sNote; # CGAVDocument.cs(235): string sSql = "BSDX ADD NEW AVAILABILITY^" + sStart + "^" + sEnd + "^" + sTypeID + "^" + sResource + "^" + sSlots + "^" + sNote;
* CGAVDocument.cs(303): string sSql = "BSDX ADD NEW AVAILABILITY^" + sStart + "^" + sEnd + "^" + sTypeID + "^" + sResource + "^" + sSlots + "^" + sNote; # CGAVDocument.cs(303): string sSql = "BSDX ADD NEW AVAILABILITY^" + sStart + "^" + sEnd + "^" + sTypeID + "^" + sResource + "^" + sSlots + "^" + sNote;
CGAVView.cs(622):// sSql = "BSDX RAISE EVENT^" + sEvent + "^" + sParams + "^^"; CGAVView.cs(622):// sSql = "BSDX RAISE EVENT^" + sEvent + "^" + sParams + "^^";
CGAVView.cs(669): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName); CGAVView.cs(669): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName);
CGAVView.cs(728): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName); CGAVView.cs(728): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName);
CGAVView.cs(771): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName); CGAVView.cs(771): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName);
CGAVView.cs(906): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName); CGAVView.cs(906): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName);
* CGAVView.cs(1015): string sSql = "BSDX CANCEL AV BY DATE^" + sResourceID + "^" + sStart + "^" + sEnd; # CGAVView.cs(1015): string sSql = "BSDX CANCEL AV BY DATE^" + sResourceID + "^" + sStart + "^" + sEnd;
CGAVView.cs(1051): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName); CGAVView.cs(1051): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName);
CGAVView.cs(1265): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName); CGAVView.cs(1265): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName);
CGAVView.cs(1267): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName); CGAVView.cs(1267): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName);
* CGDocument.cs(745): string sSql = "BSDX ADD NEW APPOINTMENT^" + sStart + "^" + sEnd + "^" + sPatID + "^" + sResource + "^" + sLen + "^" + sNote + "^" + sApptID ; # CGDocument.cs(745): string sSql = "BSDX ADD NEW APPOINTMENT^" + sStart + "^" + sEnd + "^" + sPatID + "^" + sResource + "^" + sLen + "^" + sNote + "^" + sApptID ;
CGDocument.cs(771): string sSql = "BSDX EDIT APPOINTMENT^" + nApptID.ToString() + "^" + sNote; CGDocument.cs(771): string sSql = "BSDX EDIT APPOINTMENT^" + nApptID.ToString() + "^" + sNote;
CGDocument.cs(804): string sSql = "BSDX CHECKIN APPOINTMENT^" + nApptID.ToString() + "^" + sCheckIn + "^"; CGDocument.cs(804): string sSql = "BSDX CHECKIN APPOINTMENT^" + nApptID.ToString() + "^" + sCheckIn + "^";
CGDocument.cs(833): string sSql = "BSDX CANCEL APPOINTMENT^" + nApptID.ToString(); CGDocument.cs(833): string sSql = "BSDX CANCEL APPOINTMENT^" + nApptID.ToString();
* CGDocument.cs(917): string sSql = "BSDX REBOOK NEXT BLOCK^" + dStart.ToString("M/d/yyyy@H:mm")+ "^" + a.Resource + "^" + nAVType.ToString(); # CGDocument.cs(917): string sSql = "BSDX REBOOK NEXT BLOCK^" + dStart.ToString("M/d/yyyy@H:mm")+ "^" + a.Resource + "^" + nAVType.ToString();
CGDocument.cs(996): string sSql = "BSDX REBOOK SET^" + sApptKey + "^" + sRebookedTo; # CGDocument.cs(996): string sSql = "BSDX REBOOK SET^" + sApptKey + "^" + sRebookedTo;
CGDocument.cs(1013): string sSql = "BSDX NOSHOW^" + nApptID.ToString(); CGDocument.cs(1013): string sSql = "BSDX NOSHOW^" + nApptID.ToString();
CGDocumentManager.cs(59): if (e.BMXEvent == "BSDX CALL WORKSTATIONS") CGDocumentManager.cs(59): if (e.BMXEvent == "BSDX CALL WORKSTATIONS")
CGDocumentManager.cs(67): _current.m_ConnectInfo.RaiseEvent("BSDX WORKSTATION REPORT", sParam, true); CGDocumentManager.cs(67): _current.m_ConnectInfo.RaiseEvent("BSDX WORKSTATION REPORT", sParam, true);