From 076d5d5058112dbf505084aafa60717be9211ca4 Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Wed, 3 Apr 2024 15:51:58 -0500 Subject: [PATCH 01/10] :bug: fix(Timeline): center the schedule title --- marlo-web/src/main/webapp/crp/css/home/dashboard.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marlo-web/src/main/webapp/crp/css/home/dashboard.css b/marlo-web/src/main/webapp/crp/css/home/dashboard.css index dec06dbae6..6918902318 100644 --- a/marlo-web/src/main/webapp/crp/css/home/dashboard.css +++ b/marlo-web/src/main/webapp/crp/css/home/dashboard.css @@ -430,7 +430,7 @@ span.timelineControl:hover { #timelineDescription{ display: flex; - justify-content: space-between; + justify-content: center; padding: 18px 30px 18px 30px; width: 100%; align-items: baseline; From 2822adf871b14eb2c2017e1f033921a2ca5f8601 Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Wed, 3 Apr 2024 16:15:12 -0500 Subject: [PATCH 02/10] :bug: fix(Timeline): update date format --- marlo-web/src/main/webapp/crp/js/home/dashboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marlo-web/src/main/webapp/crp/js/home/dashboard.js b/marlo-web/src/main/webapp/crp/js/home/dashboard.js index 4ae16732d1..221c332561 100644 --- a/marlo-web/src/main/webapp/crp/js/home/dashboard.js +++ b/marlo-web/src/main/webapp/crp/js/home/dashboard.js @@ -230,12 +230,12 @@ function createDivActivities(activity, id){
start_icon -

Start date: ${activity.startDate}

+

Start date: ${convertDateToText(activity.startDate,true)}

Status: ${status}

end_icon -

End date: ${activity.endDate}

+

End date: ${convertDateToText(activity.endDate,true)}

From 1f2eab03d80d52bd6ad40c1720c8d72ccc650cb7 Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Wed, 3 Apr 2024 16:47:14 -0500 Subject: [PATCH 03/10] :bug: fix(Timeline): Adjust font --- marlo-web/src/main/webapp/crp/css/home/dashboard.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/marlo-web/src/main/webapp/crp/css/home/dashboard.css b/marlo-web/src/main/webapp/crp/css/home/dashboard.css index 6918902318..a7dce6aa68 100644 --- a/marlo-web/src/main/webapp/crp/css/home/dashboard.css +++ b/marlo-web/src/main/webapp/crp/css/home/dashboard.css @@ -513,7 +513,7 @@ span.timelineControl:hover { color: #000; text-overflow: ellipsis; white-space: nowrap; - font-size: 1.5rem; + font-size: 1.4rem; font-style: normal; font-weight: 400; margin: 0; @@ -539,6 +539,7 @@ span.timelineControl:hover { font-weight: 400; line-height: 0.75rem; margin: 0; + color: #000; } .activityCard:nth-child(n+1){ From 78424fd33043406469bfeaa6f78b715e464dd55f Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Wed, 3 Apr 2024 17:36:09 -0500 Subject: [PATCH 04/10] :bug: fix(Timeline): check that the timeline field as such does not overlap with the arrow buttons --- marlo-web/src/main/webapp/crp/css/home/dashboard.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/marlo-web/src/main/webapp/crp/css/home/dashboard.css b/marlo-web/src/main/webapp/crp/css/home/dashboard.css index a7dce6aa68..b4f6110b54 100644 --- a/marlo-web/src/main/webapp/crp/css/home/dashboard.css +++ b/marlo-web/src/main/webapp/crp/css/home/dashboard.css @@ -420,7 +420,7 @@ span.timelineControl:hover { overflow-x: scroll; overflow-y: hidden; height: 36vh; - width: 80vw; + width: 80%; margin: 0 auto; } @@ -453,6 +453,7 @@ span.timelineControl:hover { margin-bottom: 10px; padding: 5px 0; position: absolute; + height: 100%; } #timeline_activities { @@ -464,13 +465,13 @@ span.timelineControl:hover { top: 0; left: 0; width: 2px; - height: 100%; + height: 80%; background-color: red; border-radius: 5px; } .timebox { - height: 198px; + height: 80%; position: relative; text-align: center; border-right: 1px dashed #CCCCCC; From 110c7a0615c64183688f62028a633ba8348f291f Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Wed, 3 Apr 2024 17:46:00 -0500 Subject: [PATCH 05/10] :bug: fix(Timeline): Adds space between elements --- marlo-web/src/main/webapp/crp/css/home/dashboard.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marlo-web/src/main/webapp/crp/css/home/dashboard.css b/marlo-web/src/main/webapp/crp/css/home/dashboard.css index b4f6110b54..42e7937877 100644 --- a/marlo-web/src/main/webapp/crp/css/home/dashboard.css +++ b/marlo-web/src/main/webapp/crp/css/home/dashboard.css @@ -352,11 +352,11 @@ span.timelineControl:hover { } .buttonLeftTimeline { - left: 0.75rem; + left: 2.5%; } .buttonRightTimeline { - right: 0.75rem; + right: 2.5%; } .timelineBackSuccess { From 4300d623146e1efb937683089e8e00e10e055b6b Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Thu, 4 Apr 2024 08:41:11 -0500 Subject: [PATCH 06/10] :bug: fix(Timeline): avoid white space --- .../main/webapp/crp/css/home/dashboard.css | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/marlo-web/src/main/webapp/crp/css/home/dashboard.css b/marlo-web/src/main/webapp/crp/css/home/dashboard.css index 42e7937877..de0e5a48fa 100644 --- a/marlo-web/src/main/webapp/crp/css/home/dashboard.css +++ b/marlo-web/src/main/webapp/crp/css/home/dashboard.css @@ -458,6 +458,19 @@ span.timelineControl:hover { #timeline_activities { position: relative; + font-size: 14px; + } + + @media only screen and (min-height:975px){ + #timeline_activities { + font-size: 18px; + } + } + + @media only screen and (min-height:1170px){ + #timeline_activities { + font-size: 20px; + } } #timeline_today { @@ -544,16 +557,16 @@ span.timelineControl:hover { } .activityCard:nth-child(n+1){ - top: 48px; + top: 3.4em; } .activityCard:nth-child(2n+2){ - top: 108px; + top: 7.8em; } .activityCard:nth-child(3n+3){ - top: 168px; + top: 12.1em; } From 135c23a081cbc9f6e1f910b7999a48ff80f1860f Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Thu, 4 Apr 2024 11:59:22 -0500 Subject: [PATCH 07/10] :bug: fix(Timeline):adjust the spacing between divisions --- marlo-web/src/main/webapp/crp/js/home/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marlo-web/src/main/webapp/crp/js/home/dashboard.js b/marlo-web/src/main/webapp/crp/js/home/dashboard.js index 221c332561..36eca3126e 100644 --- a/marlo-web/src/main/webapp/crp/js/home/dashboard.js +++ b/marlo-web/src/main/webapp/crp/js/home/dashboard.js @@ -274,7 +274,7 @@ const setStatusColor = (status) => { function setWidth(amount) { - return `calc(${amount !==undefined? (amount === 0? 3: amount)+"*(80vw / 7))": "calc(80vw / 7)"}`; + return `calc(${amount !==undefined? (amount === 0? 3: amount)+"*(80vw / 7) - 10px)": "calc(80vw / 7)"}`; } function setDistances(startDate,isToday, isJS,endDate) { From 668093279a02c4e9457df7bd6bde33025294fe49 Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Thu, 4 Apr 2024 13:58:55 -0500 Subject: [PATCH 08/10] :bug: fix(Timeline):Please update to weekly range - from Mon to Fri --- .../src/main/webapp/crp/js/home/dashboard.js | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/marlo-web/src/main/webapp/crp/js/home/dashboard.js b/marlo-web/src/main/webapp/crp/js/home/dashboard.js index 36eca3126e..c5e65edac3 100644 --- a/marlo-web/src/main/webapp/crp/js/home/dashboard.js +++ b/marlo-web/src/main/webapp/crp/js/home/dashboard.js @@ -152,18 +152,20 @@ function locateContentDialog(id){ function moveScrollRight() { const element = document.getElementById("timelineContainer"); - const vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0); - const containerSize = vw * 0.8; + + const widthContainer = $('.sectionMap').width(); + const containerSize = widthContainer * 0.8; - element.scrollLeft += containerSize; + element.scrollLeft += (containerSize+(containerSize* (2/5))); } function moveScrollLeft() { const element = document.getElementById("timelineContainer"); - const vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0); - const containerSize = vw * 0.8; + + const widthContainer = $('.sectionMap').width(); + const containerSize = widthContainer * 0.8; - element.scrollLeft -= containerSize; + element.scrollLeft -= (containerSize+(containerSize* (2/5))); } const convertDateToAfricanDate = (date) => { @@ -273,8 +275,9 @@ const setStatusColor = (status) => { } function setWidth(amount) { - - return `calc(${amount !==undefined? (amount === 0? 3: amount)+"*(80vw / 7) - 10px)": "calc(80vw / 7)"}`; + const widthContainer = $('.sectionMap').width(); + const widthInPx = `${widthContainer * 0.8}px`; + return `calc(${amount !==undefined? (amount === 0? 3: amount)+"*("+widthInPx+" / 5) - 10px)": "calc("+widthInPx+" / 5)"}`; } function setDistances(startDate,isToday, isJS,endDate) { @@ -287,25 +290,27 @@ function setDistances(startDate,isToday, isJS,endDate) { const currentHour = today.getHours(); const percentageCompletion = (currentHour / 24); - const vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0); - let containerSize = vw * 0.8; + + const widthContainer = $('.sectionMap').width(); + const widthInPx = `${widthContainer * 0.8}px`; + const containerSize = widthContainer*0.8; const isFinalActivity = new Date(lastDate).getTime() === new Date(endDate).getTime(); if(isJS){ if(isToday){ - return (getAbsoluteDays(firstDate,today,1) * ((containerSize/7) + ((containerSize/7)*percentageCompletion)) ) + return (getAbsoluteDays(firstDate,today,1) * ((containerSize/5) + ((containerSize/5)*percentageCompletion)) ) } - return ((isFinalActivity? getAbsoluteDays(firstDate,startDate)-2:getAbsoluteDays(firstDate,startDate) ) * (containerSize/7)) + return ((isFinalActivity? getAbsoluteDays(firstDate,startDate)-2:getAbsoluteDays(firstDate,startDate) ) * (containerSize/5)) } else { if(isToday){ - return `calc(${getAbsoluteDays(firstDate, today,1)} * (80vw / 7) + ((80vw / 7)* ${percentageCompletion}) )`; + return `calc(${getAbsoluteDays(firstDate, today,1)} * (${widthInPx} / 5) + ((${widthInPx} / 5)* ${percentageCompletion}) )`; } - return `calc((${isFinalActivity? getAbsoluteDays(firstDate,startDate)-2:getAbsoluteDays(firstDate,startDate)}) * (80vw / 7))`; + return `calc((${isFinalActivity? getAbsoluteDays(firstDate,startDate)-2:getAbsoluteDays(firstDate,startDate)}) * (${widthInPx} / 5))`; } } From e69ab1ed265a5b8fd7d5a876b186c3168692a44c Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Thu, 4 Apr 2024 15:14:47 -0500 Subject: [PATCH 09/10] :bug: fix(Timeline):Add color code for the taks bar --- .../main/webapp/crp/css/home/dashboard.css | 37 ++++++++++++++++++- .../src/main/webapp/crp/js/home/dashboard.js | 17 +++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/marlo-web/src/main/webapp/crp/css/home/dashboard.css b/marlo-web/src/main/webapp/crp/css/home/dashboard.css index de0e5a48fa..984ce5a499 100644 --- a/marlo-web/src/main/webapp/crp/css/home/dashboard.css +++ b/marlo-web/src/main/webapp/crp/css/home/dashboard.css @@ -430,10 +430,10 @@ span.timelineControl:hover { #timelineDescription{ display: flex; - justify-content: center; + justify-content: space-between; padding: 18px 30px 18px 30px; width: 100%; - align-items: baseline; + align-items: end; } #timelineDescription_title{ @@ -569,6 +569,39 @@ span.timelineControl:hover { top: 12.1em; } + + #timelineAlert{ + display: flex; + flex-direction: column; + justify-content: flex-end; + gap: 0.5rem; + align-items: end; + padding-bottom: 6px; + } + + #timelineAlert_container{ + display: flex; + flex-direction: row; + gap: 2rem; + } + + .timelineAlert_item{ + display: flex; + flex-direction: row; + align-items: flex-start; + gap: 0.5rem; + } + + .timelineAlert_item p{ + font-size: 10px; + } + + .timelineAlert_item_color{ + width: 10px; + height: 10px; + border-radius: 12.5px; + background-color: #0377a3; + } /*************** sectionMap ********************/ diff --git a/marlo-web/src/main/webapp/crp/js/home/dashboard.js b/marlo-web/src/main/webapp/crp/js/home/dashboard.js index c5e65edac3..c5683b8081 100644 --- a/marlo-web/src/main/webapp/crp/js/home/dashboard.js +++ b/marlo-web/src/main/webapp/crp/js/home/dashboard.js @@ -337,6 +337,23 @@ function createTimeline2() {
Schedule
+
+ Progress status: +
+
+
+

Not started

+
+
+
+

In progress

+
+
+
+

Completed

+
+
+
From f154ec6c7173aa23b6a15d1ed3ed5a9eb5e37ea6 Mon Sep 17 00:00:00 2001 From: JhonSGIzquierdo Date: Thu, 4 Apr 2024 15:33:33 -0500 Subject: [PATCH 10/10] :bug: fix(Timeline):Timeline makes a tour of all the tasks before reaching the current --- .../src/main/webapp/crp/css/home/dashboard.css | 13 +++++++++++-- marlo-web/src/main/webapp/crp/js/home/dashboard.js | 8 +++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/marlo-web/src/main/webapp/crp/css/home/dashboard.css b/marlo-web/src/main/webapp/crp/css/home/dashboard.css index 984ce5a499..8f80b4452b 100644 --- a/marlo-web/src/main/webapp/crp/css/home/dashboard.css +++ b/marlo-web/src/main/webapp/crp/css/home/dashboard.css @@ -416,7 +416,6 @@ span.timelineControl:hover { #timelineContainer { position: relative; margin: 18px 30px 18px 30px; - scroll-behavior: smooth; overflow-x: scroll; overflow-y: hidden; height: 36vh; @@ -603,7 +602,17 @@ span.timelineControl:hover { background-color: #0377a3; } - + .timelineAlert_item_color--1{ + background-color: #F9C786; + } + + .timelineAlert_item_color--2{ + background-color: #81B8C1; + } + + .timelineAlert_item_color--3{ + background-color: #B5D08B; + } /*************** sectionMap ********************/ .sectionMap{ diff --git a/marlo-web/src/main/webapp/crp/js/home/dashboard.js b/marlo-web/src/main/webapp/crp/js/home/dashboard.js index c5683b8081..96d75c4be0 100644 --- a/marlo-web/src/main/webapp/crp/js/home/dashboard.js +++ b/marlo-web/src/main/webapp/crp/js/home/dashboard.js @@ -156,6 +156,7 @@ function moveScrollRight() { const widthContainer = $('.sectionMap').width(); const containerSize = widthContainer * 0.8; + element.style.scrollBehavior = "smooth" element.scrollLeft += (containerSize+(containerSize* (2/5))); } @@ -165,6 +166,7 @@ function moveScrollLeft() { const widthContainer = $('.sectionMap').width(); const containerSize = widthContainer * 0.8; + element.style.scrollBehavior = "smooth" element.scrollLeft -= (containerSize+(containerSize* (2/5))); } @@ -341,15 +343,15 @@ function createTimeline2() { Progress status:
-
+

Not started

-
+

In progress

-
+

Completed