Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVDocument.cs =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVDocument.cs (revision 860) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVDocument.cs (revision 864) @@ -220,7 +220,10 @@ string sSlots; - sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm"); - sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm"); - sNote = rApptInfo.Note; + //sStart = rApptInfo.StartTime.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; sResource = rApptInfo.Resource; sTypeID = rApptInfo.AccessTypeID.ToString(); @@ -234,5 +237,5 @@ 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; @@ -273,6 +276,9 @@ string sSlots; - sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm"); - sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm"); + //sStart = rApptInfo.StartTime.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; sResource = rApptInfo.Resource; Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVView.cs =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVView.cs (revision 860) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVView.cs (revision 864) @@ -1009,7 +1009,9 @@ { //Convert start and end to string - string sStart = dtStart.ToString("M/d/yyyy"); - string sEnd = dtEnd.ToString("M/d/yyyy"); - + //string sStart = dtStart.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 string sSql = "BSDX CANCEL AV BY DATE^" + sResourceID + "^" + sStart + "^" + sEnd; Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs (revision 860) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs (revision 864) @@ -720,6 +720,11 @@ string sApptID; - sStart = rApptInfo.StartTime.ToString("M-d-yyyy@HH:mm"); - sEnd = rApptInfo.EndTime.ToString("M-d-yyyy@HH:mm"); + //sStart = rApptInfo.StartTime.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; sLen = sp.TotalMinutes.ToString(); @@ -912,8 +917,10 @@ 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); 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"); Debug.Assert(dtNextBlock.Rows.Count == 1); @@ -993,5 +1000,7 @@ { 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; System.Data.DataTable dtRebook = m_DocManager.RPMSDataTable(sSql, "AutoRebook"); Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj (revision 860) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj (revision 864) @@ -433,5 +433,5 @@ - + {DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45} BMXNet Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user (revision 860) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user (revision 864) @@ -36,5 +36,5 @@ Project - /s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256 + /s=192.168.2.106 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256 @@ -55,5 +55,5 @@ Project - /s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256 + /s=192.168.2.106 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256 Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln (revision 860) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln (revision 864) @@ -4,5 +4,5 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClinicalScheduling", "ClinicalScheduling.csproj", "{8C05C4F7-FE81-479F-87A0-44E04C7F6E0F}" 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 Global Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/DCopyAppts.cs =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/DCopyAppts.cs (revision 860) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/DCopyAppts.cs (revision 864) @@ -23,6 +23,4 @@ private System.Windows.Forms.Label lblProgress; private System.ComponentModel.IContainer components; - - delegate DataTable RPMSDataTableDelegate(string CommandString, string TableName); @@ -197,11 +195,11 @@ string sSql = "BSDX COPY APPOINTMENTS^" + m_ResourceID + "^" + m_HospLocationID + "^" + sFMBeginDate + "^" + sFMEndDate; - //DataTable dt = m_DocManager.RPMSDataTable(sSql, "ApptCopy"); - //Debug.Assert(dt.Rows.Count == 1); + DataTable dt = m_DocManager.RPMSDataTable(sSql, "ApptCopy"); + Debug.Assert(dt.Rows.Count == 1); // TODO (later): delegate is supposed to support cross thread communication -- but this doesn't work. - RPMSDataTableDelegate d = new RPMSDataTableDelegate(m_DocManager.RPMSDataTable); - DataTable dt = d.Invoke(sSql, "ApptCopy"); - Debug.Assert(dt.Rows.Count == 1); + //m_DocManager d = new RPMSDataTableDelegate(m_DocManager.RPMSDataTable); + //DataTable dt = d.Invoke(sSql, "ApptCopy"); + //Debug.Assert(dt.Rows.Count == 1); DataRow dr = dt.Rows[0]; Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/RPC_Calls.txt =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/RPC_Calls.txt (revision 860) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/RPC_Calls.txt (revision 864) @@ -1,6 +1,6 @@ Find all ""BSDX ", Subfolders, Find Results 1, "Current Project" 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(303): 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; CGAVView.cs(622):// sSql = "BSDX RAISE EVENT^" + sEvent + "^" + sParams + "^^"; CGAVView.cs(669): RaiseRPMSEvent("BSDX SCHEDULE", m_Document.DocName); @@ -8,14 +8,14 @@ CGAVView.cs(771): 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(1265): 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(804): string sSql = "BSDX CHECKIN APPOINTMENT^" + nApptID.ToString() + "^" + sCheckIn + "^"; 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(996): string sSql = "BSDX REBOOK SET^" + sApptKey + "^" + sRebookedTo; + # 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(1013): string sSql = "BSDX NOSHOW^" + nApptID.ToString(); CGDocumentManager.cs(59): if (e.BMXEvent == "BSDX CALL WORKSTATIONS")