From 091ce6b8d1b0a7ac203b211b364d6ae3dfc40b94 Mon Sep 17 00:00:00 2001 From: "Ouellette Jonathan (CSC FI SPS MESLEO)" Date: Wed, 5 Mar 2025 23:12:14 +0100 Subject: [PATCH] Merged PR 12198: New Tool Mode, Ready To Use(RTU) Related work items: #225686 --- LSL2/POPUP/TOOL_MODE.json | 64 ++++++++++++++++--------- LSL2/STPROC/COMM_DIALOG_TOOL_STATUS.txt | 15 +++--- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/LSL2/POPUP/TOOL_MODE.json b/LSL2/POPUP/TOOL_MODE.json index 29e5037..69735f2 100644 --- a/LSL2/POPUP/TOOL_MODE.json +++ b/LSL2/POPUP/TOOL_MODE.json @@ -9,7 +9,7 @@ "<2>": "-2", "<3>": "-1", "<4>": "-1", - "<5>": "16777215", + "<5>": "-2", "<6>": { "<6,1>": { "<6,1,1>": "Tahoma", @@ -48,49 +48,59 @@ "<8,3,3>": "S" }, "<8,4>": { - "<8,4,1>": "OUT", - "<8,4,2>": "Out of Service", + "<8,4,1>": "RTU", + "<8,4,2>": "Ready To Use", "<8,4,3>": "S" }, "<8,5>": { - "<8,5,1>": "FACILITES (UnSched)", - "<8,5,2>": "Facilities-UnScheduled", + "<8,5,1>": "OUT", + "<8,5,2>": "Out of Service", "<8,5,3>": "S" }, "<8,6>": { - "<8,6,1>": "QUAL_OVERDUE", - "<8,6,2>": "Qual Check Overdue", + "<8,6,1>": "FACILITES (UnSched)", + "<8,6,2>": "Facilities-UnScheduled", "<8,6,3>": "S" }, "<8,7>": { - "<8,7,1>": "SCHED_MTC", - "<8,7,2>": "Sched Maint- PM", - "<8,7,3>": "G" + "<8,7,1>": "QUAL_OVERDUE", + "<8,7,2>": "Qual Check Overdue", + "<8,7,3>": "S" }, "<8,8>": { - "<8,8,1>": "UNSCHED_MTC", - "<8,8,2>": "UnSched Maint", + "<8,8,1>": "SCHED_MTC", + "<8,8,2>": "Sched Maint- PM", "<8,8,3>": "G" }, "<8,9>": { - "<8,9,1>": "QUAL", - "<8,9,2>": "Qualify Equip", + "<8,9,1>": "UNSCHED_MTC", + "<8,9,2>": "UnSched Maint", "<8,9,3>": "G" }, "<8,10>": { - "<8,10,1>": "EWORK", - "<8,10,2>": "Eng Work", + "<8,10,1>": "QUAL", + "<8,10,2>": "Qualify Equip", "<8,10,3>": "G" }, "<8,11>": { - "<8,11,1>": "VER", - "<8,11,2>": "Verification", - "<8,11,3>": "S" + "<8,11,1>": "EWORK", + "<8,11,2>": "Eng Work", + "<8,11,3>": "G" }, "<8,12>": { - "<8,12,1>": "VER_FAILED", - "<8,12,2>": "Verification Failed", + "<8,12,1>": "VER", + "<8,12,2>": "Verification", "<8,12,3>": "S" + }, + "<8,13>": { + "<8,13,1>": "VER_FAILED", + "<8,13,2>": "Verification Failed", + "<8,13,3>": "S" + }, + "<8,14>": { + "<8,14,1>": "RTU", + "<8,14,2>": "Ready To Use", + "<8,14,3>": "S" } }, "<9>": { @@ -144,7 +154,17 @@ "<32>": "0", "<33>": "1", "<34>": "16777215", - "<35>": "16777215" + "<35>": "16777215", + "<36>": "", + "<37>": "", + "<38>": "", + "<39>": "", + "<40>": "-2", + "<41>": "1000", + "<42>": "", + "<43>": "", + "<44>": "", + "<45>": "" } } } \ No newline at end of file diff --git a/LSL2/STPROC/COMM_DIALOG_TOOL_STATUS.txt b/LSL2/STPROC/COMM_DIALOG_TOOL_STATUS.txt index 8c8ebcd..4eccad8 100644 --- a/LSL2/STPROC/COMM_DIALOG_TOOL_STATUS.txt +++ b/LSL2/STPROC/COMM_DIALOG_TOOL_STATUS.txt @@ -216,11 +216,12 @@ DispTools = SRP_Array('SortRows', DispTools, 'AR6' : @FM : 'AL1', 'LIS * IF QuartzTools NE '' THEN DispTools := @FM:QuartzTools * IF OtherTools NE '' THEN DispTools := @FM:OtherTools -GreenButton = '.\BMPS\GreenButton.png' -RedButton = '.\BMPS\RedButton.png' -YellowButton = '.\BMPS\YellowButton.png' -GrayButton = '.\BMPS\GrayButton.png' -QuestionButton = '.\BMPS\help_32.bmp' +GreenButton = '.\BMPS\GreenButton.png' +RedButton = '.\BMPS\RedButton.png' +YellowButton = '.\BMPS\YellowButton.png' +GrayButton = '.\BMPS\GrayButton.png' +BlueButton = '.\BMPS\BlueButton.png' +QuestionButton = '.\BMPS\help_32.bmp' DefaultBackColor = Get_Property(@WINDOW,'BACKCOLOR') @@ -277,7 +278,8 @@ FOR I = 1 TO NumTools CASE ToolStatus = 'OUT' OR ToolStatus = 'FACILITIES (UnSched)' Set_Property(@WINDOW:'.TB':I,'BITMAP',GrayButton) - + CASE ToolStatus = 'RTU' + Set_Property(@WINDOW:'.TB':I,'BITMAP',BlueButton) CASE 1 Set_Property(@WINDOW:'.TB':I,'BITMAP',QuestionButton) @@ -368,3 +370,4 @@ RETURN +