This commit is contained in:
parent
adf21ecda9
commit
62d08c3297
|
@ -25,6 +25,14 @@ namespace IndianHealthService.ClinicalScheduling
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets appointments from VISTA to display in Grid
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="docManager"></param>
|
||||||
|
/// <param name="saryResNames"></param>
|
||||||
|
/// <param name="StartTime"></param>
|
||||||
|
/// <param name="EndTime"></param>
|
||||||
|
/// <returns></returns>
|
||||||
public static DataTable CreateAppointmentSchedule(CGDocumentManager docManager, ArrayList saryResNames, DateTime StartTime, DateTime EndTime)
|
public static DataTable CreateAppointmentSchedule(CGDocumentManager docManager, ArrayList saryResNames, DateTime StartTime, DateTime EndTime)
|
||||||
{
|
{
|
||||||
string sResName = "";
|
string sResName = "";
|
||||||
|
@ -119,13 +127,16 @@ namespace IndianHealthService.ClinicalScheduling
|
||||||
return rsOut;
|
return rsOut;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static DataTable CreateAssignedTypeSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, DateTime EndTime, ScheduleType stType)
|
public static DataTable CreateAssignedTypeSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, DateTime EndTime, ScheduleType stType)
|
||||||
{
|
{
|
||||||
|
|
||||||
string sStart;
|
string sStart;
|
||||||
string sEnd;
|
string sEnd;
|
||||||
sStart = StartTime.ToString("M-d-yyyy");
|
//sStart = StartTime.ToString("M-d-yyyy");
|
||||||
sEnd = EndTime.ToString("M-d-yyyy");
|
sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
|
||||||
|
//sEnd = EndTime.ToString("M-d-yyyy");
|
||||||
|
sEnd = FMDateTime.Create(EndTime).DateOnly.FMDateString;
|
||||||
// string sSource = (stType == ScheduleType.Resource ? "ST_RESOURCE" : "ST_CLINIC");
|
// string sSource = (stType == ScheduleType.Resource ? "ST_RESOURCE" : "ST_CLINIC");
|
||||||
string sSql = "BSDX TYPE BLOCKS OVERLAP^" + sStart + "^" + sEnd + "^" + sResourceName ;//+ "^" + sSource;
|
string sSql = "BSDX TYPE BLOCKS OVERLAP^" + sStart + "^" + sEnd + "^" + sResourceName ;//+ "^" + sSource;
|
||||||
|
|
||||||
|
@ -283,8 +294,10 @@ namespace IndianHealthService.ClinicalScheduling
|
||||||
|
|
||||||
string sStart;
|
string sStart;
|
||||||
string sEnd;
|
string sEnd;
|
||||||
sStart = StartTime.ToString("M-d-yyyy");
|
//sStart = StartTime.ToString("M-d-yyyy"); smh
|
||||||
sEnd = EndTime.ToString("M-d-yyyy@H:mm");
|
sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
|
||||||
|
//sEnd = EndTime.ToString("M-d-yyyy@H:mm"); smh
|
||||||
|
sEnd = FMDateTime.Create(EndTime).FMDateString;
|
||||||
string sSql = "BSDX CREATE ASGND SLOT SCHED^" + sResourceName + "^" + sStart + "^" + sEnd + "^" + sApptTypeIDs + "^" + sSearchInfo; //+ "^" + sSTType ;
|
string sSql = "BSDX CREATE ASGND SLOT SCHED^" + sResourceName + "^" + sStart + "^" + sEnd + "^" + sApptTypeIDs + "^" + sSearchInfo; //+ "^" + sSTType ;
|
||||||
|
|
||||||
DataTable dtRet = docManager.RPMSDataTable(sSql, "AssignedSlotSchedule");
|
DataTable dtRet = docManager.RPMSDataTable(sSql, "AssignedSlotSchedule");
|
||||||
|
@ -358,8 +371,10 @@ namespace IndianHealthService.ClinicalScheduling
|
||||||
|
|
||||||
string sStart;
|
string sStart;
|
||||||
string sEnd;
|
string sEnd;
|
||||||
sStart = StartTime.ToString("M-d-yyyy");
|
//sStart = StartTime.ToString("M-d-yyyy");
|
||||||
sEnd = EndTime.ToString("M-d-yyyy");
|
sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
|
||||||
|
//sEnd = EndTime.ToString("M-d-yyyy");
|
||||||
|
sEnd = FMDateTime.Create(EndTime).DateOnly.FMDateString;
|
||||||
|
|
||||||
string sSTType = (stType == ScheduleType.Resource ? "ST_RESOURCE" : "ST_CLINIC");
|
string sSTType = (stType == ScheduleType.Resource ? "ST_RESOURCE" : "ST_CLINIC");
|
||||||
string sSql = "BSDX APPT BLOCKS OVERLAP^" + sStart + "^" + sEnd + "^" + sResourceName ;//+ "^" + sSTType;
|
string sSql = "BSDX APPT BLOCKS OVERLAP^" + sStart + "^" + sEnd + "^" + sResourceName ;//+ "^" + sSTType;
|
||||||
|
|
Binary file not shown.
|
@ -98,13 +98,12 @@
|
||||||
this.panel1.Name = "panel1";
|
this.panel1.Name = "panel1";
|
||||||
this.panel1.Size = new Size(0x192, 40);
|
this.panel1.Size = new Size(0x192, 40);
|
||||||
this.panel1.TabIndex = 2;
|
this.panel1.TabIndex = 2;
|
||||||
this.cmdCancel.DialogResult = DialogResult.Cancel;
|
|
||||||
this.cmdCancel.Location = new Point(0x120, 8);
|
this.cmdCancel.Location = new Point(0x120, 8);
|
||||||
this.cmdCancel.Name = "cmdCancel";
|
this.cmdCancel.Name = "cmdCancel";
|
||||||
this.cmdCancel.Size = new Size(0x40, 0x18);
|
this.cmdCancel.Size = new Size(0x40, 0x18);
|
||||||
this.cmdCancel.TabIndex = 1;
|
this.cmdCancel.TabIndex = 1;
|
||||||
this.cmdCancel.Text = "Cancel";
|
this.cmdCancel.Text = "Cancel";
|
||||||
this.cmdOK.DialogResult = DialogResult.OK;
|
|
||||||
this.cmdOK.Location = new Point(0xd0, 8);
|
this.cmdOK.Location = new Point(0xd0, 8);
|
||||||
this.cmdOK.Name = "cmdOK";
|
this.cmdOK.Name = "cmdOK";
|
||||||
this.cmdOK.Size = new Size(0x40, 0x18);
|
this.cmdOK.Size = new Size(0x40, 0x18);
|
||||||
|
@ -252,6 +251,8 @@
|
||||||
this.cboAccessTypeFilter.DataSource = view;
|
this.cboAccessTypeFilter.DataSource = view;
|
||||||
this.cboAccessTypeFilter.DisplayMember = "ACCESS_GROUP";
|
this.cboAccessTypeFilter.DisplayMember = "ACCESS_GROUP";
|
||||||
this.cboAccessTypeFilter.SelectedIndex = this.cboAccessTypeFilter.Items.Count - 1;
|
this.cboAccessTypeFilter.SelectedIndex = this.cboAccessTypeFilter.Items.Count - 1;
|
||||||
|
this.cmdCancel.DialogResult = DialogResult.Cancel;
|
||||||
|
this.cmdOK.DialogResult = DialogResult.OK;
|
||||||
this.UpdateDialogData(true);
|
this.UpdateDialogData(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -276,6 +277,8 @@
|
||||||
this.cboAccessTypeFilter.DisplayMember = "ACCESS_GROUP";
|
this.cboAccessTypeFilter.DisplayMember = "ACCESS_GROUP";
|
||||||
this.cboAccessTypeFilter.SelectedIndex = this.cboAccessTypeFilter.Items.Count - 1;
|
this.cboAccessTypeFilter.SelectedIndex = this.cboAccessTypeFilter.Items.Count - 1;
|
||||||
this.m_pAppt.AccessTypeID = 0;
|
this.m_pAppt.AccessTypeID = 0;
|
||||||
|
this.cmdCancel.DialogResult = DialogResult.Cancel;
|
||||||
|
this.cmdOK.DialogResult = DialogResult.OK;
|
||||||
this.UpdateDialogData(true);
|
this.UpdateDialogData(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue