Changeset 963 for Scheduling/trunk

Timestamp:

Sep 28, 2010, 9:37:08 AM (14 years ago)

Author:

Sam Habiel

Message:

Updated files to intelligently deal with mulitple divisions issue

Location:

Scheduling/trunk/m

Files:

• BSDX01.m (modified) (9 diffs)
• BSDX32.m (modified) (2 diffs)

Scheduling/trunk/m/BSDX01.m

@@ -1 @@
-BSDX01  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/16/10 9:54am
+BSDX01  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/28/10 4:47pm
         ;;1.4;BSDX;;Sep 07, 2010
+    ; Change Log:
+    ; V 1.4.1 (Sep 28 2010): Separate user divisions based on $$INDIV.
+    ; Affects:
+    ; - RESUSR
+    ; - DEPUSR
+    ; - DEPRES
         ;
         ;
@@ -39 +45 @@
         ;Called by BSDX RESOURCE GROUPS BY USER
         ;Returns ADO Recordset with all ACTIVE resource group names to which user has access
-        ;based on entries in BSDX RESOURCE USER file
+        ;based on entries in BSDX RESOURCE USER file (Say this again for myself: Groups ONLY!!)
         ;If BSDXDUZ=0 then returns all department names for current DUZ
+    ;What is returned depends if it is in the same divsion as the hosptial location if it is linked
+    ;if not linked, always returned.
         ;If user BSDXDUZ possesses the key BSDXZMGR or XUPROGMODE
         ;then ALL resource group names are returned regardless of whether any active resources
@@ -62 +70 @@
         I 'BSDXMGR,$D(^BSDXRSU("AC",BSDXDUZ)) S BSDXIEN=0 F  S BSDXIEN=$O(^BSDXRSU("AC",BSDXDUZ,BSDXIEN)) Q:'+BSDXIEN  D
         . S BSDXRES=$P(^BSDXRSU(BSDXIEN,0),U)
-        . Q:'$D(^BSDXDEPT("AB",BSDXRES))
+        . 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)
+    . Q:'$$INDIV2(BSDXRES)  ; If not in the same division as user, quit
         . S BSDXRNOD=^BSDXRES(BSDXRES,0)
         . ;QUIT if the resource is inactive
@@ -178 +187 @@
         ;Returns ADO Recordset with all ACTIVE GROUP/RESOURCE combinations
         ;to which user has access based on entries in BSDX RESOURCE USER file
+    ;by Division (set in DUZ(2))
         ;If BSDXDUZ=0 then returns all ACTIVE GROUP/RESOURCE combinations for current DUZ
         ;If user BSDXDUZ possesses the key BSDXZMGR or XUPROGMODE
@@ -198 +208 @@
         I 'BSDXMGR,$D(^BSDXRSU("AC",BSDXDUZ))  S BSDXIEN=0 F  S BSDXIEN=$O(^BSDXRSU("AC",BSDXDUZ,BSDXIEN)) Q:'+BSDXIEN  D
         . S BSDXRES=$P(^BSDXRSU(BSDXIEN,0),U)
-        . Q:'$D(^BSDXDEPT("AB",BSDXRES))
+        . Q:'$D(^BSDXDEPT("AB",BSDXRES))  ; Quit if Resource isn't part of any Group
+    . Q:'$$INDIV2(BSDXRES)  ; Quit if Resource isn't in same division as user.
         . S BSDXRNOD=$G(^BSDXRES(BSDXRES,0))
         . Q:BSDXRNOD=""
@@ -220 +231 @@
         . S BSDXRES=0 F  S BSDXRES=$O(^BSDXDEPT(BSDXIEN,1,BSDXRES)) Q:'+BSDXRES  D
         . . N BSDXRESD
-        . . Q:'$D(^BSDXDEPT(BSDXIEN,1,BSDXRES,0))
+        . . Q:'$D(^BSDXDEPT(BSDXIEN,1,BSDXRES,0))  ; Quit if zero node is invalid in multiple
         . . S BSDXRESD=$P(^BSDXDEPT(BSDXIEN,1,BSDXRES,0),"^")
-        . . Q:'$D(^BSDXRES(BSDXRESD,0))
+        . . Q:'$D(^BSDXRES(BSDXRESD,0))  ; Quit if zero node of resouce file is invalid
+    . . Q:'$$INDIV2(BSDXRESD)  ; Quit if resource is not in the same division
         . . S BSDXRNOD=$G(^BSDXRES(BSDXRESD,0))
         . . Q:BSDXRNOD=""
@@ -257 +269 @@
         Q 1
 INDIV(BSDXSC) ; PEP - Is ^SC clinic in the same DUZ(2) as user?
+    ; Input: BSDXSC - Hospital Location IEN
+    ; Output: True or False
     I '+BSDXSC QUIT 1  ;If not tied to clinic, yes
     I '$D(^SC(BSDXSC,0)) QUIT 1 ; If Clinic does not exist, yes
@@ -266 +280 @@
     E  Q 0 ; Otherwise, no
     QUIT
+INDIV2(BSDXRES) ; PEP - Is Resource in the same DUZ(2) as user?
+    ; Input BSDXRES - BSDX RESOURCE IEN
+    ; Output: True of False
+    Q $$INDIV($P($G(^BSDXRES(BSDXRES,0)),U,4)) ; Extract Hospital Location and send to $$INDIV
 UnitTestINDIV
     W "Testing if they are the same",!
@@ -280 +298 @@
     I $$INDIV(2) W "ERROR",!
     QUIT
+UnitTestINDIV2
+    W "Testing if they are the same",!
+    S DUZ(2)=69
+    I $$INDIV2(22)'=0 W "ERROR",!
+    I $$INDIV2(25)'=1 W "ERROR",!
+    I $$INDIV2(26)'=1 W "ERROR",!
+    I $$INDIV2(27)'=1 W "ERROR",!
+    QUIT

Scheduling/trunk/m/BSDX32.m

@@ -20 +20 @@
 HOSPLOC(BSDXY)  ;EP
         ;Called by BSDX HOSPITAL LOCATION
+    ;Returns all hospital locations that are active AND in the same division as the user
         ;
         N BSDXI,BSDXIEN,BSDXNOD,BSDXNAM,BSDXINA,BSDXREA,BSDXSCOD
@@ -33 +34 @@
         . Q:'+BSDXIEN>0
         . Q:'$D(^SC(+BSDXIEN,0))
+    . Q:'$$INDIV^BSDX01(+BSDXIEN)  ; if not in the same division, quit
         . S BSDXINA=$$GET1^DIQ(44,BSDXIEN_",",2505) ;INACTIVATE
         . S BSDXREA=$$GET1^DIQ(44,BSDXIEN_",",2506) ;REACTIVATE