Changeset 965 for Scheduling/trunk

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:

• BSDX01.m (modified) (7 diffs)
• BSDX32.m (modified) (3 diffs)

Scheduling/trunk/m/BSDX01.m

@@ -1 @@
-BSDX01  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/28/10 4:47pm
+BSDX01  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/29/10 10:20am
         ;;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
-        ;
         ;
 SUINFOD(BSDXY,BSDXDUZ)  ;EP Debugging entry point
-        ;
-        ;
         ;D DEBUG^%Serenji("SUINFO^BSDX01(.BSDXY,BSDXDUZ)")
         ;
@@ -47 +38 @@
         ;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
@@ -71 +61 @@
         . S BSDXRES=$P(^BSDXRSU(BSDXIEN,0),U)
         . 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
+    . ; Q:'$$INDIV2(BSDXRES)  ; If not in the same division as user, quit
         . S BSDXRNOD=^BSDXRES(BSDXRES,0)
         . ;QUIT if the resource is inactive
@@ -132 +122 @@
     . ;Q:$P(BSDXRNOD,U,2)=1  ;Inactive resources not filtered
         . ;S BSDXRDAT=$P(BSDXRNOD,U,1,4)
-        . I '$$INDIV(BSDXSC) QUIT  ; If not in division, quit
+        . ;I '$$INDIV(BSDXSC) QUIT  ; If not in division, quit
     . K BSDXRDAT
         . F BSDX=1:1:4 S $P(BSDXRDAT,U,BSDX)=$P(BSDXRNOD,U,BSDX)
@@ -187 +177 @@
         ;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
@@ -209 +198 @@
         . S BSDXRES=$P(^BSDXRSU(BSDXIEN,0),U)
         . 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.
+    . ;Q:'$$INDIV2(BSDXRES)  ; Quit if Resource isn't in same division as user.
         . S BSDXRNOD=$G(^BSDXRES(BSDXRES,0))
         . Q:BSDXRNOD=""
@@ -234 +223 @@
         . . S BSDXRESD=$P(^BSDXDEPT(BSDXIEN,1,BSDXRES,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
+    . . ;Q:'$$INDIV2(BSDXRESD)  ; Quit if resource is not in the same division
         . . S BSDXRNOD=$G(^BSDXRES(BSDXRESD,0))
         . . Q:BSDXRNOD=""

Scheduling/trunk/m/BSDX32.m

@@ -1 @@
-BSDX32  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
+BSDX32  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/29/10 10:21am
         ;;1.4;BSDX;;Sep 07, 2010
         ;
@@ -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
+    ;Returns all hospital locations that are active 
         ;
         N BSDXI,BSDXIEN,BSDXNOD,BSDXNAM,BSDXINA,BSDXREA,BSDXSCOD
@@ -34 +34 @@
         . Q:'+BSDXIEN>0
         . Q:'$D(^SC(+BSDXIEN,0))
-    . Q:'$$INDIV^BSDX01(+BSDXIEN)  ; if not in the same division, quit
+    . ;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