Changeset 851 for Scheduling/trunk/m

Timestamp:

Jul 11, 2010, 10:11:26 AM (14 years ago)

Author:

Sam Habiel

Message:

Fixes to support i18n (Receive FM dates from C# instead of culture specific date).Also, fix for Rebooking. Now it works.

Location:

Scheduling/trunk/m

Files:

• BSDX02.m (modified) (2 diffs)
• BSDX33.m (modified) (2 diffs)
• BSDX34.m (modified) (3 diffs)

Scheduling/trunk/m/BSDX02.m

@@ -1 @@
-BSDX02  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
+BSDX02  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 5:17pm
         ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
         ;
@@ -28 +28 @@
         D ^XBKVAR S X="ETRAP^BSDX02",@^%ZOSF("TRAP")
         ;
-        S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@")
-        S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@")
-        S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y
-        I BSDXSTART=-1 S ^BSDXTMP($J,1)=$C(31) Q
-        S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
-        I BSDXEND=-1 S ^BSDXTMP($J,1)=$C(31) Q
-        ;
+        ; S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y
+        ; I BSDXSTART=-1 S ^BSDXTMP($J,1)=$C(31) Q
+        ; S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
+        ; I BSDXEND=-1 S ^BSDXTMP($J,1)=$C(31) Q
+    ;
         S BSDXI=0
         D STRES

Scheduling/trunk/m/BSDX33.m

@@ -1 @@
-BSDX33  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
+BSDX33  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 11:38am
         ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
+    ; Mods by WV/STAR
         ;
         ;
@@ -43 +44 @@
         E  S Y=BSDXFND X ^DD("DD") S BSDXFND=Y
         S BSDXI=BSDXI+1
+    ;//smh - bug: Need to replace @ in FM date for C# to recognize it
+    S BSDXFND=$TR(BSDXFND,"@"," ")
+    ;//smh end fix
         S ^BSDXTMP($J,BSDXI)="1^"_BSDXFND_"^"_$C(30)_$C(31)
         Q

Scheduling/trunk/m/BSDX34.m

@@ -1 @@
-BSDX34  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/21/10 9:56pm
+BSDX34  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 11:28am
         ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
         ;
@@ -39 +39 @@
         ;Used in generating rebook letters for a clinic
         ;BSDXCLST is a |-delimited list of BSDX RESOURCE iens.  (The last |-piece is null, so discard it.)
-        ;BSDXBEG and BSDXEND are in external date form.
         ;Called by BSDX REBOOK CLINIC LIST and BSDX CANCEL CLINIC LIST via entry point CANCLIN above
-        ;
+        ;Jul 11 2010 (smh):
+    ;for i18n, pass BSDXBEG and BSDXEND in FM format.
         ;
         S X="RBERR^BSDX34",@^%ZOSF("TRAP")
@@ -48 +48 @@
         N %DT,Y,BSDXJ,BSDXCID,BSDXCLN,BSDXSTRT,BSDXAID,BSDXNOD,BSDXLIST,BSDX,BSDY
         ;Convert beginning and ending dates
-        ;
-        S X=BSDXBEG,%DT="XT" D ^%DT S BSDXBEG=$P(Y,"."),BSDXBEG=BSDXBEG-1,BSDXBEG=BSDXBEG_".9999"
-        I Y=-1 D RBERR Q
-        S X=BSDXEND,%DT="XT" D ^%DT S BSDXEND=$P(Y,"."),BSDXEND=BSDXEND_".9999"
-        I Y=-1 D RBERR Q
+        ;TODO: Validation of date to make sure it's a right FM Date
+        S BSDXBEG=BSDXBEG-1,BSDXBEG=BSDXBEG_".9999"
+        S BSDXEND=BSDXEND_".9999"
+    ;
         I BSDXCLST="" D RBERR Q
         ;