Index: /Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs
===================================================================
--- /Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs (revision 1123)
+++ /Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs (revision 1124)
@@ -337,5 +337,4 @@
try
{
- //Create new Document
this.SelectedDate = dDate.Date;
@@ -361,4 +360,5 @@
//If this document already has a view, the use it
//SAM: Why do this again???
+ //SAM: I think it's not needed; b/c
Hashtable h = CGDocumentManager.Current.Views;
CGDocument d;
@@ -952,24 +952,16 @@
public int CreateAppointment(CGAppointment rApptInfo, bool bWalkin)
{
- string sStart;
- string sEnd;
- string sPatID;
- string sResource;
- string sNote;
- string sLen;
+ // i18n code -- Use culture neutral FMDates
+ string sStart = FMDateTime.Create(rApptInfo.StartTime).FMDateString;
+ string sEnd = FMDateTime.Create(rApptInfo.EndTime).FMDateString;
+
+ TimeSpan sp = rApptInfo.EndTime - rApptInfo.StartTime;
+ string sLen = sp.TotalMinutes.ToString();
+ string sPatID = rApptInfo.PatientID.ToString();
+ string sNote = rApptInfo.Note;
+ string sResource = rApptInfo.Resource;
+
string sApptID;
- //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();
- sPatID = rApptInfo.PatientID.ToString();
- sNote = rApptInfo.Note;
- sResource = rApptInfo.Resource;
if (bWalkin == true)
{
@@ -980,20 +972,11 @@
sApptID = rApptInfo.AccessTypeID.ToString();
}
-
- CGAppointment aCopy = new CGAppointment();
- aCopy.CreateAppointment(rApptInfo.StartTime, rApptInfo.EndTime, sNote, 0, sResource);
- aCopy.PatientID = rApptInfo.PatientID;
- aCopy.PatientName = rApptInfo.PatientName;
- aCopy.HealthRecordNumber = rApptInfo.HealthRecordNumber;
- aCopy.AccessTypeID = rApptInfo.AccessTypeID;
- aCopy.WalkIn = bWalkin ? true : false;
string sSql = "BSDX ADD NEW APPOINTMENT^" + sStart + "^" + sEnd + "^" + sPatID + "^" + sResource + "^" + sLen + "^" + sNote + "^" + sApptID;
System.Data.DataTable dtAppt = m_DocManager.RPMSDataTable(sSql, "NewAppointment");
- int nApptID;
Debug.Assert(dtAppt.Rows.Count == 1);
DataRow r = dtAppt.Rows[0];
- nApptID = Convert.ToInt32(r["APPOINTMENTID"]);
+ int nApptID = Convert.ToInt32(r["APPOINTMENTID"]);
string sErrorID;
sErrorID = r["ERRORID"].ToString();
@@ -1002,11 +985,10 @@
throw new Exception(sErrorID);
}
- aCopy.AppointmentKey = nApptID;
- this.m_appointments.AddAppointment(aCopy);
-
- //TODO: Improve
- //Yucky hack for now... haven't investigated why we need to create a new CGAppointment beyond
- //the one that we pass.
+
+ //next line is probably done elsewhere
+ rApptInfo.WalkIn = bWalkin ? true : false;
rApptInfo.AppointmentKey = nApptID;
+
+ this.m_appointments.AddAppointment(rApptInfo);
//Have make appointment from CGView responsible for requesting an update for the avialability.
Index: /Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs
===================================================================
--- /Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs (revision 1123)
+++ /Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs (revision 1124)
@@ -228,4 +228,5 @@
this.ctxPrintScheduleT0 = new System.Windows.Forms.MenuItem();
this.ctxPrintScheduleT1 = new System.Windows.Forms.MenuItem();
+ this.ctxPrintScheduleT3 = new System.Windows.Forms.MenuItem();
this.panelRight = new System.Windows.Forms.Panel();
this.panelClip = new System.Windows.Forms.Panel();
@@ -239,5 +240,4 @@
this.lblResource = new System.Windows.Forms.Label();
this.panelCenter = new System.Windows.Forms.Panel();
- this.calendarGrid1 = new IndianHealthService.ClinicalScheduling.CalendarGrid();
this.ctxCalendarGrid = new System.Windows.Forms.ContextMenu();
this.ctxCalGridAdd = new System.Windows.Forms.MenuItem();
@@ -257,5 +257,5 @@
this.splitter1 = new System.Windows.Forms.Splitter();
this.splitter2 = new System.Windows.Forms.Splitter();
- this.ctxPrintScheduleT3 = new System.Windows.Forms.MenuItem();
+ this.calendarGrid1 = new IndianHealthService.ClinicalScheduling.CalendarGrid();
this.panelRight.SuspendLayout();
this.panelClip.SuspendLayout();
@@ -476,4 +476,5 @@
//
this.mnuFindAppt.Index = 9;
+ this.mnuFindAppt.Shortcut = System.Windows.Forms.Shortcut.CtrlF;
this.mnuFindAppt.Text = "&Find Available Appointment";
this.mnuFindAppt.Click += new System.EventHandler(this.mnuFindAppt_Click);
@@ -550,4 +551,5 @@
// mnu10Minute
//
+ this.mnu10Minute.Enabled = false;
this.mnu10Minute.Index = 0;
this.mnu10Minute.Shortcut = System.Windows.Forms.Shortcut.Ctrl0;
@@ -557,4 +559,5 @@
// mnu15Minute
//
+ this.mnu15Minute.Enabled = false;
this.mnu15Minute.Index = 1;
this.mnu15Minute.Shortcut = System.Windows.Forms.Shortcut.Ctrl4;
@@ -564,4 +567,5 @@
// mnu20Minute
//
+ this.mnu20Minute.Enabled = false;
this.mnu20Minute.Index = 2;
this.mnu20Minute.Shortcut = System.Windows.Forms.Shortcut.Ctrl3;
@@ -571,4 +575,5 @@
// mnu30Minute
//
+ this.mnu30Minute.Enabled = false;
this.mnu30Minute.Index = 3;
this.mnu30Minute.Shortcut = System.Windows.Forms.Shortcut.Ctrl2;
@@ -624,5 +629,5 @@
this.tvSchedules.Location = new System.Drawing.Point(0, 0);
this.tvSchedules.Name = "tvSchedules";
- this.tvSchedules.Size = new System.Drawing.Size(128, 351);
+ this.tvSchedules.Size = new System.Drawing.Size(128, 204);
this.tvSchedules.Sorted = true;
this.tvSchedules.TabIndex = 1;
@@ -681,4 +686,10 @@
this.ctxPrintScheduleT1.Click += new System.EventHandler(this.ctxPrintScheduleT1_Click);
//
+ // ctxPrintScheduleT3
+ //
+ this.ctxPrintScheduleT3.Index = 6;
+ this.ctxPrintScheduleT3.Text = "Print Clinic Schedule(s) (T+&3)";
+ this.ctxPrintScheduleT3.Click += new System.EventHandler(this.ctxPrintScheduleT3_Click);
+ //
// panelRight
//
@@ -687,5 +698,5 @@
this.panelRight.Location = new System.Drawing.Point(996, 0);
this.panelRight.Name = "panelRight";
- this.panelRight.Size = new System.Drawing.Size(128, 351);
+ this.panelRight.Size = new System.Drawing.Size(128, 204);
this.panelRight.TabIndex = 3;
this.panelRight.Visible = false;
@@ -783,6 +794,127 @@
this.panelCenter.Location = new System.Drawing.Point(136, 24);
this.panelCenter.Name = "panelCenter";
- this.panelCenter.Size = new System.Drawing.Size(857, 303);
+ this.panelCenter.Size = new System.Drawing.Size(857, 156);
this.panelCenter.TabIndex = 7;
+ //
+ // ctxCalendarGrid
+ //
+ this.ctxCalendarGrid.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
+ this.ctxCalGridAdd,
+ this.ctxCalGridEdit,
+ this.ctxCalGridDelete,
+ this.ctxCalGridCheckIn,
+ this.ctxCalGridUndoCheckin,
+ this.menuItem2,
+ this.ctxCalGridNoShow,
+ this.ctxCalGridNoShowUndo,
+ this.menuItem9,
+ this.ctxCalGridWalkin,
+ this.menuItem10,
+ this.ctxCalGridReprintApptSlip});
+ this.ctxCalendarGrid.Popup += new System.EventHandler(this.ctxCalendarGrid_Popup);
+ //
+ // ctxCalGridAdd
+ //
+ this.ctxCalGridAdd.Index = 0;
+ this.ctxCalGridAdd.Text = "Add Appointment";
+ this.ctxCalGridAdd.Click += new System.EventHandler(this.ctxCalGridAdd_Click);
+ //
+ // ctxCalGridEdit
+ //
+ this.ctxCalGridEdit.Index = 1;
+ this.ctxCalGridEdit.Text = "Edit Appointment";
+ this.ctxCalGridEdit.Click += new System.EventHandler(this.ctxCalGridEdit_Click);
+ //
+ // ctxCalGridDelete
+ //
+ this.ctxCalGridDelete.Index = 2;
+ this.ctxCalGridDelete.Text = "Cancel Appointment";
+ this.ctxCalGridDelete.Click += new System.EventHandler(this.ctxCalGridDelete_Click);
+ //
+ // ctxCalGridCheckIn
+ //
+ this.ctxCalGridCheckIn.Index = 3;
+ this.ctxCalGridCheckIn.Text = "Check In Patient";
+ this.ctxCalGridCheckIn.Click += new System.EventHandler(this.ctxCalGridCheckIn_Click);
+ //
+ // ctxCalGridUndoCheckin
+ //
+ this.ctxCalGridUndoCheckin.Index = 4;
+ this.ctxCalGridUndoCheckin.Text = "&Undo Check In";
+ this.ctxCalGridUndoCheckin.Click += new System.EventHandler(this.ctxCalGridUndoCheckin_Click);
+ //
+ // menuItem2
+ //
+ this.menuItem2.Index = 5;
+ this.menuItem2.Text = "-";
+ //
+ // ctxCalGridNoShow
+ //
+ this.ctxCalGridNoShow.Index = 6;
+ this.ctxCalGridNoShow.Text = "Mark as No Show";
+ this.ctxCalGridNoShow.Click += new System.EventHandler(this.ctxCalGridNoShow_Click);
+ //
+ // ctxCalGridNoShowUndo
+ //
+ this.ctxCalGridNoShowUndo.Index = 7;
+ this.ctxCalGridNoShowUndo.Text = "Undo NoShow";
+ this.ctxCalGridNoShowUndo.Click += new System.EventHandler(this.ctxCalGridNoShowUndo_Click);
+ //
+ // menuItem9
+ //
+ this.menuItem9.Index = 8;
+ this.menuItem9.Text = "-";
+ //
+ // ctxCalGridWalkin
+ //
+ this.ctxCalGridWalkin.Index = 9;
+ this.ctxCalGridWalkin.Text = "Create Wal&k-In Appointment";
+ this.ctxCalGridWalkin.Click += new System.EventHandler(this.ctxCalGridWalkin_Click);
+ //
+ // menuItem10
+ //
+ this.menuItem10.Index = 10;
+ this.menuItem10.Text = "-";
+ //
+ // ctxCalGridReprintApptSlip
+ //
+ this.ctxCalGridReprintApptSlip.Index = 11;
+ this.ctxCalGridReprintApptSlip.Text = "&Reprint Appointment Slip";
+ this.ctxCalGridReprintApptSlip.Click += new System.EventHandler(this.ctxCalGridReprintApptSlip_Click);
+ //
+ // panelBottom
+ //
+ this.panelBottom.Controls.Add(this.statusBar1);
+ this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelBottom.Location = new System.Drawing.Point(136, 180);
+ this.panelBottom.Name = "panelBottom";
+ this.panelBottom.Size = new System.Drawing.Size(857, 24);
+ this.panelBottom.TabIndex = 8;
+ //
+ // statusBar1
+ //
+ this.statusBar1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.statusBar1.Location = new System.Drawing.Point(0, 0);
+ this.statusBar1.Name = "statusBar1";
+ this.statusBar1.Size = new System.Drawing.Size(857, 24);
+ this.statusBar1.SizingGrip = false;
+ this.statusBar1.TabIndex = 0;
+ //
+ // splitter1
+ //
+ this.splitter1.Location = new System.Drawing.Point(128, 24);
+ this.splitter1.Name = "splitter1";
+ this.splitter1.Size = new System.Drawing.Size(8, 180);
+ this.splitter1.TabIndex = 9;
+ this.splitter1.TabStop = false;
+ //
+ // splitter2
+ //
+ this.splitter2.Dock = System.Windows.Forms.DockStyle.Right;
+ this.splitter2.Location = new System.Drawing.Point(993, 24);
+ this.splitter2.Name = "splitter2";
+ this.splitter2.Size = new System.Drawing.Size(3, 180);
+ this.splitter2.TabIndex = 10;
+ this.splitter2.TabStop = false;
//
// calendarGrid1
@@ -805,5 +937,5 @@
this.calendarGrid1.Resources = ((System.Collections.ArrayList)(resources.GetObject("calendarGrid1.Resources")));
this.calendarGrid1.SelectedAppointment = 0;
- this.calendarGrid1.Size = new System.Drawing.Size(857, 303);
+ this.calendarGrid1.Size = new System.Drawing.Size(857, 156);
this.calendarGrid1.StartDate = new System.DateTime(2003, 1, 27, 0, 0, 0, 0);
this.calendarGrid1.TabIndex = 0;
@@ -815,135 +947,8 @@
this.calendarGrid1.MouseEnter += new System.EventHandler(this.calendarGrid1_MouseEnter);
//
- // ctxCalendarGrid
- //
- this.ctxCalendarGrid.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
- this.ctxCalGridAdd,
- this.ctxCalGridEdit,
- this.ctxCalGridDelete,
- this.ctxCalGridCheckIn,
- this.ctxCalGridUndoCheckin,
- this.menuItem2,
- this.ctxCalGridNoShow,
- this.ctxCalGridNoShowUndo,
- this.menuItem9,
- this.ctxCalGridWalkin,
- this.menuItem10,
- this.ctxCalGridReprintApptSlip});
- this.ctxCalendarGrid.Popup += new System.EventHandler(this.ctxCalendarGrid_Popup);
- //
- // ctxCalGridAdd
- //
- this.ctxCalGridAdd.Index = 0;
- this.ctxCalGridAdd.Text = "Add Appointment";
- this.ctxCalGridAdd.Click += new System.EventHandler(this.ctxCalGridAdd_Click);
- //
- // ctxCalGridEdit
- //
- this.ctxCalGridEdit.Index = 1;
- this.ctxCalGridEdit.Text = "Edit Appointment";
- this.ctxCalGridEdit.Click += new System.EventHandler(this.ctxCalGridEdit_Click);
- //
- // ctxCalGridDelete
- //
- this.ctxCalGridDelete.Index = 2;
- this.ctxCalGridDelete.Text = "Cancel Appointment";
- this.ctxCalGridDelete.Click += new System.EventHandler(this.ctxCalGridDelete_Click);
- //
- // ctxCalGridCheckIn
- //
- this.ctxCalGridCheckIn.Index = 3;
- this.ctxCalGridCheckIn.Text = "Check In Patient";
- this.ctxCalGridCheckIn.Click += new System.EventHandler(this.ctxCalGridCheckIn_Click);
- //
- // ctxCalGridUndoCheckin
- //
- this.ctxCalGridUndoCheckin.Index = 4;
- this.ctxCalGridUndoCheckin.Text = "&Undo Check In";
- this.ctxCalGridUndoCheckin.Click += new System.EventHandler(this.ctxCalGridUndoCheckin_Click);
- //
- // menuItem2
- //
- this.menuItem2.Index = 5;
- this.menuItem2.Text = "-";
- //
- // ctxCalGridNoShow
- //
- this.ctxCalGridNoShow.Index = 6;
- this.ctxCalGridNoShow.Text = "Mark as No Show";
- this.ctxCalGridNoShow.Click += new System.EventHandler(this.ctxCalGridNoShow_Click);
- //
- // ctxCalGridNoShowUndo
- //
- this.ctxCalGridNoShowUndo.Index = 7;
- this.ctxCalGridNoShowUndo.Text = "Undo NoShow";
- this.ctxCalGridNoShowUndo.Click += new System.EventHandler(this.ctxCalGridNoShowUndo_Click);
- //
- // menuItem9
- //
- this.menuItem9.Index = 8;
- this.menuItem9.Text = "-";
- //
- // ctxCalGridWalkin
- //
- this.ctxCalGridWalkin.Index = 9;
- this.ctxCalGridWalkin.Text = "Create Wal&k-In Appointment";
- this.ctxCalGridWalkin.Click += new System.EventHandler(this.ctxCalGridWalkin_Click);
- //
- // menuItem10
- //
- this.menuItem10.Index = 10;
- this.menuItem10.Text = "-";
- //
- // ctxCalGridReprintApptSlip
- //
- this.ctxCalGridReprintApptSlip.Index = 11;
- this.ctxCalGridReprintApptSlip.Text = "&Reprint Appointment Slip";
- this.ctxCalGridReprintApptSlip.Click += new System.EventHandler(this.ctxCalGridReprintApptSlip_Click);
- //
- // panelBottom
- //
- this.panelBottom.Controls.Add(this.statusBar1);
- this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelBottom.Location = new System.Drawing.Point(136, 327);
- this.panelBottom.Name = "panelBottom";
- this.panelBottom.Size = new System.Drawing.Size(857, 24);
- this.panelBottom.TabIndex = 8;
- //
- // statusBar1
- //
- this.statusBar1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.statusBar1.Location = new System.Drawing.Point(0, 0);
- this.statusBar1.Name = "statusBar1";
- this.statusBar1.Size = new System.Drawing.Size(857, 24);
- this.statusBar1.SizingGrip = false;
- this.statusBar1.TabIndex = 0;
- //
- // splitter1
- //
- this.splitter1.Location = new System.Drawing.Point(128, 24);
- this.splitter1.Name = "splitter1";
- this.splitter1.Size = new System.Drawing.Size(8, 327);
- this.splitter1.TabIndex = 9;
- this.splitter1.TabStop = false;
- //
- // splitter2
- //
- this.splitter2.Dock = System.Windows.Forms.DockStyle.Right;
- this.splitter2.Location = new System.Drawing.Point(993, 24);
- this.splitter2.Name = "splitter2";
- this.splitter2.Size = new System.Drawing.Size(3, 327);
- this.splitter2.TabIndex = 10;
- this.splitter2.TabStop = false;
- //
- // ctxPrintScheduleT3
- //
- this.ctxPrintScheduleT3.Index = 6;
- this.ctxPrintScheduleT3.Text = "Print Clinic Schedule(s) (T+&3)";
- this.ctxPrintScheduleT3.Click += new System.EventHandler(this.ctxPrintScheduleT3_Click);
- //
// CGView
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(1124, 351);
+ this.ClientSize = new System.Drawing.Size(1124, 204);
this.Controls.Add(this.panelCenter);
this.Controls.Add(this.panelBottom);
@@ -1547,5 +1552,5 @@
{
//If resource already open, then navigate to its window
- CGView v =this.DocManager.GetViewByResource(sSelectedTreeResourceArray);
+ CGView v = this.DocManager.GetViewByResource(sSelectedTreeResourceArray);
if (v != null)
{
@@ -1585,5 +1590,5 @@
try
{
- doc.OnOpenDocument(dDate);
+ doc.OnOpenDocument(dDate); //this typically creates a new view
}
@@ -1595,5 +1600,6 @@
}
- //We are doing this--Again?
+ //We are doing this--again--to fetch the view we just opened in OnOpenDocument
+ //XXX: Yes, I know, this totally sucks. But I don't fully grasp the whole thing yet to refactor it.
v =this.DocManager.GetViewByResource(sSelectedTreeResourceArray);
@@ -1633,4 +1639,44 @@
cg.PositionGrid(7);
+
+ //new code for v 1.5 //smh
+ //Disable entries that would make time scale smaller b/c users should not be able to
+ //make appointments for smaller time scales
+ if (nScale >= 10)
+ {
+ v.mnu10Minute.Enabled = true;
+ v.mnu15Minute.Enabled = true;
+ v.mnu20Minute.Enabled = true;
+ v.mnu30Minute.Enabled = true;
+ }
+ if (nScale >= 15)
+ {
+ v.mnu10Minute.Enabled = false;
+ v.mnu15Minute.Enabled = true;
+ v.mnu20Minute.Enabled = true;
+ v.mnu30Minute.Enabled = true;
+ }
+ if (nScale >= 20)
+ {
+ v.mnu10Minute.Enabled = false;
+ v.mnu15Minute.Enabled = false;
+ v.mnu20Minute.Enabled = true;
+ v.mnu30Minute.Enabled = true;
+ }
+ if (nScale >= 30)
+ {
+ v.mnu10Minute.Enabled = false;
+ v.mnu15Minute.Enabled = false;
+ v.mnu20Minute.Enabled = false;
+ v.mnu30Minute.Enabled = true;
+ }
+ if (nScale >= 60)
+ {
+ v.mnu10Minute.Enabled = false;
+ v.mnu15Minute.Enabled = false;
+ v.mnu20Minute.Enabled = false;
+ v.mnu30Minute.Enabled = false;
+ }
+ //end new code
//Get the OverBook and ModifySchedule permissions from ResourceUser table
Index: /Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user
===================================================================
--- /Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user (revision 1123)
+++ /Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user (revision 1124)
@@ -37,5 +37,5 @@
Project
- /s=172.16.16.108 /p=9250 /a=BASMA.ALDWAIRI /v=SELEN.123 /culture=ar-JO
+ /s=172.16.16.108 /p=9250 /a=s.habiel /v=catdog.66 /culture=ar-JO
Index: /Scheduling/trunk/cs/bsdx0200GUISourceCode/DCheckIn.cs
===================================================================
--- /Scheduling/trunk/cs/bsdx0200GUISourceCode/DCheckIn.cs (revision 1123)
+++ /Scheduling/trunk/cs/bsdx0200GUISourceCode/DCheckIn.cs (revision 1124)
@@ -48,15 +48,8 @@
private string m_sPatientName;
private DateTime m_dCheckIn;
- private string m_sProvider;
private string m_sProviderIEN;
private CGDocumentManager m_DocManager;
private DataSet m_dsGlobal;
private DataTable m_dtProvider;
- private DataView m_dvCS;
- private bool m_bProviderRequired;
- private DataTable m_dtClinic;
- private DataTable m_dtForm;
- private DataView m_dvClinic;
- private DataView m_dvForm;
public bool m_bPrintRouteSlip;
private List _providers;
Index: /Scheduling/trunk/cs/bsdx0200GUISourceCode/DResource.cs
===================================================================
--- /Scheduling/trunk/cs/bsdx0200GUISourceCode/DResource.cs (revision 1123)
+++ /Scheduling/trunk/cs/bsdx0200GUISourceCode/DResource.cs (revision 1124)
@@ -532,5 +532,4 @@
private CGResource m_pResource;
private DataView m_dvHospLoc;
- private DataView m_dvClinicParams;
#endregion Fields