From 26a6c2a2b18bf31fba02aa3e9bdf9b3940b69c21 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko
Date: Fri, 6 Dec 2024 11:32:24 +0100
Subject: [PATCH] - updated styles for disabled icons; - added checks for
disabled/enabled buttons; - fixed displaying the date of assignment;
---
src/assets/scss/components/misc.scss | 4 +++
.../PreInstructorDomandeTable/index.js | 8 ++---
src/pages/DomandaEditPreInstructor/index.js | 33 ++++++++++++++++---
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/assets/scss/components/misc.scss b/src/assets/scss/components/misc.scss
index ca53588..b809ae8 100644
--- a/src/assets/scss/components/misc.scss
+++ b/src/assets/scss/components/misc.scss
@@ -12,6 +12,10 @@
.p-button:not(.p-button-outlined, .p-button-secondary, .p-confirm-popup-reject, .p-button-link, .p-column-filter-add-button, .p-column-filter-remove-button) span {
color: var(--menuitem-active-color);
}
+.p-button.p-button-success.p-button-icon-only[disabled],
+.p-button.p-button-danger.p-button-icon-only[disabled] {
+ filter: unset;
+}
.p-column-filter-remove-button {
span {
margin: 0 5px;
diff --git a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
index 4cac1b4..117a7e2 100644
--- a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
+++ b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
@@ -54,7 +54,7 @@ const PreInstructorDomandeTable = () => {
const getFormattedData = (data) => {
return data.map((d) => {
- d.callEndDate = is(String, d.callEndDate) ? new Date(d.callEndDate) : (d.callEndDate ? d.callEndDate : '');
+ d.evaluationEndDate = is(String, d.evaluationEndDate) ? new Date(d.evaluationEndDate) : (d.evaluationEndDate ? d.evaluationEndDate : '');
d.submissionDate = is(String, d.submissionDate) ? new Date(d.submissionDate) : (d.submissionDate ? d.submissionDate : '');
return d;
});
@@ -87,7 +87,7 @@ const PreInstructorDomandeTable = () => {
operator: FilterOperator.AND,
constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
},
- callEndDate : {
+ evaluationEndDate: {
operator: FilterOperator.AND,
constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
}
@@ -107,7 +107,7 @@ const PreInstructorDomandeTable = () => {
};
const dateEndBodyTemplate = (rowData) => {
- return formatDate(rowData.callEndDate);
+ return formatDate(rowData.evaluationEndDate);
};
const dateFilterTemplate = (options) => {
@@ -164,7 +164,7 @@ const PreInstructorDomandeTable = () => {
-
{
const [operationType, setOperationType] = useState('');
const [motivation, setMotivation] = useState('');
const [isVisibleAppointmentDialog, setIsVisibleAppointmentDialog] = useState(false);
+ const [allFilesRated, setAllFilesRated] = useState(false);
+ const [atLeastOneChecked, setAtLeastOneChecked] = useState(false);
+ const [allChecksChecked, setAllChecksChecked] = useState(false);
const [appointmentData, setAppointmentData] = useState({
title: '',
text: '',
@@ -65,6 +68,22 @@ const DomandaEditPreInstructor = () => {
navigate('/domande');
}
+ const updateFlagsForSoccorso = (data) => {
+ if (data.files) {
+ const nonRatedFiles = data.files
+ .map(el => el.valid)
+ .filter(v => isNil(v));
+ setAllFilesRated(nonRatedFiles.length === 0);
+ }
+ if (data.checklist) {
+ const checkedChecklistItems = data.checklist
+ .map(el => el.valid)
+ .filter(v => v);
+ setAtLeastOneChecked(checkedChecklistItems.length > 0);
+ setAllChecksChecked(checkedChecklistItems.length === data.checklist.length)
+ }
+ }
+
const doNewSoccorso = () => {
if (connectedSoccorsoId !== 0) {
doSaveDraft(`/domande/${id}/soccorso/${connectedSoccorsoId}`)
@@ -77,6 +96,7 @@ const DomandaEditPreInstructor = () => {
if (data.status === 'SUCCESS') {
setData(getFormattedData(data.data));
setMotivation(data.data.motivation);
+ updateFlagsForSoccorso(data.data);
}
storeSet.main.unsetAsyncRequest();
}
@@ -129,6 +149,7 @@ const DomandaEditPreInstructor = () => {
const newData = wrap(data).set(pathEls, finalValue).value();
setData(newData);
+ updateFlagsForSoccorso(newData);
}
const doSaveDraft = (doRedirect = '') => {
@@ -466,9 +487,13 @@ const DomandaEditPreInstructor = () => {
{__('Data ricezione', 'gepafin')}
{getDateFromISOstring(data.submissionDate)}
+
+ {__('Data assegnazione', 'gepafin')}
+ {getDateFromISOstring(data.assignedAt)}
+
{__('Scadenza Valutazione', 'gepafin')}
- {getDateFromISOstring(data.callEndDate)}
+ {getDateFromISOstring(data.evaluationEndDate)}
{__('Stato', 'gepafin')}
@@ -479,7 +504,7 @@ const DomandaEditPreInstructor = () => {
{__('Scarica documenti della domanda', 'gepafin')}
-
+
@@ -677,7 +702,7 @@ const DomandaEditPreInstructor = () => {
{['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
?