-
{__('Domande attive', 'gepafin')}
-
{getStatValue('numberOfApplications', 0)}
+
{__('Riepilogo', 'gepafin')}
+
+
+
{__('Domande da valutare', 'gepafin')}
+
+ {/*
+
+ {getStatValue(['assignedApplication', 'additionalApplicationPercentage'], 0)}%
+ {__('da ieri', 'gepafin')}
+
*/}
-
-
{__('Bandi osservati', 'gepafin')}
-
{getStatValue('numberOfCalls', 0)}
+
+
{__('Domande valutate', 'gepafin')}
+
+ {/*
+
+ {getStatValue(['evaluatedApplication', 'dailyAverage'], 0)}
+ {__('media giornaliera', 'gepafin')}
+
*/}
-
-
{__('Documenti da integrare', 'gepafin')}
-
{getStatValue('numberOfIntegratedDocuments', 0)}
+
+
{__('Tempo medio valutazione', 'gepafin')}
+
+ {/*
+
+ {getStatValue(['averageEvaluationDays', 'timeDifferenceFromAverage'], 0)}
+ {__('rispetto alla media', 'gepafin')}
+
*/}
+
+
+
{__('Soccorsi istruttori in corso', 'gepafin')}
+
+ {/*
+
+ {getStatValue(['amendmentInProgress', 'expiringToday'], 0)}
+ {__('in scadenza oggi', 'gepafin')}
+
*/}
-
*/}
+
{__('Coda di lavoro', 'gepafin')}
-
+
diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index e46762f..a85efde 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -1,9 +1,12 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
import { __, sprintf } from '@wordpress/i18n';
import { useNavigate, useParams } from 'react-router-dom';
-import { is, isEmpty, isNil, sum, pathOr, head } from 'ramda';
+import { is, isEmpty, isNil, sum, pathOr, head, pluck } from 'ramda';
import { klona } from 'klona';
import { wrap } from 'object-path-immutable';
+import { evaluate } from 'mathjs';
+import equal from 'fast-deep-equal';
+import { useForm } from 'react-hook-form';
// store
import { storeGet, storeSet, useStore } from '../../store';
@@ -15,8 +18,21 @@ import AppointmentService from '../../service/appointment-service';
// tools
import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
-import getBandoLabel from '../../helpers/getBandoLabel';
-import getDateFromISOstring from '../../helpers/getDateFromISOstring';
+import {
+ isCAP,
+ isCodiceFiscale,
+ isEmail,
+ isEmailPEC,
+ isIBAN,
+ isMarcaDaBollo,
+ isPIVA,
+ isUrl, maxChecks, minChecks, nonEmptyTables
+} from '../../helpers/validators';
+import formatDateString from '../../helpers/formatDateString';
+import getTokens from '../../helpers/getTokens';
+import parseCommaDecimal from '../../helpers/parseCommaDecimal';
+import renderWithDataVars from '../../helpers/renderWithDataVars';
+import renderHtmlContent from '../../helpers/renderHtmlContent';
// components
import { Skeleton } from 'primereact/skeleton';
@@ -31,17 +47,16 @@ import HelpIcon from '../../icons/HelpIcon';
import { classNames } from 'primereact/utils';
import { InputTextarea } from 'primereact/inputtextarea';
import { InputText } from 'primereact/inputtext';
-import DownloadApplicationArchive from '../DomandaEditPreInstructor/components/DownloadApplicationArchive';
-import DownloadCompanyDelegation from '../DomandaEditPreInstructor/components/DownloadCompanyDelegation';
-import DownloadSignedApplication from '../DomandaEditPreInstructor/components/DownloadSignedApplication';
import ListOfFiles from '../DomandaEditPreInstructor/components/ListOfFiles';
import RepeaterFields from '../DomandaEditPreInstructor/components/RepeaterFields';
-import getDateTimeFromISOstring from '../../helpers/getDateTimeFromISOstring';
+import ApplicationInfo from '../DomandaEditPreInstructor/components/ApplicationInfo';
+import ApplicationDownloadFiles from '../DomandaEditPreInstructor/components/ApplicationDownloadFiles';
+import FormField from '../../components/FormField';
const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
-const DomandaEditPreInstructor = () => {
+const DomandaEditInstructorManager = () => {
const isAsyncRequest = useStore().main.isAsyncRequest();
const { id } = useParams();
const navigate = useNavigate();
@@ -66,12 +81,46 @@ const DomandaEditPreInstructor = () => {
duration: 0,
amount: 0
});
+ const [formData, setFormData] = useState([]);
+ const [formId, setFormId] = useState(0);
+ const [formInitialData, setFormInitialData] = useState(null);
+ const {
+ control,
+ handleSubmit,
+ formState: { errors },
+ setValue,
+ trigger,
+ register,
+ getValues,
+ watch,
+ reset
+ } = useForm({
+ defaultValues: useMemo(() => {
+ return formInitialData ? formInitialData : {}
+ }, [formInitialData]),
+ mode: 'onChange'
+ });
+ const validationFns = {
+ isPIVA,
+ isCodiceFiscale,
+ isCAP,
+ isIBAN,
+ isEmail,
+ isEmailPEC,
+ isUrl,
+ isMarcaDaBollo,
+ minChecks,
+ maxChecks,
+ nonEmptyTables
+ }
+ const values = getValues();
+ const formValues = watch();
const goToEvaluationsPage = () => {
- navigate('/domande');
+ navigate('/mie-domande');
}
- const updateFlagsForSoccorso = (data) => {
+ const updateFlagsForSoccorso = useCallback((data) => {
let nonRatedFilesLength = 0;
if (data.files) {
@@ -90,41 +139,106 @@ const DomandaEditPreInstructor = () => {
setAllFilesRated(nonRatedFilesLength === 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)
+ if (data.evaluationVersion === 'V1') {
+ if (data.checklist) {
+ const checkedChecklistItems = data.checklist
+ .map(el => el.valid)
+ .filter(v => v);
+ setAtLeastOneChecked(checkedChecklistItems.length > 0);
+ setAllChecksChecked(checkedChecklistItems.length === data.checklist.length)
+ }
+ } else if (data.evaluationVersion === 'V2') {
+ const minChecks = data.numberOfCheck;
+ const formFieldsChecklist = formData
+ .filter(o => head(o.settings.filter(s => s.name === 'isChecklistItem' && s.value)))
+ .map(o => o.id);
+
+ if (formFieldsChecklist.length >= minChecks) {
+ const valuesTotal = formFieldsChecklist.map(v => formValues[v]);
+ const valuesFirst = valuesTotal.toSpliced(minChecks);
+ setAtLeastOneChecked(valuesTotal.filter(v => v === true).length === valuesTotal.length);
+ setAllChecksChecked(valuesFirst.filter(v => v === true).length === valuesFirst.length)
+ }
}
- }
+ }, [formValues]);
const doNewSoccorso = () => {
if (connectedSoccorsoId !== 0) {
- navigate(`/domande/${id}/soccorso/${connectedSoccorsoId}`);
+ navigate(`/mie-domande/${id}/soccorso/${connectedSoccorsoId}`);
} else {
- doSaveDraft(`/domande/${id}/aggiungi-soccorso/`)
+ doSaveDraft(`/mie-domande/${id}/aggiungi-soccorso/`)
}
}
- const getCallback = (data) => {
- if (data.status === 'SUCCESS') {
- setData(getFormattedData(data.data));
- setMotivation(data.data.motivation);
- updateFlagsForSoccorso(data.data);
+ const getVersion = (resp) => {
+ if (resp.status === 'SUCCESS') {
+ if (resp.data.evaluationVersion === 'V1') {
+ storeSet.main.setAsyncRequest();
+ ApplicationEvaluationService.getEvaluationByApplId(getCallback, errGetCallback, [
+ ['applicationId', resp.data.applicationId]
+ ]);
+ } else if (resp.data.evaluationVersion === 'V2') {
+ storeSet.main.setAsyncRequest();
+ ApplicationEvaluationService.getEvaluationV2ByApplId(getCallback, errGetCallback, [
+ ['applicationId', resp.data.applicationId]
+ ]);
+ }
}
storeSet.main.unsetAsyncRequest();
}
- const errGetCallback = (data) => {
+ const errGetVersion = (resp) => {
if (toast.current && data.message) {
toast.current.show({
severity: 'error',
summary: '',
- detail: data.message
+ detail: resp.message
});
}
- set404FromErrorResponse(data);
+ set404FromErrorResponse(resp);
+ storeSet.main.unsetAsyncRequest();
+ }
+
+ const getCallback = (resp) => {
+ if (resp.status === 'SUCCESS') {
+ setData(getFormattedData(resp.data));
+ setMotivation(resp.data.motivation);
+ updateFlagsForSoccorso(resp.data);
+
+ if (resp.data.evaluationVersion === 'V2') {
+ setFormData(resp.data.applicationEvaluationFormResponse.content);
+ setFormId(resp.data.applicationEvaluationFormResponse.id);
+ let formDataInitial = {};
+
+ if (resp.data.applicationEvaluationFormResponse.formFields) {
+ const submitData = resp.data.applicationEvaluationFormResponse.formFields.map((o) => ({
+ fieldId: o.fieldId,
+ fieldValue: o.fieldValue
+ }));
+ formDataInitial = submitData.reduce((acc, cur) => {
+ if (cur.fieldValue) {
+ acc[cur.fieldId] = cur.fieldValue;
+ }
+ return acc;
+ }, formDataInitial);
+ }
+
+ reset();
+ setFormInitialData(formDataInitial);
+ }
+ }
+ storeSet.main.unsetAsyncRequest();
+ }
+
+ const errGetCallback = (resp) => {
+ if (toast.current && resp.message) {
+ toast.current.show({
+ severity: 'error',
+ summary: '',
+ detail: resp.message
+ });
+ }
+ set404FromErrorResponse(resp);
storeSet.main.unsetAsyncRequest();
}
@@ -166,26 +280,74 @@ const DomandaEditPreInstructor = () => {
updateFlagsForSoccorso(newData);
}
- const doSaveDraft = useCallback((doRedirect = '') => {
- const formData = {
- criteria: klona(data.criteria),
- checklist: klona(data.checklist),
- files: klona(data.files),
- evaluationDocument: klona(data.evaluationDocument.map(o => ({
- ...o,
- fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
- })
- )),
- amendmentDetails: klona(data.amendmentDetails),
- note: data.note
- }
+ const getTransformedSubmitData = () => {
+ const formValues = getValues();
+ const usedFieldsIds = pluck('id', formData);
+ return Object.keys(formValues)
+ .filter(v => usedFieldsIds.includes(v))
+ .reduce((acc, cur) => {
+ const formField = head(formData.filter(o => o.id === cur));
+ let fieldVal = formValues[cur];
- ApplicationEvaluationService.updateEvaluation(
- data.assignedApplicationId,
- formData,
- (data) => updateCallback(data, doRedirect),
- errUpdateCallback
- );
+ if (formValues[cur] && formValues[cur].toISOString) {
+ fieldVal = formatDateString(formValues[cur]);
+ }
+
+ fieldVal = isEmpty(fieldVal) ? null : fieldVal;
+ if (formField && formField.name === 'fileupload') {
+ fieldVal = is(Array, fieldVal) ? fieldVal.map(o => o.id).join(',') : null;
+ }
+ acc.push({
+ 'fieldId': cur,
+ 'fieldValue': fieldVal
+ });
+ return acc;
+ }, []);
+ }
+
+ const doSaveDraft = useCallback((doRedirect = '') => {
+ if (data.evaluationVersion === 'V1') {
+ const submitData = {
+ criteria: klona(data.criteria),
+ checklist: klona(data.checklist),
+ files: klona(data.files),
+ evaluationDocument: klona(data.evaluationDocument.map(o => ({
+ ...o,
+ fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+ })
+ )),
+ amendmentDetails: klona(data.amendmentDetails),
+ note: data.note
+ };
+
+ ApplicationEvaluationService.updateEvaluation(
+ data.assignedApplicationId,
+ submitData,
+ (data) => updateCallback(data, doRedirect),
+ errUpdateCallback
+ );
+ } else if (data.evaluationVersion === 'V2') {
+ const newFormValues = getTransformedSubmitData();
+ const submitData = {
+ formFields: newFormValues,
+ files: klona(data.files),
+ evaluationDocument: klona(data.evaluationDocument.map(o => ({
+ ...o,
+ fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+ })
+ )),
+ amendmentDetails: klona(data.amendmentDetails),
+ note: data.note
+ }
+
+ ApplicationEvaluationService.updateEvaluationV2(
+ data.assignedApplicationId,
+ formId,
+ submitData,
+ (data) => updateCallback(data, doRedirect),
+ errUpdateCallback
+ );
+ }
}, [data]);
const updateCallback = (data, doRedirect = '') => {
@@ -218,33 +380,95 @@ const DomandaEditPreInstructor = () => {
}
const doApprove = () => {
- const formData = {
- applicationStatus: 'APPROVED',
- criteria: klona(data.criteria),
- checklist: klona(data.checklist),
- files: klona(data.files),
- note: data.note,
- motivation
- }
+ if (data.evaluationVersion === 'V1') {
+ const submitData = {
+ applicationStatus: 'APPROVED',
+ criteria: klona(data.criteria),
+ checklist: klona(data.checklist),
+ files: klona(data.files),
+ note: data.note,
+ motivation
+ }
- setLoading(true);
- setIsVisibleCompleteDialog(false);
- ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
+ setLoading(true);
+ setIsVisibleCompleteDialog(false);
+ ApplicationEvaluationService.updateEvaluation(
+ data.assignedApplicationId,
+ submitData,
+ updateStatusCallback,
+ errUpdateStatusCallback
+ );
+ } else if (data.evaluationVersion === 'V2') {
+ const newFormValues = getTransformedSubmitData();
+ const submitData = {
+ formFields: newFormValues,
+ files: klona(data.files),
+ evaluationDocument: klona(data.evaluationDocument.map(o => ({
+ ...o,
+ fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+ })
+ )),
+ amendmentDetails: klona(data.amendmentDetails),
+ note: data.note,
+ motivation
+ }
+
+ setLoading(true);
+ setIsVisibleCompleteDialog(false);
+ ApplicationEvaluationService.updateEvaluationV2(
+ data.assignedApplicationId,
+ formId,
+ submitData,
+ updateStatusCallback,
+ errUpdateStatusCallback
+ );
+ }
}
const doReject = () => {
- const formData = {
- applicationStatus: 'REJECTED',
- criteria: klona(data.criteria),
- checklist: klona(data.checklist),
- files: klona(data.files),
- note: data.note,
- motivation
- }
+ if (data.evaluationVersion === 'V1') {
+ const submitData = {
+ applicationStatus: 'REJECTED',
+ criteria: klona(data.criteria),
+ checklist: klona(data.checklist),
+ files: klona(data.files),
+ note: data.note,
+ motivation
+ }
- setLoading(true);
- setIsVisibleCompleteDialog(false);
- ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
+ setLoading(true);
+ setIsVisibleCompleteDialog(false);
+ ApplicationEvaluationService.updateEvaluation(
+ data.assignedApplicationId,
+ submitData,
+ updateStatusCallback,
+ errUpdateStatusCallback
+ );
+ } else if (data.evaluationVersion === 'V2') {
+ const newFormValues = getTransformedSubmitData();
+ const submitData = {
+ formFields: newFormValues,
+ files: klona(data.files),
+ evaluationDocument: klona(data.evaluationDocument.map(o => ({
+ ...o,
+ fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+ })
+ )),
+ amendmentDetails: klona(data.amendmentDetails),
+ note: data.note,
+ motivation
+ }
+
+ setLoading(true);
+ setIsVisibleCompleteDialog(false);
+ ApplicationEvaluationService.updateEvaluationV2(
+ data.assignedApplicationId,
+ formId,
+ submitData,
+ updateStatusCallback,
+ errUpdateStatusCallback
+ );
+ }
}
const updateStatusCallback = (data) => {
@@ -431,7 +655,7 @@ const DomandaEditPreInstructor = () => {
setIsVisibleAppointmentDialog(true);
}
- const setValue = (name, value) => {
+ const setFieldValue = (name, value) => {
const newData = wrap(appointmentData).set(name, value).value();
setAppointmentData(newData);
}
@@ -505,11 +729,153 @@ const DomandaEditPreInstructor = () => {
// TODO
}
- const evaluationShouldBeBlocked = (data = {}) => {
- const userData = storeGet.main.userData()
+ const evaluationBlockedForUser = (data = {}) => {
+ const userData = storeGet.main.userData();
return isAsyncRequest || userData.id !== data.assignedUserId;
}
+ const shouldDisableNewSoccorso = () => {
+ if (data.evaluationVersion === 'V1') {
+ return !allFilesRated || !atLeastOneChecked;
+ } else if (data.evaluationVersion === 'V2') {
+ return !allFilesRated || !atLeastOneChecked;
+ } else {
+ return true;
+ }
+ }
+
+ const actionBtns = () => {
+ return
+ {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
+ ?
+ }
+
+ useEffect(() => {
+ let updatedFormValues = klona(formValues);
+ let context = {};
+
+ // eslint-disable-next-line array-callback-return
+ formData.map((o) => {
+ const variable = head(o.settings.filter(o => o.name === 'variable'));
+ const formula = head(o.settings.filter(o => o.name === 'formula'));
+
+ if (formula && !isEmpty(formula.value)) {
+ context = getTokens(formula.value)
+ .filter(v => !['false', 'null', 'true'].includes(v))
+ .reduce((acc, cur) => {
+ acc[cur] = isNil(context[cur]) ? 0 : parseCommaDecimal(context[cur]);
+ return acc;
+ }, context);
+
+ const mathFormula = renderWithDataVars(formula.value, context);
+ try {
+ updatedFormValues[o.id] = evaluate(mathFormula);
+ } catch (e) {
+ console.log('Error in math formula: "', mathFormula, '"', e.message);
+ updatedFormValues[o.id] = 0;
+ }
+ }
+
+ if (variable && !isEmpty(variable.value)) {
+ context[variable.value[0]] = 'criteria_table' === o.name
+ ? pathOr(0, [o.id, 'total'], updatedFormValues)
+ : pathOr(0, [o.id], updatedFormValues);
+ }
+ });
+
+ if (!isEmpty(updatedFormValues) && !equal(updatedFormValues, formValues)) {
+ reset(updatedFormValues);
+ }
+
+ updateFlagsForSoccorso(data);
+ }, [formValues]);
+
+ useEffect(() => {
+ if (formInitialData) {
+ //reset();
+ Object.keys(formInitialData).map(k => setValue(k, formInitialData[k]));
+ trigger();
+ }
+ }, [formInitialData]);
+
useEffect(() => {
const maxScore = pathOr(0, ['minScore'], data);
const criteria = pathOr([], ['criteria'], data);
@@ -523,9 +889,7 @@ const DomandaEditPreInstructor = () => {
const entityId = !isNaN(parsed) ? parsed : 0;
storeSet.main.setAsyncRequest();
- ApplicationEvaluationService.getEvaluationByApplId(getCallback, errGetCallback, [
- ['applicationId', entityId]
- ]);
+ ApplicationEvaluationService.getEvaluationVersionByApplId(entityId, getVersion, errGetVersion);
AmendmentsService.getSoccorsoByApplId(entityId, getAmendmentsCallback, errGetAmendmentsCallback, [
['statuses', 'AWAITING']
]);
@@ -553,64 +917,18 @@ const DomandaEditPreInstructor = () => {
{!isAsyncRequest && !isEmpty(data)
?
-
-
- {__('ID domanda', 'gepafin')}
- {data.applicationId}
-
-
- {__('Protocollo', 'gepafin')}
- {data.protocolNumber}
-
- {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
- ?
- {__('NDG', 'gepafin')}
- {data.ndg}
-
: null}
- {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
- ?
- {__('Appuntamento', 'gepafin')}
- {data.appointmentId}
-
: null}
-
- {__('Bando', 'gepafin')}
- {data.callName}
-
-
- {__('Referente Aziendale', 'gepafin')}
- {data.beneficiary}
-
-
- {__('Azienda Beneficiaria', 'gepafin')}
- {data.companyName}
-
-
- {__('Data ricezione', 'gepafin')}
- {getDateTimeFromISOstring(data.submissionDate)}
-
-
- {__('Data assegnazione', 'gepafin')}
- {getDateTimeFromISOstring(data.assignedAt)}
-
-
- {__('Scadenza Valutazione', 'gepafin')}
- {getDateFromISOstring(data.evaluationEndDate)}
-
-
- {__('Stato', 'gepafin')}
- {getBandoLabel(data.applicationStatus)}
-
+
+
+
+ {__('Azioni rapide', 'gepafin')}
-
{__('Scarica documenti della domanda', 'gepafin')}
-
-
-
-
-
+ {actionBtns()}
{__('Documenti aggiuntivi', 'gepafin')}
{
data,
['evaluationDocument']
)}
- shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
+ shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
sourceId={data.assignedApplicationId}
sourceName="evaluation"/>
-
-
{__('Checklist Valutazione', 'gepafin')}
-
-
-
{__('Lista', 'gepafin')}
-
-
- {data.checklist.map((o, i) =>
- updateEvaluationValue(
- e.checked,
- ['checklist', i, 'valid']
- )}
- checked={o.valid}>
-
-
)}
-
-
-
-
{__('Note', 'gepafin')}
-
- updateEvaluationValue(
- e.htmlValue,
- ['note']
- )}
- style={{ height: 80 * 3, width: '100%' }}
- />
-
-
-
-
{__('Documenti allegati', 'gepafin')}
-
+ {__('Documenti allegati', 'gepafin')}
+ {!isEmpty(data.files)
+ ? shouldDisableField(name) || evaluationShouldBeBlocked(data)}
+ shouldDisableFieldFn={(name) => shouldDisableField(name) || evaluationBlockedForUser(data)}
name="files"
ndg={data.ndg}
applicationId={id}/>
+ : {__('Nessun documento allegato', 'gepafin')}
}
+
+ : null}
+
+ {data.evaluationVersion === 'V2'
+ ?
+ : null}
+
+ {data.evaluationVersion === 'V1'
+ ?
+
{__('Checklist Valutazione', 'gepafin')}
+
+
+
{__('Lista', 'gepafin')}
+
+
+ {data.checklist.map((o, i) =>
+ updateEvaluationValue(
+ e.checked,
+ ['checklist', i, 'valid']
+ )}
+ checked={o.valid}>
+
+
)}
+
+
+
+
{__('Note', 'gepafin')}
+
+ updateEvaluationValue(
+ e.htmlValue,
+ ['note']
+ )}
+ style={{ height: 80 * 3, width: '100%' }}
+ />
+
+
+
+
{__('Documenti allegati', 'gepafin')}
+ {!isEmpty(data.files)
+ ?
shouldDisableField(name) || evaluationBlockedForUser(data)}
+ name="files"
+ ndg={data.ndg}
+ applicationId={id}/>
+ : {__('Nessun documento allegato', 'gepafin')}
}
+
-
+ : null}
{!isEmpty(data.amendmentDetails)
?
@@ -679,90 +1092,92 @@ const DomandaEditPreInstructor = () => {
shouldDisableField(name) || evaluationShouldBeBlocked(data)}
+ shouldDisableFieldFn={(name) => shouldDisableField(name) || evaluationBlockedForUser(data)}
name="amendmentDetails"
ndg={data.ndg}
applicationId={id}/>
: null}
-
-
{__('Punteggi di valutazione', 'gepafin')}
- {data.criteria
- ?
-
-
- | {__('Parametro', 'gepafin')} |
- {__('Punteggio', 'gepafin')} |
- {__('Stato', 'gepafin')} |
-
-
-
- {data.criteria.map((o, i) =>
- | {o.label} |
-
-
- updateEvaluationValue(
- e.value,
- ['criteria', i, 'score'],
- o.criteria
- )}/>
-
+ {data.evaluationVersion === 'V1'
+ ?
+ {__('Punteggi di valutazione', 'gepafin')}
+ {data.criteria
+ ?
+
+
+ | {__('Parametro', 'gepafin')} |
+ {__('Punteggio', 'gepafin')} |
+ {__('Stato', 'gepafin')} |
+
+
+
+ {data.criteria.map((o, i) =>
+ | {o.label} |
+
+
+ updateEvaluationValue(
+ e.value,
+ ['criteria', i, 'score'],
+ o.criteria
+ )}/>
+
/ {o.maxScore}
-
- |
-
-
- {!isEmpty(o.criteriaMappedFields)
- ?
- |
- )}
-
- | {__('Punteggio:', 'gepafin')} |
- {sum(data.criteria.map(o => o.score))} |
-
- {isAdmissible
- ? : null}
- {!isAdmissible
- ? : null}
- |
-
-
-
-
- | {sprintf(__('Punteggio minimo per l\'ammissione: %d'), data.minScore)} |
-
-
- : null}
- |
+
+
+ {!isEmpty(o.criteriaMappedFields)
+ ?
+ |
+
)}
+
+ | {__('Punteggio:', 'gepafin')} |
+ {sum(data.criteria.map(o => o.score))} |
+
+ {isAdmissible
+ ? : null}
+ {!isAdmissible
+ ? : null}
+ |
+
+
+
+
+ | {sprintf(__('Punteggio minimo per l\'ammissione: %d'), data.minScore)} |
+
+
+
: null}
+
+ : null}
@@ -771,86 +1186,7 @@ const DomandaEditPreInstructor = () => {
-
- {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
- ?
+ {actionBtns()}
@@ -948,4 +1284,4 @@ const DomandaEditPreInstructor = () => {
}
-export default DomandaEditPreInstructor;
+export default DomandaEditInstructorManager;
diff --git a/src/pages/DomandaEditPreInstructor/components/ApplicationDownloadFiles/index.js b/src/pages/DomandaEditPreInstructor/components/ApplicationDownloadFiles/index.js
new file mode 100644
index 0000000..64be84e
--- /dev/null
+++ b/src/pages/DomandaEditPreInstructor/components/ApplicationDownloadFiles/index.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { isNil } from 'ramda';
+
+// components
+import DownloadApplicationArchive from '../DownloadApplicationArchive';
+import DownloadSignedApplication from '../DownloadSignedApplication';
+import DownloadCompanyDelegation from '../DownloadCompanyDelegation';
+
+const ApplicationDownloadFiles = ({ id }) => {
+ return (
+ !isNil(id)
+ ?
+
{__('Scarica documenti della domanda', 'gepafin')}
+
+
+
+
+
+
: null
+ )
+}
+
+export default ApplicationDownloadFiles;
\ No newline at end of file
diff --git a/src/pages/DomandaEditPreInstructor/components/ApplicationInfo/index.js b/src/pages/DomandaEditPreInstructor/components/ApplicationInfo/index.js
new file mode 100644
index 0000000..d3d0a4f
--- /dev/null
+++ b/src/pages/DomandaEditPreInstructor/components/ApplicationInfo/index.js
@@ -0,0 +1,70 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { isNil } from 'ramda';
+
+// tools
+import getDateTimeFromISOstring from '../../../../helpers/getDateTimeFromISOstring';
+import getDateFromISOstring from '../../../../helpers/getDateFromISOstring';
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+
+const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
+
+const ApplicationInfo = ({ data }) => {
+ return (
+ !isNil(data)
+ ?
+
+ {__('ID domanda', 'gepafin')}
+ {data.applicationId}
+
+
+ {__('Protocollo', 'gepafin')}
+ {data.protocolNumber}
+
+ {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
+ ?
+ {__('NDG', 'gepafin')}
+ {data.ndg}
+
: null}
+ {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
+ ?
+ {__('Appuntamento', 'gepafin')}
+ {data.appointmentId}
+
: null}
+
+ {__('Bando', 'gepafin')}
+ {data.callName}
+
+
+ {__('Referente Aziendale', 'gepafin')}
+ {data.beneficiary}
+
+
+ {__('Azienda Beneficiaria', 'gepafin')}
+ {data.companyName}
+
+
+ {__('Data ricezione', 'gepafin')}
+ {getDateTimeFromISOstring(data.submissionDate)}
+
+
+ {__('Data assegnazione', 'gepafin')}
+ {getDateTimeFromISOstring(data.assignedAt)}
+
+
+ {__('Aassegnato a', 'gepafin')}
+ {data.assignedUserName}
+
+
+ {__('Scadenza Valutazione', 'gepafin')}
+ {getDateFromISOstring(data.evaluationEndDate)}
+
+
+ {__('Stato', 'gepafin')}
+ {getBandoLabel(data.applicationStatus)}
+
+
: null
+ )
+}
+
+export default ApplicationInfo;
\ No newline at end of file
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 13a8033..64b4546 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -1,9 +1,12 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
import { __, sprintf } from '@wordpress/i18n';
import { useNavigate, useParams } from 'react-router-dom';
-import { is, isEmpty, isNil, sum, pathOr, head } from 'ramda';
+import { is, isEmpty, isNil, sum, pathOr, head, pluck } from 'ramda';
import { klona } from 'klona';
import { wrap } from 'object-path-immutable';
+import { useForm } from 'react-hook-form';
+import { evaluate } from 'mathjs';
+import equal from 'fast-deep-equal';
// store
import { storeGet, storeSet, useStore } from '../../store';
@@ -15,8 +18,21 @@ import AppointmentService from '../../service/appointment-service';
// tools
import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
-import getBandoLabel from '../../helpers/getBandoLabel';
-import getDateFromISOstring from '../../helpers/getDateFromISOstring';
+import {
+ isCAP,
+ isCodiceFiscale,
+ isEmail,
+ isEmailPEC,
+ isIBAN,
+ isMarcaDaBollo,
+ isPIVA,
+ isUrl, maxChecks, minChecks, nonEmptyTables
+} from '../../helpers/validators';
+import getTokens from '../../helpers/getTokens';
+import parseCommaDecimal from '../../helpers/parseCommaDecimal';
+import renderWithDataVars from '../../helpers/renderWithDataVars';
+import renderHtmlContent from '../../helpers/renderHtmlContent';
+import formatDateString from '../../helpers/formatDateString';
// components
import { Skeleton } from 'primereact/skeleton';
@@ -32,12 +48,11 @@ import BlockingOverlay from '../../components/BlockingOverlay';
import { classNames } from 'primereact/utils';
import { InputTextarea } from 'primereact/inputtextarea';
import { InputText } from 'primereact/inputtext';
-import DownloadApplicationArchive from './components/DownloadApplicationArchive';
-import DownloadCompanyDelegation from './components/DownloadCompanyDelegation';
-import DownloadSignedApplication from './components/DownloadSignedApplication';
import ListOfFiles from './components/ListOfFiles';
import RepeaterFields from './components/RepeaterFields';
-import getDateTimeFromISOstring from '../../helpers/getDateTimeFromISOstring';
+import ApplicationInfo from './components/ApplicationInfo';
+import ApplicationDownloadFiles from './components/ApplicationDownloadFiles';
+import FormField from '../../components/FormField';
const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
@@ -67,12 +82,46 @@ const DomandaEditPreInstructor = () => {
duration: 0,
amount: 0
});
+ const [formData, setFormData] = useState([]);
+ const [formId, setFormId] = useState(0);
+ const [formInitialData, setFormInitialData] = useState(null);
+ const {
+ control,
+ handleSubmit,
+ formState: { errors },
+ setValue,
+ trigger,
+ register,
+ getValues,
+ watch,
+ reset
+ } = useForm({
+ defaultValues: useMemo(() => {
+ return formInitialData ? formInitialData : {}
+ }, [formInitialData]),
+ mode: 'onChange'
+ });
+ const validationFns = {
+ isPIVA,
+ isCodiceFiscale,
+ isCAP,
+ isIBAN,
+ isEmail,
+ isEmailPEC,
+ isUrl,
+ isMarcaDaBollo,
+ minChecks,
+ maxChecks,
+ nonEmptyTables
+ }
+ const values = getValues();
+ const formValues = watch();
const goToEvaluationsPage = () => {
navigate('/domande');
}
- const updateFlagsForSoccorso = (data) => {
+ const updateFlagsForSoccorso = useCallback((data) => {
let nonRatedFilesLength = 0;
if (data.files) {
@@ -91,14 +140,28 @@ const DomandaEditPreInstructor = () => {
setAllFilesRated(nonRatedFilesLength === 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)
+ if (data.evaluationVersion === 'V1') {
+ if (data.checklist) {
+ const checkedChecklistItems = data.checklist
+ .map(el => el.valid)
+ .filter(v => v);
+ setAtLeastOneChecked(checkedChecklistItems.length > 0);
+ setAllChecksChecked(checkedChecklistItems.length === data.checklist.length)
+ }
+ } else if (data.evaluationVersion === 'V2') {
+ const minChecks = data.numberOfCheck;
+ const formFieldsChecklist = formData
+ .filter(o => head(o.settings.filter(s => s.name === 'isChecklistItem' && s.value)))
+ .map(o => o.id);
+
+ if (formFieldsChecklist.length >= minChecks) {
+ const valuesTotal = formFieldsChecklist.map(v => formValues[v]);
+ const valuesFirst = valuesTotal.toSpliced(minChecks);
+ setAtLeastOneChecked(valuesTotal.filter(v => v === true).length === valuesTotal.length);
+ setAllChecksChecked(valuesFirst.filter(v => v === true).length === valuesFirst.length)
+ }
}
- }
+ }, [formValues]);
const doNewSoccorso = () => {
if (connectedSoccorsoId !== 0) {
@@ -108,24 +171,75 @@ const DomandaEditPreInstructor = () => {
}
}
- const getCallback = (data) => {
- if (data.status === 'SUCCESS') {
- setData(getFormattedData(data.data));
- setMotivation(data.data.motivation);
- updateFlagsForSoccorso(data.data);
+ const getVersion = (resp) => {
+ if (resp.status === 'SUCCESS') {
+ if (resp.data.evaluationVersion === 'V1') {
+ storeSet.main.setAsyncRequest();
+ ApplicationEvaluationService.getEvaluationByApplId(getCallback, errGetCallback, [
+ ['applicationId', resp.data.applicationId]
+ ]);
+ } else if (resp.data.evaluationVersion === 'V2') {
+ storeSet.main.setAsyncRequest();
+ ApplicationEvaluationService.getEvaluationV2ByApplId(getCallback, errGetCallback, [
+ ['applicationId', resp.data.applicationId]
+ ]);
+ }
}
storeSet.main.unsetAsyncRequest();
}
- const errGetCallback = (data) => {
+ const errGetVersion = (resp) => {
if (toast.current && data.message) {
toast.current.show({
severity: 'error',
summary: '',
- detail: data.message
+ detail: resp.message
});
}
- set404FromErrorResponse(data);
+ set404FromErrorResponse(resp);
+ storeSet.main.unsetAsyncRequest();
+ }
+
+ const getCallback = (resp) => {
+ if (resp.status === 'SUCCESS') {
+ setData(getFormattedData(resp.data));
+ setMotivation(resp.data.motivation);
+ updateFlagsForSoccorso(resp.data);
+
+ if (resp.data.evaluationVersion === 'V2') {
+ setFormData(resp.data.applicationEvaluationFormResponse.content);
+ setFormId(resp.data.applicationEvaluationFormResponse.id);
+ let formDataInitial = {};
+
+ if (resp.data.applicationEvaluationFormResponse.formFields) {
+ const submitData = resp.data.applicationEvaluationFormResponse.formFields.map((o) => ({
+ fieldId: o.fieldId,
+ fieldValue: o.fieldValue
+ }));
+ formDataInitial = submitData.reduce((acc, cur) => {
+ if (cur.fieldValue) {
+ acc[cur.fieldId] = cur.fieldValue;
+ }
+ return acc;
+ }, formDataInitial);
+ }
+
+ reset();
+ setFormInitialData(formDataInitial);
+ }
+ }
+ storeSet.main.unsetAsyncRequest();
+ }
+
+ const errGetCallback = (resp) => {
+ if (toast.current && resp.message) {
+ toast.current.show({
+ severity: 'error',
+ summary: '',
+ detail: resp.message
+ });
+ }
+ set404FromErrorResponse(resp);
storeSet.main.unsetAsyncRequest();
}
@@ -167,26 +281,74 @@ const DomandaEditPreInstructor = () => {
updateFlagsForSoccorso(newData);
}
- const doSaveDraft = useCallback((doRedirect = '') => {
- const formData = {
- criteria: klona(data.criteria),
- checklist: klona(data.checklist),
- files: klona(data.files),
- evaluationDocument: klona(data.evaluationDocument.map(o => ({
- ...o,
- fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
- })
- )),
- amendmentDetails: klona(data.amendmentDetails),
- note: data.note
- }
+ const getTransformedSubmitData = () => {
+ const formValues = getValues();
+ const usedFieldsIds = pluck('id', formData);
+ return Object.keys(formValues)
+ .filter(v => usedFieldsIds.includes(v))
+ .reduce((acc, cur) => {
+ const formField = head(formData.filter(o => o.id === cur));
+ let fieldVal = formValues[cur];
- ApplicationEvaluationService.updateEvaluation(
- data.assignedApplicationId,
- formData,
- (data) => updateCallback(data, doRedirect),
- errUpdateCallback
- );
+ if (formValues[cur] && formValues[cur].toISOString) {
+ fieldVal = formatDateString(formValues[cur]);
+ }
+
+ fieldVal = isEmpty(fieldVal) ? null : fieldVal;
+ if (formField && formField.name === 'fileupload') {
+ fieldVal = is(Array, fieldVal) ? fieldVal.map(o => o.id).join(',') : null;
+ }
+ acc.push({
+ 'fieldId': cur,
+ 'fieldValue': fieldVal
+ });
+ return acc;
+ }, []);
+ }
+
+ const doSaveDraft = useCallback((doRedirect = '') => {
+ if (data.evaluationVersion === 'V1') {
+ const submitData = {
+ criteria: klona(data.criteria),
+ checklist: klona(data.checklist),
+ files: klona(data.files),
+ evaluationDocument: klona(data.evaluationDocument.map(o => ({
+ ...o,
+ fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+ })
+ )),
+ amendmentDetails: klona(data.amendmentDetails),
+ note: data.note
+ };
+
+ ApplicationEvaluationService.updateEvaluation(
+ data.assignedApplicationId,
+ submitData,
+ (data) => updateCallback(data, doRedirect),
+ errUpdateCallback
+ );
+ } else if (data.evaluationVersion === 'V2') {
+ const newFormValues = getTransformedSubmitData();
+ const submitData = {
+ formFields: newFormValues,
+ files: klona(data.files),
+ evaluationDocument: klona(data.evaluationDocument.map(o => ({
+ ...o,
+ fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+ })
+ )),
+ amendmentDetails: klona(data.amendmentDetails),
+ note: data.note
+ }
+
+ ApplicationEvaluationService.updateEvaluationV2(
+ data.assignedApplicationId,
+ formId,
+ submitData,
+ (data) => updateCallback(data, doRedirect),
+ errUpdateCallback
+ );
+ }
}, [data]);
const updateCallback = (data, doRedirect = '') => {
@@ -219,33 +381,95 @@ const DomandaEditPreInstructor = () => {
}
const doApprove = () => {
- const formData = {
- applicationStatus: 'APPROVED',
- criteria: klona(data.criteria),
- checklist: klona(data.checklist),
- files: klona(data.files),
- note: data.note,
- motivation
- }
+ if (data.evaluationVersion === 'V1') {
+ const submitData = {
+ applicationStatus: 'APPROVED',
+ criteria: klona(data.criteria),
+ checklist: klona(data.checklist),
+ files: klona(data.files),
+ note: data.note,
+ motivation
+ }
- setLoading(true);
- setIsVisibleCompleteDialog(false);
- ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
+ setLoading(true);
+ setIsVisibleCompleteDialog(false);
+ ApplicationEvaluationService.updateEvaluation(
+ data.assignedApplicationId,
+ submitData,
+ updateStatusCallback,
+ errUpdateStatusCallback
+ );
+ } else if (data.evaluationVersion === 'V2') {
+ const newFormValues = getTransformedSubmitData();
+ const submitData = {
+ formFields: newFormValues,
+ files: klona(data.files),
+ evaluationDocument: klona(data.evaluationDocument.map(o => ({
+ ...o,
+ fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+ })
+ )),
+ amendmentDetails: klona(data.amendmentDetails),
+ note: data.note,
+ motivation
+ }
+
+ setLoading(true);
+ setIsVisibleCompleteDialog(false);
+ ApplicationEvaluationService.updateEvaluationV2(
+ data.assignedApplicationId,
+ formId,
+ submitData,
+ updateStatusCallback,
+ errUpdateStatusCallback
+ );
+ }
}
const doReject = () => {
- const formData = {
- applicationStatus: 'REJECTED',
- criteria: klona(data.criteria),
- checklist: klona(data.checklist),
- files: klona(data.files),
- note: data.note,
- motivation
- }
+ if (data.evaluationVersion === 'V1') {
+ const submitData = {
+ applicationStatus: 'REJECTED',
+ criteria: klona(data.criteria),
+ checklist: klona(data.checklist),
+ files: klona(data.files),
+ note: data.note,
+ motivation
+ }
- setLoading(true);
- setIsVisibleCompleteDialog(false);
- ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
+ setLoading(true);
+ setIsVisibleCompleteDialog(false);
+ ApplicationEvaluationService.updateEvaluation(
+ data.assignedApplicationId,
+ submitData,
+ updateStatusCallback,
+ errUpdateStatusCallback
+ );
+ } else if (data.evaluationVersion === 'V2') {
+ const newFormValues = getTransformedSubmitData();
+ const submitData = {
+ formFields: newFormValues,
+ files: klona(data.files),
+ evaluationDocument: klona(data.evaluationDocument.map(o => ({
+ ...o,
+ fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+ })
+ )),
+ amendmentDetails: klona(data.amendmentDetails),
+ note: data.note,
+ motivation
+ }
+
+ setLoading(true);
+ setIsVisibleCompleteDialog(false);
+ ApplicationEvaluationService.updateEvaluationV2(
+ data.assignedApplicationId,
+ formId,
+ submitData,
+ updateStatusCallback,
+ errUpdateStatusCallback
+ );
+ }
}
const updateStatusCallback = (data) => {
@@ -432,7 +656,7 @@ const DomandaEditPreInstructor = () => {
setIsVisibleAppointmentDialog(true);
}
- const setValue = (name, value) => {
+ const setFieldValue = (name, value) => {
const newData = wrap(appointmentData).set(name, value).value();
setAppointmentData(newData);
}
@@ -506,10 +730,152 @@ const DomandaEditPreInstructor = () => {
// TODO
}
- const evaluationShouldBeBlocked = (data = {}) => {
+ const evaluationBlockedForUser = (data = {}) => {
const userData = storeGet.main.userData()
return isAsyncRequest || userData.id !== data.assignedUserId;
}
+
+ const shouldDisableNewSoccorso = () => {
+ if (data.evaluationVersion === 'V1') {
+ return !allFilesRated || !atLeastOneChecked;
+ } else if (data.evaluationVersion === 'V2') {
+ return !allFilesRated || !atLeastOneChecked;
+ } else {
+ return true;
+ }
+ }
+
+ const actionBtns = () => {
+ return
+ {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
+ ?
+ }
+
+ useEffect(() => {
+ let updatedFormValues = klona(formValues);
+ let context = {};
+
+ // eslint-disable-next-line array-callback-return
+ formData.map((o) => {
+ const variable = head(o.settings.filter(o => o.name === 'variable'));
+ const formula = head(o.settings.filter(o => o.name === 'formula'));
+
+ if (formula && !isEmpty(formula.value)) {
+ context = getTokens(formula.value)
+ .filter(v => !['false', 'null', 'true'].includes(v))
+ .reduce((acc, cur) => {
+ acc[cur] = isNil(context[cur]) ? 0 : parseCommaDecimal(context[cur]);
+ return acc;
+ }, context);
+
+ const mathFormula = renderWithDataVars(formula.value, context);
+ try {
+ updatedFormValues[o.id] = evaluate(mathFormula);
+ } catch (e) {
+ console.log('Error in math formula: "', mathFormula, '"', e.message);
+ updatedFormValues[o.id] = 0;
+ }
+ }
+
+ if (variable && !isEmpty(variable.value)) {
+ context[variable.value[0]] = 'criteria_table' === o.name
+ ? pathOr(0, [o.id, 'total'], updatedFormValues)
+ : pathOr(0, [o.id], updatedFormValues);
+ }
+ });
+
+ if (!isEmpty(updatedFormValues) && !equal(updatedFormValues, formValues)) {
+ reset(updatedFormValues);
+ }
+
+ updateFlagsForSoccorso(data);
+ }, [formValues]);
+
+ useEffect(() => {
+ if (formInitialData) {
+ //reset();
+ Object.keys(formInitialData).map(k => setValue(k, formInitialData[k]));
+ trigger();
+ }
+ }, [formInitialData]);
useEffect(() => {
const maxScore = pathOr(0, ['minScore'], data);
@@ -524,9 +890,7 @@ const DomandaEditPreInstructor = () => {
const entityId = !isNaN(parsed) ? parsed : 0;
storeSet.main.setAsyncRequest();
- ApplicationEvaluationService.getEvaluationByApplId(getCallback, errGetCallback, [
- ['applicationId', entityId]
- ]);
+ ApplicationEvaluationService.getEvaluationVersionByApplId(entityId, getVersion, errGetVersion);
AmendmentsService.getSoccorsoByApplId(entityId, getAmendmentsCallback, errGetAmendmentsCallback, [
['statuses', 'AWAITING']
]);
@@ -555,64 +919,18 @@ const DomandaEditPreInstructor = () => {
{!isAsyncRequest && !isEmpty(data)
?
-
-
- {__('ID domanda', 'gepafin')}
- {data.applicationId}
-
-
- {__('Protocollo', 'gepafin')}
- {data.protocolNumber}
-
- {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
- ?
- {__('NDG', 'gepafin')}
- {data.ndg}
-
: null}
- {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
- ?
- {__('Appuntamento', 'gepafin')}
- {data.appointmentId}
-
: null}
-
- {__('Bando', 'gepafin')}
- {data.callName}
-
-
- {__('Referente Aziendale', 'gepafin')}
- {data.beneficiary}
-
-
- {__('Azienda Beneficiaria', 'gepafin')}
- {data.companyName}
-
-
- {__('Data ricezione', 'gepafin')}
- {getDateTimeFromISOstring(data.submissionDate)}
-
-
- {__('Data assegnazione', 'gepafin')}
- {getDateTimeFromISOstring(data.assignedAt)}
-
-
- {__('Scadenza Valutazione', 'gepafin')}
- {getDateFromISOstring(data.evaluationEndDate)}
-
-
- {__('Stato', 'gepafin')}
- {getBandoLabel(data.applicationStatus)}
-
+
+
+
+ {__('Azioni rapide', 'gepafin')}
-
{__('Scarica documenti della domanda', 'gepafin')}
-
-
-
-
-
+ {actionBtns()}
{__('Documenti aggiuntivi', 'gepafin')}
{
data,
['evaluationDocument']
)}
- shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
+ shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
sourceId={data.assignedApplicationId}
sourceName="evaluation"/>
-
-
{__('Checklist Valutazione', 'gepafin')}
-
-
-
{__('Lista', 'gepafin')}
-
-
- {data.checklist.map((o, i) =>
- updateEvaluationValue(
- e.checked,
- ['checklist', i, 'valid']
- )}
- checked={o.valid}>
-
-
)}
-
-
-
-
{__('Note', 'gepafin')}
-
- updateEvaluationValue(
- e.htmlValue,
- ['note']
- )}
- style={{ height: 80 * 3, width: '100%' }}
- />
-
-
-
-
{__('Documenti allegati', 'gepafin')}
-
+ {__('Documenti allegati', 'gepafin')}
+ {!isEmpty(data.files)
+ ? shouldDisableField(name) || evaluationShouldBeBlocked(data)}
+ shouldDisableFieldFn={(name) => shouldDisableField(name) || evaluationBlockedForUser(data)}
name="files"
ndg={data.ndg}
applicationId={id}/>
+ : {__('Nessun documento allegato', 'gepafin')}
}
+
+ : null}
+
+ {data.evaluationVersion === 'V2'
+ ?
+ : null}
+
+ {data.evaluationVersion === 'V1'
+ ?
+
{__('Checklist Valutazione', 'gepafin')}
+
+
+
{__('Lista', 'gepafin')}
+
+
+ {data.checklist.map((o, i) =>
+ updateEvaluationValue(
+ e.checked,
+ ['checklist', i, 'valid']
+ )}
+ checked={o.valid}>
+
+
)}
+
+
+
+
{__('Note', 'gepafin')}
+
+ updateEvaluationValue(
+ e.htmlValue,
+ ['note']
+ )}
+ style={{ height: 80 * 3, width: '100%' }}
+ />
+
+
+
+
{__('Documenti allegati', 'gepafin')}
+ {!isEmpty(data.files)
+ ?
shouldDisableField(name) || evaluationBlockedForUser(data)}
+ name="files"
+ ndg={data.ndg}
+ applicationId={id}/>
+ : {__('Nessun documento allegato', 'gepafin')}
}
+
-
+ : null}
{!isEmpty(data.amendmentDetails)
?
@@ -681,90 +1094,92 @@ const DomandaEditPreInstructor = () => {
shouldDisableField(name) || evaluationShouldBeBlocked(data)}
+ shouldDisableFieldFn={(name) => shouldDisableField(name) || evaluationBlockedForUser(data)}
name="amendmentDetails"
ndg={data.ndg}
applicationId={id}/>
: null}
-
-
{__('Punteggi di valutazione', 'gepafin')}
- {data.criteria
- ?
-
-
- | {__('Parametro', 'gepafin')} |
- {__('Punteggio', 'gepafin')} |
- {__('Stato', 'gepafin')} |
-
-
-
- {data.criteria.map((o, i) =>
- | {o.label} |
-
-
- updateEvaluationValue(
- e.value,
- ['criteria', i, 'score'],
- o.criteria
- )}/>
-
+ {data.evaluationVersion === 'V1'
+ ?
+ {__('Punteggi di valutazione', 'gepafin')}
+ {data.criteria
+ ?
+
+
+ | {__('Parametro', 'gepafin')} |
+ {__('Punteggio', 'gepafin')} |
+ {__('Stato', 'gepafin')} |
+
+
+
+ {data.criteria.map((o, i) =>
+ | {o.label} |
+
+
+ updateEvaluationValue(
+ e.value,
+ ['criteria', i, 'score'],
+ o.criteria
+ )}/>
+
/ {o.maxScore}
-
- |
-
-
- {!isEmpty(o.criteriaMappedFields)
- ?
- |
- )}
-
- | {__('Punteggio:', 'gepafin')} |
- {sum(data.criteria.map(o => o.score))} |
-
- {isAdmissible
- ? : null}
- {!isAdmissible
- ? : null}
- |
-
-
-
-
- | {sprintf(__('Punteggio minimo per l\'ammissione: %d'), data.minScore)} |
-
-
- : null}
- |
+
+
+ {!isEmpty(o.criteriaMappedFields)
+ ?
+ |
+
)}
+
+ | {__('Punteggio:', 'gepafin')} |
+ {sum(data.criteria.map(o => o.score))} |
+
+ {isAdmissible
+ ? : null}
+ {!isAdmissible
+ ? : null}
+ |
+
+
+
+
+ | {sprintf(__('Punteggio minimo per l\'ammissione: %d'), data.minScore)} |
+
+
+
: null}
+
+ : null}
@@ -773,86 +1188,7 @@ const DomandaEditPreInstructor = () => {
-
- {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
- ?
+ {actionBtns()}
diff --git a/src/pages/Domande/components/AllDomandeTable/index.js b/src/pages/Domande/components/AllDomandeTable/index.js
index 6159a66..61ade5c 100644
--- a/src/pages/Domande/components/AllDomandeTable/index.js
+++ b/src/pages/Domande/components/AllDomandeTable/index.js
@@ -150,7 +150,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
return (
- {
diff --git a/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js b/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js
index 3b0e13a..f0c29a8 100644
--- a/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js
+++ b/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import { __ } from '@wordpress/i18n';
import { is, uniq } from 'ramda';
-import { Link, useLocation } from 'react-router-dom';
+import { Link } from 'react-router-dom';
// api
import ApplicationService from '../../../../service/application-service';
@@ -29,7 +29,6 @@ const AllDomandeArchiveTable = ({ updaterString = '' }) => {
const [filters, setFilters] = useState(null);
const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
const [statuses, setStatuses] = useState([]);
- const location = useLocation();
useEffect(() => {
setLocalAsyncRequest(true);
@@ -141,7 +140,7 @@ const AllDomandeArchiveTable = ({ updaterString = '' }) => {
return (
-
{
+//import AllDomandeArchiveTable from './components/AllDomandeArchiveTable';
+import PreInstructorDomandeTable from '../DashboardPreInstructor/components/PreInstructorDomandeTable';
+const DomandeArchive = () => {
return (
@@ -15,11 +15,11 @@ const Domande = () => {
-
{__('Domande pubblicate', 'gepafin')}
-
+
{__('Domande completate', 'gepafin')}
+
)
}
-export default Domande;
\ No newline at end of file
+export default DomandeArchive;
\ No newline at end of file
diff --git a/src/pages/DomandeArchivePreInstructor/index.js b/src/pages/DomandeArchivePreInstructor/index.js
new file mode 100644
index 0000000..81b9a78
--- /dev/null
+++ b/src/pages/DomandeArchivePreInstructor/index.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+
+// store
+import { useStore } from '../../store';
+
+// components
+import PreInstructorDomandeTable from '../DashboardPreInstructor/components/PreInstructorDomandeTable';
+
+const DomandeArchivePreInstructor = () => {
+ const userData = useStore().main.userData();
+
+ return (
+
+
+
{__('Archivio domande', 'gepafin')}
+
+
+
+
+
+
{__('Domande completate', 'gepafin')}
+
+
+
+ )
+}
+
+export default DomandeArchivePreInstructor;
\ No newline at end of file
diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
index 18ceb27..39f0655 100644
--- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
+++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
@@ -157,7 +157,7 @@ const BeneficiarioDomandeTable = () => {
return (
-
{
+const DomandeBeneficiario = () => {
const chosenCompanyId = useStore().main.chosenCompanyId();
const companies = useStore().main.companies();
const company = head(companies.filter(o => o.id === chosenCompanyId));
@@ -29,4 +29,4 @@ const DomandePreInstructor = () => {
)
}
-export default DomandePreInstructor;
\ No newline at end of file
+export default DomandeBeneficiario;
\ No newline at end of file
diff --git a/src/pages/DomandeInstructorManager/index.js b/src/pages/DomandeInstructorManager/index.js
index b593398..31ee817 100644
--- a/src/pages/DomandeInstructorManager/index.js
+++ b/src/pages/DomandeInstructorManager/index.js
@@ -20,6 +20,7 @@ import { classNames } from 'primereact/utils';
import { Dropdown } from 'primereact/dropdown';
import { Dialog } from 'primereact/dialog';
import { Button } from 'primereact/button';
+import DashboardService from '../../service/dashboard-service';
const DomandeInstructorManager = () => {
const [loading, setLoading] = useState(false);
@@ -30,6 +31,7 @@ const DomandeInstructorManager = () => {
const [chosenApplication, setChosenApplication] = useState(0);
const [updaterString, setUpdaterString] = useState('');
const toast = useRef(null);
+ const [mainStats, setMainStats] = useState({});
const getRolesCallback = (data) => {
if (data.status === 'SUCCESS') {
@@ -123,6 +125,18 @@ const DomandeInstructorManager = () => {
storeSet.main.unsetAsyncRequest();
}
+ const getStats = (data) => {
+ if (data.status === 'SUCCESS') {
+ setMainStats(data.data);
+ }
+ }
+
+ const errGetStats = () => {}
+
+ useEffect(() => {
+ DashboardService.getEvaluationsStats(getStats, errGetStats);
+ }, []);
+
useEffect(() => {
if (roleIds.length > 0) {
setLoading(true);
@@ -140,22 +154,74 @@ const DomandeInstructorManager = () => {
return(
-
{__('Domande da valutare', 'gepafin')}
+ {__('Gestione domande', 'gepafin')}
-
-
-
-
-
{__('Domande pubblicate', 'gepafin')}
+
{__('Da assegnare', 'gepafin')}
+
+
+
+
{__('In lavorazione', 'gepafin')}
+
+
+
+ {/*
+
+
+
{__('Riepilogo', 'gepafin')}
+
+
+ {__('Totale domande', 'gepafin')}
+
+
+
+ {__('In soccorso', 'gepafin')}
+
+
+
+ {__('In valutazione', 'gepafin')}
+
+
+
+ {__('Completate', 'gepafin')}
+
+
+
+ {__('Tempo medio di valutazione', 'gepafin')}
+
+
+
+ {__('Domande in scadenza (48h)', 'gepafin')}
+
+
+
+
*/}
+