From fdda72b6176f9c9256c945e7fc6af66d781ba66b Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Fri, 22 Nov 2024 16:37:59 +0100 Subject: [PATCH] - added FLOW_ID env variable; - implemented two types of evaluation flow; - refactored component related to communication messages; - fixed displaying elements based on evaluation status; - fixed some styles; --- .env | 3 +- environments/dev/dev.env | 3 +- environments/prod/prod.env | 3 +- src/assets/scss/components/appPage.scss | 11 +- src/assets/scss/components/myTable.scss | 3 + src/pages/DashboardBeneficiario/index.js | 2 +- src/pages/DomandaBeneficiario/index.js | 184 +-------------- src/pages/DomandaEditPreInstructor/index.js | 55 ++++- .../components/SoccorsoComunications/index.js | 218 ++++++++++++++++++ src/pages/SoccorsoEditPreInstructor/index.js | 175 +------------- 10 files changed, 294 insertions(+), 363 deletions(-) create mode 100644 src/pages/SoccorsoEditPreInstructor/components/SoccorsoComunications/index.js diff --git a/.env b/.env index 0b1a428..9ef0c84 100644 --- a/.env +++ b/.env @@ -3,4 +3,5 @@ REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit REACT_APP_LOGO_FILENAME=gepafin-logo.svg REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico -REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs \ No newline at end of file +REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs +REACT_APP_EVALUATION_FLOW_ID=1 \ No newline at end of file diff --git a/environments/dev/dev.env b/environments/dev/dev.env index 0b1a428..9ef0c84 100644 --- a/environments/dev/dev.env +++ b/environments/dev/dev.env @@ -3,4 +3,5 @@ REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit REACT_APP_LOGO_FILENAME=gepafin-logo.svg REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico -REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs \ No newline at end of file +REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs +REACT_APP_EVALUATION_FLOW_ID=1 \ No newline at end of file diff --git a/environments/prod/prod.env b/environments/prod/prod.env index 6e25d7d..1755a33 100644 --- a/environments/prod/prod.env +++ b/environments/prod/prod.env @@ -3,4 +3,5 @@ REACT_APP_API_EXECUTION_ADDRESS=https://bandi-api.gepafin.it/v1 REACT_APP_API_ADDRESS=https://bandi-api.gepafin.it REACT_APP_LOGO_FILENAME=gepafin-logo.svg REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico -REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs \ No newline at end of file +REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs +REACT_APP_EVALUATION_FLOW_ID=1 \ No newline at end of file diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index c22488f..a347c24 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -208,10 +208,18 @@ column-count: 2; column-width: 4em; display: block; - padding-bottom: 0; + /*padding-bottom: 0;*/ .appPageSection__pMeta { margin-bottom: 1em; + + span:nth-of-type(1) { + max-width: 30%; + } + span:nth-of-type(2) { + max-width: 60%; + text-align: right; + } } } } @@ -221,6 +229,7 @@ flex-direction: column; padding: 0; width: 100%; + list-style: inside; } .appPageSection__listItem { diff --git a/src/assets/scss/components/myTable.scss b/src/assets/scss/components/myTable.scss index bbfbb2a..67b3b41 100644 --- a/src/assets/scss/components/myTable.scss +++ b/src/assets/scss/components/myTable.scss @@ -23,6 +23,9 @@ border-width: 0 0 1px 0; padding: 1rem 1rem; } + tr.outgoing { + background-color: #DAF0C3B2; + } } .myTfoot { diff --git a/src/pages/DashboardBeneficiario/index.js b/src/pages/DashboardBeneficiario/index.js index 6503111..66ac510 100644 --- a/src/pages/DashboardBeneficiario/index.js +++ b/src/pages/DashboardBeneficiario/index.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { __, sprintf } from '@wordpress/i18n'; +import { __ } from '@wordpress/i18n'; import { Link, useNavigate } from 'react-router-dom'; import { head, isEmpty, pathOr } from 'ramda'; import NumberFlow from '@number-flow/react'; diff --git a/src/pages/DomandaBeneficiario/index.js b/src/pages/DomandaBeneficiario/index.js index 322f1f4..50b8083 100644 --- a/src/pages/DomandaBeneficiario/index.js +++ b/src/pages/DomandaBeneficiario/index.js @@ -1,35 +1,30 @@ import React, { useState, useEffect, useRef, useMemo } from 'react'; import { __, sprintf } from '@wordpress/i18n'; import { useNavigate, useParams } from 'react-router-dom'; -import { is, isEmpty, isNil } from 'ramda'; -import { wrap } from 'object-path-immutable'; +import { is, isEmpty } from 'ramda'; +import { useForm } from 'react-hook-form'; +import { klona } from 'klona'; // store import { storeSet, useStore } from '../../store'; // api import AmendmentsService from '../../service/amendments-service'; -import CommunicationService from '../../service/communication-service'; +import ApplicationService from '../../service/application-service'; // tools import set404FromErrorResponse from '../../helpers/set404FromErrorResponse'; import getBandoLabel from '../../helpers/getBandoLabel'; import getDateFromISOstring from '../../helpers/getDateFromISOstring'; import renderHtmlContent from '../../helpers/renderHtmlContent'; -import uniqid from '../../helpers/uniqid'; // components import { Button } from 'primereact/button'; import BlockingOverlay from '../../components/BlockingOverlay'; import { Toast } from 'primereact/toast'; -import { classNames } from 'primereact/utils'; import { Dialog } from 'primereact/dialog'; -import { InputText } from 'primereact/inputtext'; -import { InputTextarea } from 'primereact/inputtextarea'; -import ApplicationService from '../../service/application-service'; import FormField from '../../components/FormField'; -import { useForm } from 'react-hook-form'; -import { klona } from 'klona'; +import SoccorsoComunications from '../SoccorsoEditPreInstructor/components/SoccorsoComunications'; const DomandaBeneficiario = () => { const isAsyncRequest = useStore().main.isAsyncRequest(); @@ -37,10 +32,6 @@ const DomandaBeneficiario = () => { const navigate = useNavigate(); const [data, setData] = useState({}); const [dataAppl, setDataAppl] = useState({}); - const [comms, setComms] = useState([]); - const [isVisibleNewCommDialog, setIsVisibleNewCommDialog] = useState(false); - const [newCommData, setNewCommData] = useState({}); - const [isLoadingCommunication, setIsLoadingCommunication] = useState(false); const [isVisibleEmailDialog, setIsVisibleEmailDialog] = useState(false); const toast = useRef(null); const [formInitialData, setFormInitialData] = useState({}); @@ -83,7 +74,6 @@ const DomandaBeneficiario = () => { return acc; }, {}); setFormInitialData(formDataInitial); - CommunicationService.getCommsByAmendmentId(amendmentObj.id, getCommsCallback, errGetCommsCallback); storeSet.main.unsetAsyncRequest(); } else { ApplicationService.getApplication(id, getApplCallback, errGetCallback) @@ -110,25 +100,6 @@ const DomandaBeneficiario = () => { storeSet.main.unsetAsyncRequest(); } - const getCommsCallback = (data) => { - if (data.status === 'SUCCESS') { - setComms(data.data.commentsList.map(o => getFormattedCommsData(o))); - } - storeSet.main.unsetAsyncRequest(); - } - - const errGetCommsCallback = (data) => { - if (toast.current && data.message) { - toast.current.show({ - severity: 'error', - summary: '', - detail: data.message - }); - } - set404FromErrorResponse(data); - storeSet.main.unsetAsyncRequest(); - } - const getFormattedData = (data) => { data.submissionDate = is(String, data.submissionDate) ? new Date(data.submissionDate) : (data.submissionDate ? data.submissionDate : ''); data.startDate = is(String, data.startDate) ? new Date(data.startDate) : (data.startDate ? data.startDate : ''); @@ -136,81 +107,6 @@ const DomandaBeneficiario = () => { return data; }; - const getFormattedCommsData = (data) => { - data.id = isNil(data.id) ? uniqid('id') : data.id; - data.commentedDate = is(String, data.commentedDate) ? new Date(data.commentedDate) : (data.commentedDate ? data.commentedDate : ''); - data.createdDate = is(String, data.createdDate) ? new Date(data.createdDate) : (data.createdDate ? data.createdDate : ''); - data.updatedDate = is(String, data.updatedDate) ? new Date(data.updatedDate) : (data.updatedDate ? data.updatedDate : ''); - return data; - }; - - const headerNewComDialog = () => { - return {__('Aggiungi comunicazione', 'gepafin')} - } - - const hideNewComDialog = () => { - setIsVisibleNewCommDialog(false); - setNewCommData({ - title: '', - comment: '' - }); - } - - const footerNewComDialog = () => { - return
-
- } - - const openNewCommDialog = () => { - setIsVisibleNewCommDialog(true); - setNewCommData({ - title: '', - comment: '' - }); - } - - const updateNewCommData = (value, path) => { - const newData = wrap(newCommData).set(path.split('.'), value).value(); - setNewCommData(newData); - } - - const createCommunication = () => { - setIsLoadingCommunication(true); - CommunicationService.createCommunication(data.id, newCommData, createCommunicationCallback, errCreateCommunicationCallback); - } - - const createCommunicationCallback = (data) => { - if (data.status === 'SUCCESS') { - if (toast.current) { - toast.current.show({ - severity: 'success', - summary: '', - detail: data.message - }); - } - setComms([...comms, getFormattedCommsData(data.data)]) - setIsVisibleNewCommDialog(false); - } - setIsLoadingCommunication(false); - } - - const errCreateCommunicationCallback = (data) => { - if (toast.current && data.message) { - toast.current.show({ - severity: 'error', - summary: '', - detail: data.message - }); - } - set404FromErrorResponse(data); - setIsLoadingCommunication(false); - } - const onSubmit = () => { }; @@ -354,7 +250,7 @@ const DomandaBeneficiario = () => {

{__('Dettagli Richiesta', 'gepafin')}

{__('Note e spiegazioni', 'gepafin')}

+ style={{ minHeight: '100px' }}> {renderHtmlContent(data.note)}
: null} @@ -365,9 +261,6 @@ const DomandaBeneficiario = () => {
{data.formFields ? data.formFields.map((o, i) => { - /*const thisField = head(test.updatedFormFields.filter(j => j.fieldId === o.fieldId)); - const value = pathOr({}, ['fieldValue'], thisField); - console.log('value', value, o.fieldId);*/ return { {data.id ?

{__('Comunicazioni', 'gepafin')}

- - - - - - - - - {!isNil(comms) && !isEmpty(comms) - ? comms.map((o, i) => - - - ) - : - - - } - -
{__('Data', 'gepafin')}{__('Comunicazione', 'gepafin')}
- {getDateFromISOstring(o.commentedDate)} - -

{o.title}

-

{o.comment}

-
--
- -
: null} {data.id @@ -459,40 +321,8 @@ const DomandaBeneficiario = () => { icon="pi pi-times" iconPos="right"/> - - - -
- - updateNewCommData(e.target.value, 'title')}/> - - - updateNewCommData(e.target.value, 'comment')}/> -
- - { const isAsyncRequest = useStore().main.isAsyncRequest(); @@ -63,6 +63,7 @@ const DomandaEditPreInstructor = () => { const getCallback = (data) => { if (data.status === 'SUCCESS') { setData(getFormattedData(data.data)); + setMotivation(data.data.motivation); } storeSet.main.unsetAsyncRequest(); } @@ -158,8 +159,10 @@ const DomandaEditPreInstructor = () => { criteria: klona(data.criteria), checklist: klona(data.checklist), files: klona(data.files), - note: data.note + note: data.note, + motivation } + ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback); } @@ -169,8 +172,10 @@ const DomandaEditPreInstructor = () => { criteria: klona(data.criteria), checklist: klona(data.checklist), files: klona(data.files), - note: data.note + note: data.note, + motivation } + ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback); } @@ -273,7 +278,8 @@ const DomandaEditPreInstructor = () => { } const shouldDisableField = (fieldName) => { - return !['EVALUATION', 'OPEN'].includes(data.status) || (['ADMISSIBLE'].includes(data.status) && fieldName !== 'criteria') + return !['EVALUATION'].includes(data.applicationStatus) + || (['ADMISSIBLE'].includes(data.applicationStatus) && fieldName !== 'criteria') } const headerCompleteDialog = () => { @@ -285,6 +291,7 @@ const DomandaEditPreInstructor = () => { const hideCompleteDialog = () => { setIsVisibleCompleteDialog(false); setOperationType(''); + setMotivation(''); } const footerCompleteDialog = () => { @@ -304,10 +311,18 @@ const DomandaEditPreInstructor = () => { } const initiateRejecting = () => { - setOperationType('approve'); + setOperationType('reject'); setIsVisibleCompleteDialog(true); } + const doCreateAppointment = () => { + // TODO + } + + const doMakeAdmisible = () => { + // TODO + } + useEffect(() => { const maxScore = pathOr(0, ['minScore'], data); const criteria = pathOr([], ['criteria'], data); @@ -565,18 +580,21 @@ const DomandaEditPreInstructor = () => {
-
+ } + + const openNewCommDialog = () => { + setIsVisibleNewCommDialog(true); + setNewCommData({ + title: '', + comment: '' + }); + } + + const updateNewCommData = (value, path) => { + const newData = wrap(newCommData).set(path.split('.'), value).value(); + setNewCommData(newData); + } + + const createCommunication = () => { + setIsLoadingCommunication(true); + CommunicationService.createCommunication(amendmentId, newCommData, createCommunicationCallback, errCreateCommunicationCallback); + } + + const createCommunicationCallback = (data) => { + if (data.status === 'SUCCESS') { + if (toast.current) { + toast.current.show({ + severity: 'success', + summary: '', + detail: data.message + }); + } + setComms([...comms, getFormattedCommsData(data.data)]) + setIsVisibleNewCommDialog(false); + } + setIsLoadingCommunication(false); + } + + const errCreateCommunicationCallback = (data) => { + if (toast.current && data.message) { + toast.current.show({ + severity: 'error', + summary: '', + detail: data.message + }); + } + set404FromErrorResponse(data); + setIsLoadingCommunication(false); + } + + const displayCommIcon = (comm) => { + const userData = storeGet.main.userData(); + return userData.id === comm.senderUserId + ? + : ; + } + + const getCommRowClass = (comm) => { + const userData = storeGet.main.userData(); + return userData.id === comm.senderUserId ? 'outgoing' : 'incoming'; + } + + return ( + <> + + + + + + + + + + + {!isNil(comms) && !isEmpty(comms) + ? comms.map((o, i) => + + + + ) + : + + + + } + +
{__('Data', 'gepafin')}{__('Comunicazione', 'gepafin')}
+ {displayCommIcon(o)} + + {getDateFromISOstring(o.commentedDate)} + +

{o.title}

+

{o.comment}

+
--
+ +
- } - - const openNewCommDialog = () => { - setIsVisibleNewCommDialog(true); - setNewCommData({ - title: '', - comment: '' - }); - } - - const updateNewCommData = (value, path) => { - const newData = wrap(newCommData).set(path.split('.'), value).value(); - setNewCommData(newData); - } - const renderHeader = () => { return ( @@ -185,38 +116,6 @@ const SoccorsoEditPreInstructor = () => { setData(newData); } - const createCommunication = () => { - setIsLoadingCommunication(true); - CommunicationService.createCommunication(amendmentId, newCommData, createCommunicationCallback, errCreateCommunicationCallback); - } - - const createCommunicationCallback = (data) => { - if (data.status === 'SUCCESS') { - if (toast.current) { - toast.current.show({ - severity: 'success', - summary: '', - detail: data.message - }); - } - setComms([...comms, getFormattedCommsData(data.data)]) - setIsVisibleNewCommDialog(false); - } - setIsLoadingCommunication(false); - } - - const errCreateCommunicationCallback = (data) => { - if (toast.current && data.message) { - toast.current.show({ - severity: 'error', - summary: '', - detail: data.message - }); - } - set404FromErrorResponse(data); - setIsLoadingCommunication(false); - } - const onSubmit = () => { }; @@ -471,38 +370,7 @@ const SoccorsoEditPreInstructor = () => {

{__('Comunicazioni', 'gepafin')}

- - - - - - - - - {!isNil(comms) && !isEmpty(comms) - ? comms.map((o, i) => - - - ) - : - - - } - -
{__('Data', 'gepafin')}{__('Comunicazione', 'gepafin')}
- {getDateFromISOstring(o.commentedDate)} - -

{o.title}

-

{o.comment}

-
--
- -
@@ -511,9 +379,6 @@ const SoccorsoEditPreInstructor = () => { {data.formFields ? data.formFields.map((o, i) => { - /*const thisField = head(test.updatedFormFields.filter(j => j.fieldId === o.fieldId)); - const value = pathOr({}, ['fieldValue'], thisField); - console.log('value', value, o.fieldId);*/ return {
- -
- - updateNewCommData(e.target.value, 'title')}/> - - - updateNewCommData(e.target.value, 'comment')}/> -
- -