Changeset 1126 for Scheduling/trunk

Timestamp:

Mar 30, 2011, 6:18:19 AM (14 years ago)

Author:

Sam Habiel

Message:

Oh Boy! More fixes...
strings.resx and strings.resx.ar: AppoinmentRoutingSlip identifier and name in strings changed to AppointmentReminderSlip
Printing: Corresponding change.
CGView: Appointment Order to be passed to routing slip was wrong if there were more than one resource open.

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• CGView.cs (modified) (1 diff)
• ClinicalScheduling.suo (modified) ( previous)
• Printing.cs (modified) (1 diff)
• bin/Release/BMXNet23.dll (modified) ( previous)
• bin/Release/ClinicalScheduling.exe (modified) ( previous)
• bin/Release/ar/ClinicalScheduling.resources.dll (modified) ( previous)
• strings.Designer.cs (modified) (1 diff)
• strings.ar.resx (modified) (1 diff)
• strings.resx (modified) (1 diff)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs

@@ -3345 +3345 @@
             //Today's appointments
             var todaysAppts = (from lkappts in this.Document.Appointments.AppointmentTable.Values.Cast<CGAppointment>()
-                               where lkappts.StartTime > appt.StartTime.Date && lkappts.StartTime < appt.StartTime.AddDays(1).Date
+                               where lkappts.StartTime > appt.StartTime.Date && lkappts.StartTime < appt.StartTime.AddDays(1).Date && lkappts.Resource == appt.Resource
                               orderby lkappts.StartTime
                               select lkappts).ToList();

Scheduling/trunk/cs/bsdx0200GUISourceCode/Printing.cs

@@ -185 +185 @@
 
             //string s = "Appointment Reminder Slip";
-            string s = strings.ApptRoutingSlip;
+            string s = strings.ApptReminderSlip;
             g.DrawString(s, fTitle, Brushes.Black, printArea, sf); //title
 

Scheduling/trunk/cs/bsdx0200GUISourceCode/strings.Designer.cs

@@ -89 +89 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Appointment Routing Slip.
-        /// </summary>
-        internal static string ApptRoutingSlip {
-            get {
-                return ResourceManager.GetString("ApptRoutingSlip", resourceCulture);
+        ///   Looks up a localized string similar to Appointment Reminder Slip.
+        /// </summary>
+        internal static string ApptReminderSlip {
+            get {
+                return ResourceManager.GetString("ApptReminderSlip", resourceCulture);
             }
         }

Scheduling/trunk/cs/bsdx0200GUISourceCode/strings.ar.resx

@@ -127 +127 @@
     <value>تفاصيل الموعد</value>
   </data>
-  <data name="ApptRoutingSlip" xml:space="preserve">
+  <data name="ApptReminderSlip" xml:space="preserve">
     <value>بطاقة المراجعة</value>
   </data>

Scheduling/trunk/cs/bsdx0200GUISourceCode/strings.resx

@@ -127 +127 @@
     <value>Appointment Details</value>
   </data>
-  <data name="ApptRoutingSlip" xml:space="preserve">
-    <value>Appointment Routing Slip</value>
+  <data name="ApptReminderSlip" xml:space="preserve">
+    <value>Appointment Reminder Slip</value>
   </data>
   <data name="Clinic" xml:space="preserve">