Skip to content

Commit f46e7a1

Browse files
committed
UI improvement on last campaigns executed.
1 parent 75887cc commit f46e7a1

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

source/src/main/webapp/js/pages/Homepage.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -903,27 +903,28 @@ function renderExecutionDots(results, obj = []) {
903903
</div>
904904
</div>
905905
<div class="grid grid-cols-3 gap-1 pt-2 text-center">
906-
<div class="px-2 py-1 rounded bg-green-500/80 text-white">OK: ${exec.nbOK || 0}</div>
907-
<div class="px-2 py-1 rounded bg-red-500/80 text-white">KO: ${exec.nbKO || 0}</div>
908-
<div class="px-2 py-1 rounded bg-orange-500/80 text-white">FA: ${exec.nbFA || 0}</div>
909-
<div class="px-2 py-1 rounded bg-blue-500/80 text-white">PE: ${exec.nbPE || 0}</div>
910-
<div class="px-2 py-1 rounded bg-gray-500/80 text-white">NA: ${exec.nbNA || 0}</div>
911-
<div class="px-2 py-1 rounded bg-purple-500/80 text-white">WE: ${exec.nbWE || 0}</div>
906+
${exec.nbOK > 0 ? "<div class='px-2 py-1 rounded bg-green-500/80 text-white'>OK: "+exec.nbOK+"</div>" : ""}
907+
${exec.nbKO > 0 ? "<div class='px-2 py-1 rounded bg-red-500/80 text-white'>KO: "+exec.nbKO+"</div>" : ""}
908+
${exec.nbFA > 0 ? "<div class='px-2 py-1 rounded bg-orange-500/80 text-white'>FA: "+exec.nbFA+"</div>" : ""}
909+
${exec.nbPE > 0 ? "<div class='px-2 py-1 rounded bg-blue-500/80 text-white'>PE: "+exec.nbPE+"</div>" : ""}
910+
${exec.nbNA > 0 ? "<div class='px-2 py-1 rounded bg-gray-500/80 text-white'>NA: "+exec.nbNA+"</div>" : ""}
911+
${exec.nbWE > 0 ? "<div class='px-2 py-1 rounded bg-purple-500/80 text-white'>WE: "+exec.nbWE+"</div>" : ""}
912912
</div>
913913
</div>
914914
`;
915915

916916
const encodedTag = encodeURIComponent(exec.tag || "");
917+
console.info(exec.ciResult);
917918
return `
918919
<span class="execution-dot w-7 h-7 md:w-8 md:h-8 flex items-center justify-center rounded-xl cursor-pointer
919-
${exec.nbPE > 0
920-
? "bg-blue-100 text-blue-600 dark:bg-blue-900/40 dark:text-blue-400"
920+
${(exec.ciResult !== 'KO' && exec.ciResult !== 'OK')
921+
? "bg-blue-100 text-blue-600 dark:bg-blue-900/40 dark:text-blue-400 spin"
921922
: status === "OK"
922923
? "bg-green-100 text-green-600 dark:bg-green-900/40 dark:text-green-400"
923924
: "bg-red-100 text-red-600 dark:bg-red-900/40 dark:text-red-400"}"
924925
data-tooltip="${tooltipContent.replace(/"/g, '&quot;')}"
925926
onclick="window.location.href='./ReportingExecutionByTag.jsp?Tag=${encodedTag}'">
926-
${exec.nbPE > 0 ? "⧗" : status === "OK" ? "✓" : "✕"}
927+
${(exec.ciResult !== 'KO' && exec.ciResult !== 'OK') ? "⧗" : status === "OK" ? "✓" : "✕"}
927928
</span>
928929
`;
929930
})

0 commit comments

Comments
 (0)