diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
index 76b42d6c12..a944334319 100644
--- a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
+++ b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
@@ -409,6 +409,9 @@
[#if action.isSubmit(cluster.project.id)]
Cluster submitted.
[/#if]
+ [#-- Allow to track if the cluster is submitted --]
+ [#assign isSubmit = action.isSubmit(cluster.project.id)?string('true', 'false') /]
+
diff --git a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
index 7cb6fe97f3..a5eb08f2ae 100644
--- a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
+++ b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
@@ -998,7 +998,6 @@ div.fieldFocus-deliverable {
.button-exit{
position: absolute;
float: inline-end;
- top: 40px;
right: 10px;
font-size: 18px;
cursor: pointer;
@@ -1021,6 +1020,7 @@ div.fieldFocus-deliverable {
.title-modal-evidences{
font-size: 19px;
font-weight: 600;
+ margin: 0;
}
.text-modal-evidences{
@@ -1029,7 +1029,10 @@ div.fieldFocus-deliverable {
}
.text-modal-evidences p{
- max-width: 500px;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
}
.content-modal{
@@ -1073,8 +1076,8 @@ div.fieldFocus-deliverable {
.button-close-modal{
background-color: #0779a4;
- min-width: 120px;
- height: 40px;
+ min-width: 100px;
+ height: 30px;
text-align: center;
display: flex;
align-items: center;
diff --git a/marlo-web/src/main/webapp/global/js/global.js b/marlo-web/src/main/webapp/global/js/global.js
index 56aa0c419e..3cd72726ca 100644
--- a/marlo-web/src/main/webapp/global/js/global.js
+++ b/marlo-web/src/main/webapp/global/js/global.js
@@ -197,6 +197,29 @@ $(document).ready(function () {
var message = $(messageSelector).html().split(":")[1];
var messageType = "success";
notifyErrorMessage(messageType, message);
+ } else if (messageSelector.length >= 1 && messageSelector.html().split(":")[0] != "message" && messageSelector.html().split(":")[1] === " deliverable.status.remaining") {
+ // SHOW CLUSTER SUBMITTED BASED ON THE DISABLED INPUT
+ var $clusterSubmitted = $(`.clusterSubmitted`);
+ var message = "";
+ if ($clusterSubmitted.length > 0) {
+ // $clusterSubmitted exists, do something
+ const $mapClusterSubmit = $clusterSubmitted.filter((index, ele) => $(ele).attr("issubmit") === "true").get();
+ const $stringClusterSubmit = $mapClusterSubmit.reduce((prev,curr) => prev +$(curr).attr("name")+",","");
+ const stringFixed = $stringClusterSubmit.substring(0, $stringClusterSubmit.length - 1);
+ message += "The Information was correctly saved.
";
+ message += "It seems that the following cluster(s) were submitted: "+stringFixed+ ". We suggest the following actions so you can save the information correctly:
";
+ message += " - Click on the cluster name to see the information.
";
+ message += "- Contact the cluster leader to unsubmitt the cluster and update the information.
";
+ message += "
";
+ } else {
+ // $clusterSubmitted does not exist, do something else
+ message += "The Information was correctly saved.
";
+ message += "It seems that the Remaining shared information is incompleted please take a look.";
+ }
+ // WARNING MESSAGE
+
+ var messageType = "warning";
+ notifyErrorMessage(messageType, message);
} else if (messageSelector.length >= 1 && messageSelector.html().split(":")[0] != "message") {
// WARNING MESSAGE
var message = ""