Skip to content

Commit 3dff83e

Browse files
bcivelbcivel
committed
Add RightPanel and Footer on pages. refactor TestCaseExecutionList.jsp
1 parent 2b0072c commit 3dff83e

8 files changed

Lines changed: 271 additions & 63 deletions

File tree

‎source/src/main/java/org/cerberus/core/api/dto/test/TestMapperV001.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
3333
public interface TestMapperV001 {
3434

35+
@Mapping(target = "isActive", source = "active")
3536
TestDTOV001 toDTO(Test test);
3637

3738
Test toEntity(TestDTOV001 testDTO);

‎source/src/main/webapp/CampaignList.jsp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<head>
2626
<meta name="active-menu" content="execute">
2727
<meta name="active-submenu" content="CampaignList.jsp">
28+
<meta name="active-page" content="CampaignList.jsp">
29+
<meta name="page" content="Campaign List">
2830
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
2931
<%@ include file="include/global/dependenciesInclusions.html" %>
3032
<title id="pageTitle">Campaign Management</title>
@@ -34,7 +36,11 @@
3436
<body x-data x-cloak class="crb_body">
3537
<jsp:include page="include/global/header2.html"/>
3638
<jsp:include page="include/global/modalInclusions.jsp"/>
37-
<main class="crb_main" :class="$store.sidebar.expanded ? 'crb_main_sidebar-expanded' : 'crb_main_sidebar-collapsed'">
39+
<jsp:include page="include/global/rightPanel.html"/>
40+
<main class="crb_main_wrp" :class="$store.rightPanel.isResizing ? '' : 'transition-all duration-200'"
41+
:style="{marginLeft: ($store.sidebar.hidden ? 0 : ($store.sidebar.expanded ? 288 : 80)) + 'px',
42+
width: 'calc(100vw - ' + ($store.sidebar.hidden ? 0 : ($store.sidebar.expanded ? 288 : 80))
43+
+ 'px - '+ ($store.rightPanel.open ? $store.rightPanel.width : 0) + 'px)'}">
3844
<%@ include file="include/global/messagesArea.html"%>
3945
<%@ include file="include/utils/modal-confirmation.html"%>
4046
<%@ include file="include/pages/testcampaign/viewTestcampaign.html"%>
@@ -50,6 +56,7 @@
5056
<footer class="footer">
5157
<div class="container-fluid" id="footer"></div>
5258
</footer>
59+
<jsp:include page="include/global/aiBottomBar.html"/>
5360
</div>
5461
</main>
5562
</body>

‎source/src/main/webapp/ReportingCampaignStatistics.jsp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<head>
2626
<meta name="active-menu" content="insights">
2727
<meta name="active-submenu" content="ReportingCampaignStatistics.jsp">
28+
<meta name="active-page" content="ReportingCampaignStatistics.jsp">
29+
<meta name="page" content="Campaign Statistics">
2830
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
2931
<%@ include file="include/global/dependenciesInclusions.html" %>
3032
<title id="pageTitle">Campaign statistics</title>
@@ -37,7 +39,11 @@
3739
<body x-data x-cloak class="crb_body">
3840
<jsp:include page="include/global/header2.html"/>
3941
<jsp:include page="include/global/modalInclusions.jsp"/>
40-
<main class="crb_main" :class="$store.sidebar.expanded ? 'crb_main_sidebar-expanded' : 'crb_main_sidebar-collapsed'">
42+
<jsp:include page="include/global/rightPanel.html"/>
43+
<main class="crb_main_wrp" :class="$store.rightPanel.isResizing ? '' : 'transition-all duration-200'"
44+
:style="{marginLeft: ($store.sidebar.hidden ? 0 : ($store.sidebar.expanded ? 288 : 80)) + 'px',
45+
width: 'calc(100vw - ' + ($store.sidebar.hidden ? 0 : ($store.sidebar.expanded ? 288 : 80))
46+
+ 'px - '+ ($store.rightPanel.open ? $store.rightPanel.width : 0) + 'px)'}">
4147
<%@ include file="include/global/messagesArea.html"%>
4248
<%@ include file="include/utils/modal-confirmation.html"%>
4349
<%@ include file="include/pages/testcampaign/viewStatcampaign.html"%>
@@ -188,6 +194,7 @@
188194
<footer class="footer">
189195
<div class="container-fluid" id="footer"></div>
190196
</footer>
197+
<jsp:include page="include/global/aiBottomBar.html"/>
191198
</main>
192199
</body>
193200
</html>

‎source/src/main/webapp/RobotList.jsp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<head>
2626
<meta name="active-menu" content="execute">
2727
<meta name="active-submenu" content="RobotList.jsp">
28+
<meta name="active-page" content="RobotList.jsp">
29+
<meta name="page" content="Robot List">
2830
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
2931
<%@ include file="include/global/dependenciesInclusions.html" %>
3032
<script type="text/javascript" src="js/pages/RobotList.js?v=${appVersion}"></script>
@@ -66,7 +68,11 @@
6668
<body x-data x-cloak class="crb_body">
6769
<jsp:include page="include/global/header2.html"/>
6870
<jsp:include page="include/global/modalInclusions.jsp"/>
69-
<main class="crb_main" :class="$store.sidebar.expanded ? 'crb_main_sidebar-expanded' : 'crb_main_sidebar-collapsed'">
71+
<jsp:include page="include/global/rightPanel.html"/>
72+
<main class="crb_main_wrp" :class="$store.rightPanel.isResizing ? '' : 'transition-all duration-200'"
73+
:style="{marginLeft: ($store.sidebar.hidden ? 0 : ($store.sidebar.expanded ? 288 : 80)) + 'px',
74+
width: 'calc(100vw - ' + ($store.sidebar.hidden ? 0 : ($store.sidebar.expanded ? 288 : 80))
75+
+ 'px - '+ ($store.rightPanel.open ? $store.rightPanel.width : 0) + 'px)'}">
7076
<%@ include file="include/global/messagesArea.html"%>
7177
<%@ include file="include/utils/modal-confirmation.html"%>
7278

@@ -82,6 +88,7 @@
8288
<footer class="footer">
8389
<div class="container-fluid" id="footer"></div>
8490
</footer>
91+
<jsp:include page="include/global/aiBottomBar.html"/>
8592
</main>
8693
</body>
8794
</html>

‎source/src/main/webapp/TestCaseExecutionList.jsp‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<head>
2626
<meta name="active-menu" content="insights">
2727
<meta name="active-submenu" content="TestCaseExecutionList.jsp">
28+
<meta name="active-page" content="TestCaseExecutionList.jsp">
29+
<meta name="page" content="Execution List">
2830
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
2931
<%@ include file="include/global/dependenciesInclusions.html" %>
3032
<link rel="stylesheet" href="css/pages/ReportingExecutionByTag.css?v=${appVersion}" type="text/css"/>
@@ -35,12 +37,16 @@
3537
<body x-data x-cloak class="crb_body">
3638
<jsp:include page="include/global/header2.html"/>
3739
<jsp:include page="include/global/modalInclusions.jsp"/>
38-
<main class="crb_main" :class="$store.sidebar.expanded ? 'crb_main_sidebar-expanded' : 'crb_main_sidebar-collapsed'">
40+
<jsp:include page="include/global/rightPanel.html"/>
41+
<main class="crb_main_wrp" :class="$store.rightPanel.isResizing ? '' : 'transition-all duration-200'"
42+
:style="{marginLeft: ($store.sidebar.hidden ? 0 : ($store.sidebar.expanded ? 288 : 80)) + 'px',
43+
width: 'calc(100vw - ' + ($store.sidebar.hidden ? 0 : ($store.sidebar.expanded ? 288 : 80))
44+
+ 'px - '+ ($store.rightPanel.open ? $store.rightPanel.width : 0) + 'px)'}">
3945
<%@ include file="include/global/messagesArea.html"%>
4046
<%@ include file="include/utils/modal-confirmation.html"%>
4147

4248
<h1 class="page-title-line" id="title">Execution History</h1>
43-
<div class="crb_card">
49+
<div class="">
4450
<div id="testCaseExecution">
4551
<table id="testCaseExecutionTable" class="table table-hover display" name="testCaseExecutionTable"></table>
4652
<div class="marginBottom20"></div>
@@ -49,6 +55,7 @@
4955
<footer class="footer">
5056
<div class="container-fluid" id="footer"></div>
5157
</footer>
58+
<jsp:include page="include/global/aiBottomBar.html"/>
5259
</main>
5360
</body>
5461
</html>

‎source/src/main/webapp/js/global/global.js‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3592,4 +3592,78 @@ function toSafeId(str) {
35923592
.replace(/^(\d)/, "_$1") // évite de commencer par un chiffre
35933593
.replace(/_+/g, "_") // évite les doublons _
35943594
.toLowerCase();
3595+
}
3596+
3597+
function getExecutionStatusConfig(status) {
3598+
const normalizedStatus = status || "";
3599+
3600+
const map = {
3601+
OK: {
3602+
icon: "check-circle",
3603+
label: "OK",
3604+
badgeClass: "bg-green-100 text-green-700 ring-green-600/20 dark:bg-green-950/40 dark:text-green-400 dark:ring-green-500/30",
3605+
iconClass: ""
3606+
},
3607+
KO: {
3608+
icon: "x-circle",
3609+
label: "KO",
3610+
badgeClass: "bg-red-100 text-red-700 ring-red-600/20 dark:bg-red-950/40 dark:text-red-400 dark:ring-red-500/30",
3611+
iconClass: ""
3612+
},
3613+
FA: {
3614+
icon: "alert-triangle",
3615+
label: "FA",
3616+
badgeClass: "bg-amber-100 text-amber-700 ring-amber-600/20 dark:bg-amber-950/40 dark:text-amber-400 dark:ring-amber-500/30",
3617+
iconClass: ""
3618+
},
3619+
PE: {
3620+
icon: "loader",
3621+
label: "PE",
3622+
badgeClass: "bg-blue-100 text-blue-700 ring-blue-600/20 dark:bg-blue-950/40 dark:text-blue-400 dark:ring-blue-500/30",
3623+
iconClass: "v2-exe-spin-limited"
3624+
},
3625+
NE: {
3626+
icon: "minus-circle",
3627+
label: "NE",
3628+
badgeClass: "bg-slate-100 text-slate-500 ring-slate-600/20 dark:bg-slate-900 dark:text-slate-300 dark:ring-slate-500/30",
3629+
iconClass: ""
3630+
},
3631+
NA: {
3632+
icon: "alert-circle",
3633+
label: "NA",
3634+
badgeClass: "bg-slate-100 text-slate-500 ring-slate-600/20 dark:bg-slate-900 dark:text-slate-300 dark:ring-slate-500/30",
3635+
iconClass: ""
3636+
},
3637+
WE: {
3638+
icon: "help-circle",
3639+
label: "WE",
3640+
badgeClass: "bg-slate-100 text-slate-500 ring-slate-600/20 dark:bg-slate-900 dark:text-slate-300 dark:ring-slate-500/30",
3641+
iconClass: ""
3642+
},
3643+
CA: {
3644+
icon: "ban",
3645+
label: "CA",
3646+
badgeClass: "bg-slate-100 text-slate-500 ring-slate-600/20 dark:bg-slate-900 dark:text-slate-300 dark:ring-slate-500/30",
3647+
iconClass: ""
3648+
},
3649+
QU: {
3650+
icon: "clock",
3651+
label: "QU",
3652+
badgeClass: "bg-slate-100 text-slate-500 ring-slate-600/20 dark:bg-slate-900 dark:text-slate-300 dark:ring-slate-500/30",
3653+
iconClass: ""
3654+
},
3655+
QE: {
3656+
icon: "alert-octagon",
3657+
label: "QE",
3658+
badgeClass: "bg-orange-100 text-orange-700 ring-orange-600/20 dark:bg-orange-950/40 dark:text-orange-400 dark:ring-orange-500/30",
3659+
iconClass: ""
3660+
}
3661+
};
3662+
3663+
return map[normalizedStatus] || {
3664+
icon: "help-circle",
3665+
label: normalizedStatus || "-",
3666+
badgeClass: "bg-slate-100 text-slate-500 ring-slate-600/20 dark:bg-slate-900 dark:text-slate-300 dark:ring-slate-500/30",
3667+
iconClass: ""
3668+
};
35953669
}

‎source/src/main/webapp/js/pages/RobotList.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ function aoColumnsFunc(tableId) {
350350
"sWidth": "50px",
351351
"title": doc.getDocOnline("robot", "version")},
352352
{
353-
"data": "active",
354-
"sName": "active",
353+
"data": "isActive",
354+
"sName": "isActive",
355355
"sWidth": "50px",
356356
"title": "Active",
357357
"orderable": true,

0 commit comments

Comments
 (0)