Changeset 863 for Scheduling/trunk


Ignore:
Timestamp:
Jul 13, 2010, 9:04:57 AM (14 years ago)
Author:
Sam Habiel
Message:

more i18n work

Location:
Scheduling/trunk/m
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Scheduling/trunk/m/BSDX07.m

    r803 r863  
    1 BSDX07  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;  ; 6/7/10 2:19pm
     1BSDX07  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;  ; 7/6/10 6:13am
    22        ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
     3    ; v1.3 July 13 2010 - Add support i18n - Dates input as FM dates, not US.
    34        ;
    45        ;
     
    2425        ;
    2526        ;Test lines:
    26 ENDBG   ;BSDX ADD NEW APPOINTMENT^12-28-2000@0900^12-28-2000@1000^370^2^PEDIATRICIAN,DEMO^EXAM^SCRATCH NOTE
     27ENDBG   ;BSDX ADD NEW APPOINTMENT^3091122.0930^3091122.1000^370^2^PEDIATRICIAN,DEMO^EXAM^SCRATCH NOTE
    2728        ;
    2829        N BSDXERR,BSDXIEN,BSDXDEP,BSDXI,BSDXJ,BSDXAPPTI,BSDXDJ,BSDXRESD,BSDXRNOD,BSDXSCD,BSDXC,BSDXERR,BSDXWKIN
     
    4142        ;
    4243        TSTART
     44    ; v1.3 - date passed in as FM Date, not US date.
    4345        ;Check input data for errors
    44         S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@")
    45         S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@")
    46         S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y
    47         I BSDXSTART=-1 D ERR(BSDXI+1,"BSDX07 Error: Invalid Start Time") Q
    48         S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
    49         I BSDXEND=-1 D ERR(BSDXI+1,"BSDX07 Error: Invalid End Time") Q
     46        ; S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@")
     47        ; S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@")
     48        ; S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y
     49        ; I BSDXSTART=-1 D ERR(BSDXI+1,"BSDX07 Error: Invalid Start Time") Q
     50        ; S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
     51        ; I BSDXEND=-1 D ERR(BSDXI+1,"BSDX07 Error: Invalid End Time") Q
    5052        I $L(BSDXEND,".")=1 D ERR(BSDXI+1,"BSDX07 Error: Invalid End Time") Q
    5153        I BSDXSTART>BSDXEND S BSDXTMP=BSDXEND,BSDXEND=BSDXSTART,BSDXSTART=BSDXTMP
  • Scheduling/trunk/m/BSDX12.m

    r614 r863  
    1 BSDX12  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
    2         ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
     1BSDX12  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/6/10 6:33am
     2        ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
     3    ; v 1.3 - i18n support
     4    ; BSDXSTART and BSDXEND passed in FM Dates, not US dates
    35        ;
    46        ;
     
    1214        ;
    1315        ;Test lines:
    14         ;D AVADD^BSDX12(.RES,"1-27-2001@0900","1-27-2001@1000","1","WHITT",2,"SCRATCH AV NOTE") ZW RES
    15         ;BSDX ADD NEW AVAILABILITY^1-27-2001@0900^1-278-2001@1000^1^WHITT^2^SCRATCH AVAILABILITY NOTE
     16        ;D AVADD^BSDX12(.RES,"3091227.09","3091227.0930","1","WHITT",2,"SCRATCH AV NOTE") ZW RES
     17        ;BSDX ADD NEW AVAILABILITY^3091227.09^3091227.0930^1^WHITT^2^SCRATCH AVAILABILITY NOTE
    1618        ;
    1719        N BSDXERR,BSDXIEN,BSDXDEP,BSDXI,BSDXAVID,BSDXI,BSDXERR,BSDXFDA,BSDXMSG,BSDXRESD
     
    2224        S ^BSDXTMP($J,0)="I00020AVAILABILITYID^I00020ERRORID"_$C(30)
    2325        ;Check input data for errors
    24         S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@")
    25         S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@")
    26         S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y
    27         I BSDXSTART=-1 D ERR(70) Q
    28         S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
    29         I BSDXEND=-1 D ERR(70) Q
     26    ; i18n - FM Dates passed in
     27        ; S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@")
     28        ; S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@")
     29        ; S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y
     30        ; I BSDXSTART=-1 D ERR(70) Q
     31        ; S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
     32        ; I BSDXEND=-1 D ERR(70) Q
    3033        I $L(BSDXEND,".")=1 D ERR(70) Q
    3134        I BSDXSTART>BSDXEND S BSDXTMP=BSDXEND,BSDXEND=BSDXSTART,BSDXSTART=BSDXTMP
  • Scheduling/trunk/m/BSDX13.m

    r614 r863  
    1 BSDX13  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
    2         ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
     1BSDX13  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/6/10 7:24am
     2        ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
     3    ; V 1.3 - i18n support - Dates passed to Routine as FM Date
    34        ;
    45        ;
     
    1516        ;
    1617        ;BSDXRESD is BSDX RESOURCE ien
    17         ;BSDXSTART and BSDXEND are external dates
     18        ;BSDXSTART and BSDXEND are FM dates (change in v 1.3)
    1819        ;
    1920        S X="ERROR^BSDX13",@^%ZOSF("TRAP")
     
    2324        K ^BSDXTMP($J)
    2425        S ^BSDXTMP($J,BSDXI)="I00020ERRORID^T00030ERRORTEXT"_$C(30)
    25         S X=BSDXSTART
    26         S %DT="X" D ^%DT
    27         I Y=-1 D ERR(0,"AVDELDT-BSDX13: Invalid Start Date") Q
    28         S BSDXSTART=$P(Y,".")
    29         S X=BSDXEND
    30         S %DT="X" D ^%DT
    31         I Y=-1 D ERR(0,"AVDELDT-BSDX13: Invalid End Date") Q
     26        ; S X=BSDXSTART ; commented out *v1.3
     27        ; S %DT="X" D ^%DT
     28        ; I Y=-1 D ERR(0,"AVDELDT-BSDX13: Invalid Start Date") Q
     29        ; S BSDXSTART=$P(Y,".")
     30        ; S X=BSDXEND
     31        ; S %DT="X" D ^%DT
     32        ; I Y=-1 D ERR(0,"AVDELDT-BSDX13: Invalid End Date") Q
    3233        S BSDXEND=$P(Y,".")_".99999"
    3334        I '+BSDXRESD D ERR(0,"AVDELDT-BSDX13: Invalid Resource ID") Q
  • Scheduling/trunk/m/BSDX33.m

    r851 r863  
    1 BSDX33  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 11:38am
    2         ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
     1BSDX33  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/6/10 8:43am
     2        ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
    33    ; Mods by WV/STAR
     4    ;
     5    ; July 13, 2010
     6    ; v 1.3 adds fixes Rebooking behavior in application
     7    ; also adds i18 support - Dates passed in FM format from application
    48        ;
    59        ;
     
    1317RBNEXT(BSDXY,BSDXDATE,BSDXRES,BSDXTPID) ;EP
    1418        ;Called by BSDX REBOOK NEXT BLOCK to find
    15         ;the next ACCESS BLOCK in resource BSDXRES after BSDXSTART
     19        ;the next ACCESS BLOCK in resource BSDXRES after BSDXDATE
    1620        ;Returns 1 in ERRORID and date in NEXTBLOCK if a block was found or NULL in NEXTBLOCK of no date found
    1721        ;Otherwise, returns 0 and error message in ERRORTEXT
     
    2832        S BSDXRESD=$O(^BSDXRES("B",BSDXRES,0))
    2933        I '+BSDXRESD D ERR2("BSDX REBOOK NEXT BLOCK: Invalid resource name") Q
    30         S X=BSDXDATE,%DT="XT" D ^%DT
    31         I Y=-1 D ERR2(1,"BSDX REBOOK NEXT BLOCK: Invalid datetime") Q
    32         S BSDXDATE=$P(Y,".")
     34        ;
     35    ; S X=BSDXDATE,%DT="XT" D ^%DT
     36        ; I Y=-1 D ERR2(1,"BSDX REBOOK NEXT BLOCK: Invalid datetime") Q
     37        ;
     38    ; S BSDXDATE=$P(Y,".")
    3339        ;
    3440        S BSDXFND=0
     
    7480        I '+BSDXAPPT
    7581        I '$D(^BSDXAPPT(BSDXAPPT,0)) D ERR(1,"BSDX REBOOK SET: Invalid appointment ID") Q
    76         S X=BSDXDATE,%DT="XT" D ^%DT
    77         I Y=-1 D ERR(1,"BSDX REBOOK SET: Invalid rebook datetime") Q
    78         S BSDXDATE=Y
     82        ; i18n (v 1.3)
     83    ;S X=BSDXDATE,%DT="XT" D ^%DT
     84        ;I Y=-1 D ERR(1,"BSDX REBOOK SET: Invalid rebook datetime") Q
     85        ;S BSDXDATE=Y
    7986        S BSDXIENS=BSDXAPPT_","
    8087        S BSDXFDA(9002018.4,BSDXIENS,.11)=BSDXDATE
Note: See TracChangeset for help on using the changeset viewer.