Merged PR 15375: Added in missing CHANGED event on CMB_EQUIP_TYPE. Also fixed initialization o...

Needed Friday bugfix. Added in missing CHANGED event on CMB_EQUIP_TYPE. Also fixed initialization of this field. Cleaned up formatting

Related work items: #255186

LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt

@@ -24,6 +24,7 @@ Return EventFlow or 1
 //-----------------------------------------------------------------------------
 
 Event WINDOW.CREATE(CreateParam)
+    
     PlaceDialog(-2, -2)
     Set_Property(@Window, 'VISIBLE', 1)
     NewTWSystemActive   = XLATE('APP_INFO', 'NEW_TW_SYSTEM_ACTIVE_SWITCH', 1, 'X')
@@ -84,12 +85,15 @@ Event WINDOW.CREATE(CreateParam)
 End Event
 
 Event Window.CLOSE(CancelFlag, CloseFlags)
+    
     Result      = ''
     Result<1>   = False$
     End_Dialog(@Window, Result)
+    
 end event
 
 Event EDL_LOT_ID.LOSTFOCUS(Flag, FocusID)
+    
     LotIdString = UCASE(Get_Property(@Window : '.EDL_LOT_ID', 'TEXT'))
     If LotIdString NE '' then
         If LotIdString[1, 4] EQ '1TTW' then
@@ -102,7 +106,21 @@ Event EDL_LOT_ID.LOSTFOCUS(Flag, FocusID)
     
 end event
 
+Event CMB_EQUIP_TYPE.CHANGED(NewData)
+    
+    ReactorOpts = Get_Property(@Window, '@REACTOR_OPTS')
+    NonReactorOpts = Get_Property(@Window, '@NON_REACTOR_OPTS')
+    Begin Case
+        Case NewData EQ 'Non-Reactor'
+            Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'LIST', NonReactorOpts)
+        Case NewData EQ 'Reactor'
+            Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'LIST', ReactorOpts)
+    End Case
+    
+end event
+
 Event EDL_RDS.LOSTFOCUS(Flag, FocusID)
+	
 	RDSNo = Get_Property(@Window : '.EDL_RDS', 'TEXT')
 	If Len(RDSNo) GE 6 then
 		If RowExists('RDS', RDSNo) then
@@ -127,9 +145,11 @@ Event EDL_RDS.LOSTFOCUS(Flag, FocusID)
 		Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'ENABLED', True$)
 		Set_Property(@Window : '.CMB_EQUIP_TYPE', 'ENABLED', True$)
 	end
+	
 end event
 
 Event PUB_ADD_LOT.CLICK()
+    
     TWLotUseArray  = Get_Property(@Window: '.EDT_TW_USAGE', 'LIST')
     LotId          = Get_Property(@Window : '.EDL_LOT_ID', 'TEXT')
     If LotId NE ''  then
@@ -191,27 +211,34 @@ Event PUB_ADD_LOT.CLICK()
 end event
 
 Event EDT_TW_USAGE.ROWSELCHANGED(SelRow, SelState)
+    
     If SelRow NE '' then
         Set_Property(@Window: '.PUB_REMOVE_SELECTED', 'ENABLED', True$)
     end else
         Set_Property(@Window: '.PUB_REMOVE_SELECTED', 'ENABLED', False$)
     end
+    
 end event
 
 Event PUB_REMOVE_SELECTED.CLICK()
+    
     SelectedRow   = Get_Property(@Window : '.EDT_TW_USAGE', 'SELPOS')<2>
     TWLotUseArray = Get_Property(@Window: '.EDT_TW_USAGE', 'LIST')
     If SelectedRow LE DCount(TWLotUseArray, @FM) then
         TWLotUseArray = Delete(TWLotUseArray, SelectedRow , 0, 0)
     end
     Set_Property(@Window : '.EDT_TW_USAGE', 'LIST', TWLotUseArray)
+    
 end event
 
 Event PUB_CLEAR.CLICK()
+    
     GoSub ClearFormData
+    
 end event
 
 Event PUB_SUBMIT.CLICK()
+	
 	NotReadyReason = ''
 	//Gather all field information
 	ReasonForTest  = Get_Property(@Window : '.CMB_TEST_TYPE', 'TEXT')
@@ -285,6 +312,7 @@ Event PUB_SUBMIT.CLICK()
 	end else
 		Msg(@Window, NotReadyReason)
 	end
+	
 end event
 
 //-----------------------------------------------------------------------------
@@ -292,6 +320,7 @@ end event
 //-----------------------------------------------------------------------------
 
 FillFormMasterData:
+	
 	//Get Test run type options. Populate to CMB_TEST_TYPE
 	TestRunTypeList = Test_Run_Services('GetAllTestRunTypes')
 	Set_Property(@Window, '@RUN_TYPE_OPTS', TestRunTypeList)
@@ -313,16 +342,18 @@ FillFormMasterData:
 	Set_Property(@Window : '.EDT_NON_REACTORS', 'TEXT', NonReactorOpts)
 	Set_Property(@Window, '@NON_REACTOR_OPTS', NonReactorOpts)
 	//Then set the inital combo list to be filled with reactors because that is the default.
+	Set_Property(@Window : '.CMB_EQUIP_TYPE', 'DEFPROP', 'Reactor')
 	Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'LIST', ReactorOpts)
 	//Get TW Products and store them in user defined window property @TW_PROD_OPTS
 	Prods    = Test_Run_Services('GetAllTWProdKeys', 1)
 	Set_Property(@Window, '@TW_PROD_OPTS', Prods)
+	
 Return
 
 ClearFormData:
+    
     Set_Property(@Window : '.EDL_LOT_ID', 'TEXT', '')
     Set_Property(@Window : '.EDL_RDS', 'TEXT', '')
-    
     Set_Property(@Window : '.EDL_PSN', 'TEXT', '')
     Set_Property(@Window : '.EDL_PSN', 'ENABLED', True$)
     Set_Property(@Window : '.CMB_EQUIP_TYPE', 'TEXT', '')
@@ -331,11 +362,6 @@ ClearFormData:
     Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'ENABLED', True$)
     Set_Property(@Window : 'CMB_TEST_TYPE', 'TEXT', '')
     Set_Property(@Window : '.EDT_TW_USAGE', 'LIST', '')
+    
 return
 
-
-
-
-
-
-