Changeset 1124 for Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs

Timestamp:

Mar 30, 2011, 4:19:15 AM (13 years ago)

Author:

Sam Habiel

Message:

Updated Release exes.
CGDocument: Appointment Creation Code now reuses appt object passed in rather than creating a new one.
CGView:
ctxPrintScheduleT3 added. Print schedule in 3 days. For weekday after weekend.
Scaling of grid now restricted. You can't scale down from the original TimeScale, but you can scale up.
DCheckIn: Remove unused variables.
DResource: Remove unused variables.

File:

• Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs (modified) (5 diffs)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs

@@ -337 +337 @@
             try
             {
-                //Create new Document
                 this.SelectedDate = dDate.Date;
 
@@ -361 +360 @@
                 //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 +952 @@
         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 +972 @@
                 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 +985 @@
                 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.