diff --git a/src/pages/Dashboard/index.js b/src/pages/Dashboard/index.js index 48c47d9..39f324f 100644 --- a/src/pages/Dashboard/index.js +++ b/src/pages/Dashboard/index.js @@ -8,7 +8,6 @@ import NumberFlow from '@number-flow/react'; import DashboardService from '../../service/dashboard-service'; // components -import LatestBandiTable from './components/LatestBandiTable'; import { Button } from 'primereact/button'; import AllDomandeTable from '../Domande/components/AllDomandeTable'; import DraftApplicationsTable from './components/DraftApplicationsTable'; diff --git a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js index 6089454..fad097a 100644 --- a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js +++ b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js @@ -1,8 +1,6 @@ import React, { useState, useEffect } from 'react'; import { __ } from '@wordpress/i18n'; import { is, uniq } from 'ramda'; -import copy from 'copy-to-clipboard'; -import { Link } from 'react-router-dom'; // store import { useStore } from '../../../../store'; @@ -24,7 +22,6 @@ import { Button } from 'primereact/button'; import { Calendar } from 'primereact/calendar'; import { Tag } from 'primereact/tag'; import ProperBandoLabel from '../../../../components/ProperBandoLabel'; -import translationStrings from '../../../../translationStringsForComponents'; import { confirmPopup, ConfirmPopup } from 'primereact/confirmpopup'; const DocumentsTable = ({ type, reload = 0 }) => { diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js index 64d4020..109a5f5 100644 --- a/src/pages/DomandaEditPreInstructor/index.js +++ b/src/pages/DomandaEditPreInstructor/index.js @@ -735,7 +735,57 @@ const DomandaEditPreInstructor = () => { } const doMakeAdmisible = () => { - // TODO + storeSet.main.setAsyncRequest(); + //doSaveDraft(); + + setTimeout(() => { + const submitData = { + applicationsStatus: 'ADMISSIBLE', + } + if (data.evaluationVersion === 'V1') { + ApplicationEvaluationService.updateEvaluation( + data.assignedApplicationId, + submitData, + updateCallback, + errUpdateCallback + ); + } else if (data.evaluationVersion === 'V2') { + ApplicationEvaluationService.updateEvaluationV2( + data.assignedApplicationId, + formId, + submitData, + updateCallback, + errUpdateCallback + ); + } + }, 100); + } + + const doPassTechnicalEvaluation = () => { + storeSet.main.setAsyncRequest(); + doSaveDraft(); + + setTimeout(() => { + const submitData = { + applicationsStatus: 'TECHNICAL_EVALUATION', + } + if (data.evaluationVersion === 'V1') { + ApplicationEvaluationService.updateEvaluation( + data.assignedApplicationId, + submitData, + updateCallback, + errUpdateCallback + ); + } else if (data.evaluationVersion === 'V2') { + ApplicationEvaluationService.updateEvaluationV2( + data.assignedApplicationId, + formId, + submitData, + updateCallback, + errUpdateCallback + ); + } + }, 100); } const evaluationBlockedForUser = (data = {}) => { @@ -758,8 +808,8 @@ const DomandaEditPreInstructor = () => { {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus) ?