From 59cf9b3b41c9ee0853bc4329ce0d1de78e02da3e Mon Sep 17 00:00:00 2001 From: Lucas HIMPENS Date: Tue, 18 Apr 2023 11:57:45 +0200 Subject: [PATCH] #2463 added backgrounds on manuel test report --- .../webapp/css/pages/TestCaseExecution.css | 8 ++++---- .../main/webapp/js/pages/TestCaseExecution.js | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/source/src/main/webapp/css/pages/TestCaseExecution.css b/source/src/main/webapp/css/pages/TestCaseExecution.css index 9fe7ee01c4..516ff006d5 100644 --- a/source/src/main/webapp/css/pages/TestCaseExecution.css +++ b/source/src/main/webapp/css/pages/TestCaseExecution.css @@ -178,15 +178,15 @@ color: #555; } -.itemStatusOK, .itemStatusOK:not(:focus) { +.stepStatusOK, .stepStatusOK:not(:focus) { background-color: var(--crb-green-light-color); } -.itemStatusFA, .itemStatusFA:not(:focus) { +.stepStatusFA, .stepStatusFA:not(:focus) { background-color: var(--crb-orange-light-color); } -.itemStatusKO, .itemStatusKO:not(:focus) { +.stepStatusKO, .stepStatusKO:not(:focus) { background-color: var(--crb-red-light-color); } @@ -202,7 +202,7 @@ background-color: var(--crb-red-light-color) !important; } -.itemStatusOK:hover, .itemStatusnFA:hover, .itemStatusKO:hover { +.stepStatusOK:hover, .stepStatusFA:hover, .stepStatusKO:hover, .itemStatusOK:hover, .itemStatusFA:hover, .itemStatusKO:hover { background-color: #f5f5f5 !important; } diff --git a/source/src/main/webapp/js/pages/TestCaseExecution.js b/source/src/main/webapp/js/pages/TestCaseExecution.js index 5349d3149d..c8d2f0bbb6 100644 --- a/source/src/main/webapp/js/pages/TestCaseExecution.js +++ b/source/src/main/webapp/js/pages/TestCaseExecution.js @@ -2198,15 +2198,15 @@ Step.prototype.draw = function () { if (object.returnCode === "OK") { htmlElement.prepend($('')); - htmlElement.addClass("itemStatusOK"); + htmlElement.addClass("stepStatusOK"); } else if (object.returnCode === "FA") { htmlElement.prepend($('')); - htmlElement.addClass("itemStatusFA"); + htmlElement.addClass("stepStatusFA"); } else if (object.returnCode === "PE") { htmlElement.prepend($('')); } else if (object.returnCode === "KO") { htmlElement.prepend($('')); - htmlElement.addClass("itemStatusKO"); + htmlElement.addClass("stepStatusKO"); } else if (object.returnCode === "NA") { htmlElement.prepend($('')); } else if (object.returnCode === "NE") { @@ -2663,16 +2663,22 @@ function triggerActionExecution(element, id, status) { // update element checked if (status === "OK") { + $(element).parents(".action-group").removeClass("itemStatusFA itemStatusKO"); + $(element).parents(".action-group").addClass("itemStatusOK"); $(element).parents(".action-group").find(".status").find("span.glyphicon").removeClass().addClass("glyphicon glyphicon-ok pull-left"); $(element).parents(".action-group").find(".status").find("span.label").removeClass().addClass("label label-primary labelGreen optionLabel pull-left"); $(element).parents(".action-group").find("input[name='returncode']").val("OK").change(); newReturnCode = "OK"; } else if (status === "FA") { + $(element).parents(".action-group").removeClass("itemStatusOK itemStatusKO"); + $(element).parents(".action-group").addClass("itemStatusFA"); $(element).parents(".action-group").find(".status").find("span.glyphicon").removeClass().addClass("glyphicon glyphicon-alert pull-left"); $(element).parents(".action-group").find(".status").find("span.label").removeClass().addClass("label label-primary labelOrange optionLabel pull-left"); $(element).parents(".action-group").find("input[name='returncode']").val("FA").change(); newReturnCode = "FA"; } else if (status === "KO") { + $(element).parents(".action-group").removeClass("itemStatusOK itemStatusFA"); + $(element).parents(".action-group").addClass("itemStatusKO"); $(element).parents(".action-group").find(".status").find("span.glyphicon").removeClass().addClass("glyphicon glyphicon-remove pull-left"); $(element).parents(".action-group").find(".status").find("span.label").removeClass().addClass("label label-primary labelRed optionLabel pull-left"); $(element).parents(".action-group").find("input[name='returncode']").val("KO").change(); @@ -2716,6 +2722,8 @@ function triggerActionExecution(element, id, status) { if (returnCodes.includes("KO")) { $($(".stepItem")[i]).find("span.glyphicon").removeClass().addClass("glyphicon glyphicon-remove pull-left"); $($(".stepItem")[i]).find("span.label").removeClass().addClass("label label-primary labelRed optionLabel pull-left"); + $($(".stepItem")[i]).removeClass("stepStatusOK stepStatusFA"); + $($(".stepItem")[i]).addClass("stepStatusKO"); testCaseNewReturnCode = "KO"; if (typeof $($(".stepItem")[i]).data("item") !== 'undefined') { $($(".stepItem")[i]).data("item").returnCode = testCaseNewReturnCode; @@ -2725,6 +2733,8 @@ function triggerActionExecution(element, id, status) { } else if (returnCodes.includes("FA")) { $($(".stepItem")[i]).find("span.glyphicon").removeClass().addClass("glyphicon glyphicon-alert pull-left"); $($(".stepItem")[i]).find("span.label").removeClass().addClass("label label-primary labelOrange optionLabel pull-left"); + $($(".stepItem")[i]).removeClass("stepStatusOK stepStatusKO"); + $($(".stepItem")[i]).addClass("stepStatusFA"); testCaseNewReturnCode = "FA"; if (typeof $($(".stepItem")[i]).data("item") !== 'undefined') { $($(".stepItem")[i]).data("item").returnCode = testCaseNewReturnCode; @@ -2734,6 +2744,8 @@ function triggerActionExecution(element, id, status) { } else { $($(".stepItem")[i]).find("span.glyphicon").removeClass().addClass("glyphicon glyphicon-ok pull-left"); $($(".stepItem")[i]).find("span.label").removeClass().addClass("label label-primary labelGreen optionLabel pull-left"); + $($(".stepItem")[i]).removeClass("stepStatusKO stepStatusFA"); + $($(".stepItem")[i]).addClass("stepStatusOK"); testCaseNewReturnCode = "OK"; if (typeof $($(".stepItem")[i]).data("item") !== 'undefined') { $($(".stepItem")[i]).data("item").returnCode = testCaseNewReturnCode;