diff --git a/src/helpers/getBandoLabel.js b/src/helpers/getBandoLabel.js
index 16cf480..bc4d043 100644
--- a/src/helpers/getBandoLabel.js
+++ b/src/helpers/getBandoLabel.js
@@ -78,10 +78,10 @@ const getBandoLabel = (status) => {
return __('Respinto Tec-Fin', 'gepafin');
case 'AWAITING_CONTRACT':
- return __('Awaiting contract', 'gepafin');
+ return __('In attesa di contratto', 'gepafin');
case 'CONTRACT_SIGNED':
- return __('Contract signed', 'gepafin');
+ return __('Contratto firmato', 'gepafin');
default:
return '';
diff --git a/src/pages/DashboardBeneficiario/index.js b/src/pages/DashboardBeneficiario/index.js
index aff4f89..eae7547 100644
--- a/src/pages/DashboardBeneficiario/index.js
+++ b/src/pages/DashboardBeneficiario/index.js
@@ -132,7 +132,7 @@ const DashboardBeneficiario = () => {
const getUploadApplicationContractCallback = (data) => {
if (data.status === 'SUCCESS') {
- //setData(getFormattedData(data.data));
+ setContractsData(null);
if (toast.current && data.message) {
toast.current.show({
severity: 'success',
@@ -185,7 +185,7 @@ const DashboardBeneficiario = () => {
- {__('You must upload contract for applications:', 'gepafin')}
+ {__('Contratti in attesa:', 'gepafin')}
{contractsData.map(o => -
@@ -313,7 +313,7 @@ const DashboardBeneficiario = () => {
style={{ maxWidth: '600px', width: '100%' }}
onHide={hideContractDialog}>
-
The administration requires you to download these documents:
+
Scarica il contratto:
{contractFormData?.instructorDocuments
? contractFormData.instructorDocuments.map(o => -
@@ -321,18 +321,18 @@ const DashboardBeneficiario = () => {
)
: null}
-
Sign them digitally and upload them back in the form below:
+
Firmalo digitalmente e ricaricalo
o.code).join(',')}
+ accept='.p7m,application/pkcs7-mime,application/x-pkcs7-mime'
maxFileSize={defaultMaxFileSize}
auto={false}
customUpload={true}
diff --git a/src/pages/DashboardBeneficiarioConfidi/index.js b/src/pages/DashboardBeneficiarioConfidi/index.js
index 7b8ae7f..d71d949 100644
--- a/src/pages/DashboardBeneficiarioConfidi/index.js
+++ b/src/pages/DashboardBeneficiarioConfidi/index.js
@@ -23,7 +23,7 @@ import MyLatestSubmissionsTableAsync from '../DashboardBeneficiario/components/M
import LatestBandiBeneficiarioTableAsync from '../DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync';
import { classNames } from 'primereact/utils';
import { FileUpload } from 'primereact/fileupload';
-import { defaultMaxFileSize, mimeTypes } from '../../configData';
+import { defaultMaxFileSize } from '../../configData';
import { Dialog } from 'primereact/dialog';
import { Toast } from 'primereact/toast';
@@ -185,7 +185,7 @@ const DashboardBeneficiarioConfidi = () => {
- {__('You must upload contract for applications:', 'gepafin')}
+ {__('Contratti in attesa:', 'gepafin')}
{contractsData.map(o => -
@@ -313,7 +313,7 @@ const DashboardBeneficiarioConfidi = () => {
style={{ maxWidth: '600px', width: '100%' }}
onHide={hideContractDialog}>
-
The administration requires you to download these documents:
+
Scarica il contratto:
{contractFormData?.instructorDocuments
? contractFormData.instructorDocuments.map(o => -
@@ -321,18 +321,18 @@ const DashboardBeneficiarioConfidi = () => {
)
: null}
-
Sign them digitally and upload them back in the form below:
+
Firmalo digitalmente e ricaricalo
o.code).join(',')}
+ accept='.p7m,application/pkcs7-mime,application/x-pkcs7-mime'
maxFileSize={defaultMaxFileSize}
auto={false}
customUpload={true}
diff --git a/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js b/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js
index ef078c0..289dfa5 100644
--- a/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js
+++ b/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js
@@ -31,9 +31,15 @@ import SoccorsoResendEmails from '../../../SoccorsoEditPreInstructor/components/
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
-const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [],
- applicationStatuses = ['EVALUATION', 'SOCCORSO', 'NDG', 'APPOINTMENT', 'ADMISSIBLE',
- 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION']}) => {
+const DomandeTablePreInstructorAsync = ({
+ userId = null,
+ statuses = [],
+ applicationStatuses = [
+ 'EVALUATION', 'SOCCORSO', 'NDG', 'APPOINTMENT', 'ADMISSIBLE',
+ 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION',
+ 'AWAITING_CONTRACT', 'CONTRACT_SIGNED'
+ ]
+ }) => {
const navigate = useNavigate();
const userData = useStoreValue('userData');
const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
@@ -244,7 +250,7 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [],
AssignedApplicationService.assignApplicationPaginated(paginationQuery, getCallback, errGetCallbacks);
}
}, [lazyState]);
-
+
return (
+ style={{ minWidth: '8rem' }}/>
{
const getUploadApplicationContractCallback = (data) => {
if (data.status === 'SUCCESS') {
- //setData(getFormattedData(data.data));
+ setData((prev) => ({
+ ...prev,
+ applicationStatus: 'AWAITING_CONTRACT',
+ contract: data.data
+ }));
if (toast.current && data.message) {
toast.current.show({
severity: 'success',
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 1a07746..f8fda2d 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -1078,7 +1078,11 @@ const DomandaEditPreInstructor = () => {
const getUploadApplicationContractCallback = (data) => {
if (data.status === 'SUCCESS') {
- //setData(getFormattedData(data.data));
+ setData((prev) => ({
+ ...prev,
+ applicationStatus: 'AWAITING_CONTRACT',
+ contract: data.data
+ }));
if (toast.current && data.message) {
toast.current.show({
severity: 'success',
diff --git a/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js b/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js
index e1e5676..621cf41 100644
--- a/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js
+++ b/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js
@@ -44,7 +44,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
companyName: { value: null, matchMode: 'contains' },
submissionDate: { value: null, matchMode: 'dateIs' },
assignedUserName: { value: null, matchMode: 'equals' },
- status: { value: null, matchMode: 'equals' }
+ applicationStatus: { value: null, matchMode: 'equals' }
}
});
@@ -122,13 +122,14 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };
if (e.value) {
- filters['status'] = { value: e.value, matchMode: 'equals' };
+ filters['applicationStatus'] = { value: e.value, matchMode: 'equals' };
} else {
- delete filters['status'];
+ delete filters['applicationStatus'];
}
setLazyState({ ...lazyState, filters, first: 0 });
}}
- itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
+ itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+ className="p-column-filter"/>;
};
const dateFilterTemplate = (options) => {
@@ -182,7 +183,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
filterMatchModeOptions={translationStrings.dateFilterOptions}
style={{ minWidth: '8rem' }}
body={dateAppliedBodyTemplate}/>
- {
)