pre cutover push

LSL2/STPROC/LSL_USERS_SERVICES.txt

@@ -24,13 +24,14 @@ Function LSL_USERS_SERVICES(@Service, @Params)
 $insert LOGICAL
 $insert SERVICE_SETUP
 $Insert LSL_USERS_EQU
+$Insert RLIST_EQUATES
 
-equ crlf$ to \0D0A\
-equ tab$ to char(09)
-equ comma$ to char(44)
-equ space$ to char(32)
-equ record$ to char(00)
-equ scolon$ to char(59)
+equ crlf$      to \0D0A\
+equ tab$       to char(09)
+equ comma$     to char(44)
+equ space$     to char(32)
+equ record$    to char(00)
+equ scolon$    to char(59)
 EQU MONDAY$    to 1
 EQU TUESDAY$   to 2
 EQU WEDNESDAY$ to 3
@@ -98,14 +99,33 @@ Service ExportUsers()
 		end
 		Unlock hSysLists, ServiceKeyID else Null
 	end
+	
 end service
 
+
 Service GetGroups()
-	Groups = Database_Services('ReadDataRow', 'SEC_GROUPS', '%RECORDS%')
+
+    Groups   = ''
+    Sentence = 'SELECT SEC_GROUPS BY GROUP'
+    rv       = Set_Status(0)
+    RList(Sentence, TARGET_ACTIVELIST$, '', '', '')
+    If (@List_Active EQ 3) AND (@RecCount GT 0) then
+        EOF     = False$
+        Loop
+            Readnext GroupID else EOF = True$
+        Until EOF EQ True$
+            Groups := GroupID : @FM
+        Repeat
+    end
+    Groups[-1, 1] = ''
+
 	Response = Groups
+	
 end service
 
+
 Service GetMembersInGroup(GroupList)
+    
 	Members = ''
 	If GroupList NE '' then
 		GroupsToSearch = 'GROUPS'
@@ -134,6 +154,7 @@ Service GetMembersInGroup(GroupList)
 
 end service
 
+
 Service GetOnShiftUsersByClass(Class, IncludeNextShift)
     
     DatetimeNow   = OConv(SRP_DateTime("Now"), 'DT')
@@ -144,9 +165,10 @@ Service GetOnShiftUsersByClass(Class, IncludeNextShift)
     end
     Open 'DICT.LSL_USERS' to DictLSLUsers then
             
-        SearchString    = ''
+        SearchString  = ''
         SearchString := 'CLASSIFICATION':@VM:Class:@FM
         SearchString := 'SHIFT' : @VM : CurrentShift<1,1>: @VM : CurrentShift<1,2>: @VM : CurrentShift<1,3>: @VM : CurrentShift<1,4> :@FM
+        SearchString := 'ACTIVE' : @VM : True$ : @FM
         LSLUsersKeys  = ''
         Btree.Extract(SearchString, 'LSL_USERS', DictLSLUsers, LSLUsersKeys, '', '')
         ErrCode       = ''
@@ -157,9 +179,12 @@ Service GetOnShiftUsersByClass(Class, IncludeNextShift)
     end else
         ErrorMsg = 'Error in ':Service:' service. Error opening LSL_USERS dictionary.'
     end
+    
 end service
 
+
 Service GetShiftByDate(Date, GenerateFlag)
+    
     OnShift         = ''; *Return Value
     if Date EQ '' then
         Error_Services('Add', 'Error in LSL_USERS_SERVICES. No Date Supplied.')
@@ -323,5 +348,3 @@ end service
 
 
 
-
-