Removed referenced to QUOTE_SIG_PWD_ENTRY and
replaced with NDW_VERIFY_USER. Added barcode scan function to NDW_VERIFY_USER. fixed two instances of ohms square unit characters being garbled by git minor modification to NDW_VERIFY_USER_EVENTS lost focus events minor change to gotfocus event logic
This commit is contained in:
committed by
Infineon\StieberD
parent
4b26d37a1c
commit
741a8450e3
@ -128,6 +128,8 @@ EQU COL$STAGE_SURFSCAN_RECIPE TO 5
|
||||
Equ COL$SIG_STAGE To 1
|
||||
Equ COL$SIG_STAGE_DESC To 2
|
||||
|
||||
EQU OHMS_SQUARE$ TO CHAR(234):'/':CHAR(220) ;* Ohms/Square
|
||||
|
||||
ErrCode = ''
|
||||
ErrorMsg = ''
|
||||
ErrTitle = 'Error in Comm_Prod_Spec'
|
||||
@ -1009,9 +1011,9 @@ BEGIN CASE
|
||||
|
||||
CASE MetTest = 'LW_RHO'
|
||||
|
||||
Units = 'ê/Ü' ;* Resistivity units for 'ohms square' (see Metrology_Units popup)
|
||||
Units = OHMS_SQUARE$ ;* Resistivity units for 'ohms square' (see Metrology_Units popup)
|
||||
EpiProps = XLATE('PRS_PROP',PSNo:'*':LayerNo:'*RES','','X')
|
||||
IF EpiProps<PRS_PROP_UNITS_ORG$> = 'ê/Ü' THEN
|
||||
IF EpiProps<PRS_PROP_UNITS_ORG$> = OHMS_SQUARE$ THEN
|
||||
DefProp = EpiProps<PRS_PROP_RAW_MIN$>
|
||||
END
|
||||
|
||||
@ -1030,9 +1032,9 @@ BEGIN CASE
|
||||
DefProp = XLATE('PRS_PROP',PSNo:'*':LayerNo:'*THICK',PRS_PROP_RAW_MAX$,'X')
|
||||
|
||||
CASE MetTest = 'LW_RHO'
|
||||
Units = 'ê/Ü' ;* Resistivity units for 'ohms square' (see Metrology_Units popup)
|
||||
Units = 'ê/Ü' ;* Resistivity units for 'ohms square' (see Metrology_Units popup)
|
||||
EpiProps = XLATE('PRS_PROP',PSNo:'*':LayerNo:'*RES','','X')
|
||||
IF EpiProps<PRS_PROP_UNITS_ORG$> = 'ê/Ü' THEN
|
||||
IF EpiProps<PRS_PROP_UNITS_ORG$> = 'ê/Ü' THEN
|
||||
DefProp = EpiProps<PRS_PROP_RAW_MAX$>
|
||||
END
|
||||
|
||||
@ -1223,7 +1225,8 @@ SignNextMode:
|
||||
END CASE
|
||||
|
||||
LOCATE @USER4 IN QualUsers USING @VM SETTING Pos THEN
|
||||
Valid = Dialog_Box( 'QUOTE_SIG_PWD_ENTRY', @WINDOW, @USER4:@VM:XLATE( 'LSL_USERS', @USER4, LSL_USERS_PASSWORD$, 'X' ) )
|
||||
Valid = Dialog_Box('NDW_VERIFY_USER', @Window, @User4)
|
||||
Valid = Valid<1>
|
||||
END ELSE
|
||||
ErrorMsg = 'Current user is not an authorized ':NextMode:' signer.'
|
||||
ErrMsg(ErrorMsg)
|
||||
@ -1276,14 +1279,16 @@ UnsignCurrMode:
|
||||
END CASE
|
||||
|
||||
LOCATE @USER4 IN QualUsers USING @VM SETTING Pos THEN
|
||||
Valid = Dialog_Box( 'QUOTE_SIG_PWD_ENTRY', @WINDOW, @USER4:@VM:XLATE( 'LSL_USERS', @USER4, LSL_USERS_PASSWORD$, 'X' ) )
|
||||
Valid = Dialog_Box('NDW_VERIFY_USER', @Window, @User4)
|
||||
Valid = Valid<1>
|
||||
END ELSE
|
||||
ErrorMsg = 'Current user is not an authorized ':UnsignMode:' signer.'
|
||||
ErrMsg(ErrorMsg)
|
||||
RETURN
|
||||
END
|
||||
|
||||
Valid = Dialog_Box( 'QUOTE_SIG_PWD_ENTRY', @WINDOW, @USER4:@VM:XLATE( 'LSL_USERS', @USER4, LSL_USERS_PASSWORD$, 'X' ) )
|
||||
Valid = Dialog_Box('NDW_VERIFY_USER', @Window, @User4)
|
||||
Valid = Valid<1>
|
||||
|
||||
IF Valid = 1 THEN
|
||||
CurrDate = OCONV(Date(),'D4/')
|
||||
@ -2146,4 +2151,3 @@ ColorTab:
|
||||
|
||||
return
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user