Updated ICAR form and commuter module for shift designation changes

LSL2/STPROC/COMM_ICAR.txt

@@ -55,8 +55,6 @@ BEGIN CASE
     CASE Instruction = 'SignEmpSup'				; GOSUB SignEmpSup
     CASE Instruction = 'SignEmpReview'			; GOSUB SignEmpReview
     CASE Instruction = 'SignSecSup'				; GOSUB SignSecSup
-    CASE Instruction = 'SignRengSpec'			; GOSUB SignRengSpec
-    CASE Instruction = 'SignMfgMgr'				; GOSUB SignMfgMfr
     CASE Instruction = 'LotInfoDC'				; GOSUB LotInfoDC
     CASE Instruction = 'LUDeptMgrID'            ; GOSUB LUDeptMgrID
     CASE Instruction = 'StatusChange'           ; GOSUB StatusChange
@@ -82,11 +80,10 @@ Create:
         End_Window(@WINDOW)
         RETURN
     END
-    
-    //Set_List_Box_Data( @WINDOW )
-    
     obj_Appwindow('Create',@WINDOW)
-    
+    ShiftOptions = XLATE('LISTBOX_CONFIG', 'SHIFT', 1,'X')
+    Swap @VM with @FM in ShiftOptions
+    Set_Property(@Window : '.SHIFT', 'LIST', ShiftOptions)
     IOOptions = Get_Property(@WINDOW,'IOOPTIONS')
     IOOptions<11> = 1		;* QBF event generates READ event
     
@@ -103,15 +100,6 @@ Create:
     IF Admin_User( @USER4 ) THEN
         Set_Property(@WINDOW:'.BUTTON_21', 'ENABLED', 1)
     end
-    *    
-    *    SuperID			= Get_Property(@WINDOW:'.RESP_SUPERVISOR_ID','TEXT')
-    *    If SuperID EQ '' then
-    *        SuperID = @USER4
-    *        SuperName = XLATE( 'LSL_USERS', SuperID, 'FIRST_LAST', 'X' )
-    *        Set_Property(@WINDOW:'.RESP_SUPERVISOR_ID', 'TEXT', SuperID)
-    *        Set_Property(@WINDOW:'.RESP_SUPERVISOR_NAME', 'TEXT', SuperName)
-    *        
-    *    end
     RespSupervisorSig	= Get_Property(@WINDOW:'.RESP_SUPERVISOR_SIGNATURE','TEXT')
     IF RespSupervisorSig<> '' THEN
         Set_Property(@WINDOW:'.BUTTON_20', 'ENABLED', 0)
@@ -127,7 +115,6 @@ Read:
     
     ICAR_RefID = Get_Property(@WINDOW:'.ICAR_REF_ID','TEXT') 
     
-    
     IF MemberOf(@USER4,'ICAR_RESP_SUP') THEN
         SupervisorFlag = 1
     END ELSE
@@ -324,8 +311,6 @@ RETURN
 Close:
 * * * * * * *
     
-    obj_Notes('Inbox',@USER4)
-    
     
 RETURN
 
@@ -364,13 +349,6 @@ SetDeptMgr:
     DeptManager	    = Get_Property(@WINDOW:'.DEPT_MANAGER_ID','TEXT')
     EmployeeID      = Get_Property(@WINDOW:'.USER_ID','TEXT')
     EmpSupervisorID = Get_Property(@WINDOW:'.RESP_SUPERVISOR_ID','TEXT')
-*    EmpShift        = XLATE('LSL_USERS', EmployeeID, 'SHIFT', 'X')
-*    Shift           = Get_Property(@WINDOW:'.SHIFT','TEXT')
-*    If EmpShift EQ 1 or EmpShift EQ 2 or EmpShift EQ 3 or EmpShift EQ 4 then
-*        If Shift EQ '' then
-*            Set_Property(@WINDOW:'.SHIFT','TEXT', EmpShift)
-*        end
-*    end
 
     BEGIN CASE
         CASE DeptResp = 'Production'
@@ -398,22 +376,14 @@ return
 Refresh:
 * * * * * * *
     
-*    IF Security_Check( 'ICAR', Delete$ ) THEN
-*        Set_Property(@WINDOW:'.NON_CONF_SETUP','VISIBLE',1)
-*    END ELSE
-*        Set_Property(@WINDOW:'.NON_CONF_SETUP','VISIBLE',0)
-*    END
-    
     IF MemberOf(@USER4,'SUPERVISOR') THEN
         Set_Property(@WINDOW:'.NON_CONF_SETUP','VISIBLE',1)
     END ELSE
         Set_Property(@WINDOW:'.NON_CONF_SETUP','VISIBLE',0)
     END
-    
     RespSuperID 	= Get_Property(@WINDOW:'.RESP_SUPERVISOR_ID','TEXT')
     EntryIDText		= Get_Property(@WINDOW:'.ENTRY_ID','TEXT')
     CurrUserText	= OCONV( @USER4, '[XLATE_CONV,LSL_USERS*FIRST_LAST]' )
-    
     IF RespSuperID NE '' AND CurrUserText NE EntryIDText THEN
         IF Security_Check('ICAR',Delete$) THEN
             Set_Property(@WINDOW:'.RESP_SUPERVISOR_ID','ENABLED',1)
@@ -839,8 +809,6 @@ SignEmpReview:
         END
     END
 
-    
-    
 RETURN
 
 // Responsible Supervisor
@@ -910,9 +878,6 @@ SignEmpSup:
             ErrMsg('May only be signed by the responsible supervisor...')
         END
     END
-    
-    
-    
 RETURN
 
 
@@ -989,108 +954,6 @@ SignSecSup:
     
 RETURN
 
-
-* * * * * * *
-SignRengSpec:
-* * * * * * *
-    // Not Used
-    
-    RengSpecSigID = Get_Property(@WINDOW:'.RENG_SPEC_SIG_ID','TEXT')
-    
-    IF RengSpecSigID <> '' THEN
-        MsgInfo = ''
-        MsgInfo<mtext$> = 'This ICAR has already been signed by the Reengineering Specialist.'
-        MsgInfo<micon$> = '!'
-        Msg( '', MsgInfo )
-    END ELSE
-        
-        Valid = Dialog_Box( 'QUOTE_SIG_PWD_ENTRY', @WINDOW, @USER4:@VM:XLATE( 'LSL_USERS', @USER4, LSL_USERS_PASSWORD$, 'X' ) )
-        
-        IF Valid THEN
-            
-            CurrDate = OCONV(Date(),'D4/')
-            CurrTime = OCONV(Time(),'MTH')
-            CurrDTM = CurrDate:' ':CurrTime
-            
-            Set_Property(@WINDOW:'.RENG_SPEC_SIG_ID','TEXT', @USER4 )
-            Set_Property(@WINDOW:'.RENG_SPEC_SIG_NAME','TEXT',XLATE( 'LSL_USERS', @USER4, 'FIRST_LAST', 'X' ))
-            Set_Property(@WINDOW:'.RENG_SPEC_SIG_DTM','TEXT',CurrDTM)
-            
-            Set_Property(@WINDOW,'SAVEWARN',1)
-            
-        END
-        
-    END
-    
-    
-    * * * * * * *
-SignMfgMfr:
-* * * * * * *
-    // Disabled 10/4/23
-    
-    ICAR_RefID		= Get_Property(@WINDOW:'.ICAR_REF_ID','TEXT')
-    MfgSig			= Get_Property(@WINDOW:'.MFG_SIGNATURE','TEXT')
-    Confirmed		= Get_Property(@WINDOW:'.CONFIRM_STATUS','VALUE')
-    RespSuperSig	= Get_Property(@WINDOW:'.RESP_SUPERVISOR_SIGNATURE','TEXT')
-    
-    IF MfgSig<> '' THEN
-        ErrMsg('This ICAR has already been verified by the Quality Manager.')
-    END ELSE
-        * 	IF Confirmed = '' THEN
-        *		Errmsg('You must select confirmed or unconfirmed...')
-        *		RETURN
-        * 	END	
-        
-        IF RespSuperSig NE '' THEN
-            
-            SignatureInfo = XLATE( 'CONFIG', 'QUOTE_SIGS', '', 'X' )
-            QualityMgr	= SignatureInfo<QualityMgr$>
-            QualityPwd	= XLATE( 'LSL_USERS', QualityMgr, lsl_users_password$, 'X' )
-            
-            IF @USER4 = QualityMgr THEN
-                
-                Valid = Dialog_Box( 'QUOTE_SIG_PWD_ENTRY', @WINDOW, @USER4:@VM:XLATE( 'LSL_USERS', @USER4, LSL_USERS_PASSWORD$, 'X' ) )
-                
-                IF Valid THEN
-                    
-                    CurrDate = OCONV(Date(),'D4/')
-                    CurrTime = OCONV(Time(),'MTH')
-                    CurrDTM = CurrDate:' ':CurrTime
-                    
-                    Set_Property(@WINDOW:'.MFG_MGR_SIG_ID','TEXT', @USER4 )
-                    Set_Property(@WINDOW:'.MFG_SIGNATURE_NAME','TEXT',XLATE( 'LSL_USERS', @USER4, 'FIRST_LAST', 'X' ))
-                    Set_Property(@WINDOW:'.MFG_MGR_SIG_DTM','TEXT',CurrDTM)
-                    
-                    Set_Property(@WINDOW,'SAVEWARN',1)
-                    
-                    EntryId = XLATE( 'ICAR', ICAR_RefId, icar_entry_id$, 'X' )			   
-                    QualityMgr = XLATE( 'CONFIG', 'QUOTE_SIGS', QualityMgr$, 'X' )
-                    Set_Property(@WINDOW:'.STATUS','VALUE','F')
-                    
-                    
-                    Recipients		= RespSuperSig:@VM:EntryID
-                    SentFrom		= 'System'
-                    Subject			= 'ICAR No ':ICAR_RefId:' signed by Quality Manager'
-                    Message			= 'This ICAR was signed for verification by ':OCONV( @USER4, '[XLATE_CONV,LSL_USERS*FIRST_LAST]' ):' on ':OCONV( DATE(), 'D2/' ):' at ':OCONV( TIME(), 'MTH' ):'.'
-                    AttachWindow	= 'ICAR'
-                    AttachKey		= ICAR_RefID
-                    SendToGroup		= ''
-                    
-                    Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
-                    obj_Notes('Create',Parms)
-                    
-                END
-            END ELSE
-                ErrMsg('May only be signed by the Quality Manager...')
-            END
-        END ELSE
-            ErrMsg('You cannot verify this ICAR until it has been signed by the responsible supervisor...')
-        END
-    END
-    
-RETURN
-
-
 * * * * * * *
 LotInfoDC:
 * * * * * * *
@@ -1145,3 +1008,4 @@ RETURN
 
 
 
+