Changeset 965 for Scheduling/trunk


Ignore:
Timestamp:
Sep 29, 2010, 3:05:19 AM (14 years ago)
Author:
Sam Habiel
Message:

Rollback for yesterday's changes

Location:
Scheduling/trunk/m
Files:
2 edited

Legend:

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

    r963 r965  
    1 BSDX01  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/28/10 4:47pm
     1BSDX01  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/29/10 10:20am
    22        ;;1.4;BSDX;;Sep 07, 2010
    3     ; Change Log:
    4     ; V 1.4.1 (Sep 28 2010): Separate user divisions based on $$INDIV.
    5     ; Affects:
    6     ; - RESUSR
    7     ; - DEPUSR
    8     ; - DEPRES
    9         ;
    103        ;
    114SUINFOD(BSDXY,BSDXDUZ)  ;EP Debugging entry point
    12         ;
    13         ;
    145        ;D DEBUG^%Serenji("SUINFO^BSDX01(.BSDXY,BSDXDUZ)")
    156        ;
     
    4738        ;based on entries in BSDX RESOURCE USER file (Say this again for myself: Groups ONLY!!)
    4839        ;If BSDXDUZ=0 then returns all department names for current DUZ
    49     ;What is returned depends if it is in the same divsion as the hosptial location if it is linked
    5040    ;if not linked, always returned.
    5141        ;If user BSDXDUZ possesses the key BSDXZMGR or XUPROGMODE
     
    7161        . S BSDXRES=$P(^BSDXRSU(BSDXIEN,0),U)
    7262        . Q:'$D(^BSDXDEPT("AB",BSDXRES))  ; If not part of a group, quit ("AB" is the whole file index for the resource multiple in Group file)
    73     . Q:'$$INDIV2(BSDXRES)  ; If not in the same division as user, quit
     63    . ; Q:'$$INDIV2(BSDXRES)  ; If not in the same division as user, quit
    7464        . S BSDXRNOD=^BSDXRES(BSDXRES,0)
    7565        . ;QUIT if the resource is inactive
     
    132122    . ;Q:$P(BSDXRNOD,U,2)=1  ;Inactive resources not filtered
    133123        . ;S BSDXRDAT=$P(BSDXRNOD,U,1,4)
    134         . I '$$INDIV(BSDXSC) QUIT  ; If not in division, quit
     124        . ;I '$$INDIV(BSDXSC) QUIT  ; If not in division, quit
    135125    . K BSDXRDAT
    136126        . F BSDX=1:1:4 S $P(BSDXRDAT,U,BSDX)=$P(BSDXRNOD,U,BSDX)
     
    187177        ;Returns ADO Recordset with all ACTIVE GROUP/RESOURCE combinations
    188178        ;to which user has access based on entries in BSDX RESOURCE USER file
    189     ;by Division (set in DUZ(2))
    190179        ;If BSDXDUZ=0 then returns all ACTIVE GROUP/RESOURCE combinations for current DUZ
    191180        ;If user BSDXDUZ possesses the key BSDXZMGR or XUPROGMODE
     
    209198        . S BSDXRES=$P(^BSDXRSU(BSDXIEN,0),U)
    210199        . Q:'$D(^BSDXDEPT("AB",BSDXRES))  ; Quit if Resource isn't part of any Group
    211     . Q:'$$INDIV2(BSDXRES)  ; Quit if Resource isn't in same division as user.
     200    . ;Q:'$$INDIV2(BSDXRES)  ; Quit if Resource isn't in same division as user.
    212201        . S BSDXRNOD=$G(^BSDXRES(BSDXRES,0))
    213202        . Q:BSDXRNOD=""
     
    234223        . . S BSDXRESD=$P(^BSDXDEPT(BSDXIEN,1,BSDXRES,0),"^")
    235224        . . Q:'$D(^BSDXRES(BSDXRESD,0))  ; Quit if zero node of resouce file is invalid
    236     . . Q:'$$INDIV2(BSDXRESD)  ; Quit if resource is not in the same division
     225    . . ;Q:'$$INDIV2(BSDXRESD)  ; Quit if resource is not in the same division
    237226        . . S BSDXRNOD=$G(^BSDXRES(BSDXRESD,0))
    238227        . . Q:BSDXRNOD=""
  • Scheduling/trunk/m/BSDX32.m

    r963 r965  
    1 BSDX32  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
     1BSDX32  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/29/10 10:21am
    22        ;;1.4;BSDX;;Sep 07, 2010
    33        ;
     
    2020HOSPLOC(BSDXY)  ;EP
    2121        ;Called by BSDX HOSPITAL LOCATION
    22     ;Returns all hospital locations that are active AND in the same division as the user
     22    ;Returns all hospital locations that are active
    2323        ;
    2424        N BSDXI,BSDXIEN,BSDXNOD,BSDXNAM,BSDXINA,BSDXREA,BSDXSCOD
     
    3434        . Q:'+BSDXIEN>0
    3535        . Q:'$D(^SC(+BSDXIEN,0))
    36     . Q:'$$INDIV^BSDX01(+BSDXIEN)  ; if not in the same division, quit
     36    . ;Q:'$$INDIV^BSDX01(+BSDXIEN)  ; if not in the same division, quit
    3737        . S BSDXINA=$$GET1^DIQ(44,BSDXIEN_",",2505) ;INACTIVATE
    3838        . S BSDXREA=$$GET1^DIQ(44,BSDXIEN_",",2506) ;REACTIVATE
Note: See TracChangeset for help on using the changeset viewer.