diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
index 596643e..ca40eda 100644
--- a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
@@ -33,7 +33,7 @@ const LatestBandiTable = () => {
useEffect(() => {
setLoading(true);
- const role = storeGet('getRole')
+ const role = storeGet('getRole');
if (role === 'ROLE_CONFIDI') {
BandoService.getBandi(getCallback, errGetCallbacks, [
diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js
index 2a29a85..bc189c9 100644
--- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js
+++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js
@@ -31,7 +31,6 @@ import { ProgressBar } from 'primereact/progressbar';
const MyLatestSubmissionsTableAsync = () => {
const chosenCompanyId = useStoreValue('chosenCompanyId');
- const companies = useStoreValue('companies');
const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
const [items, setItems] = useState(null);
const [totalRecordsNum, setTotalRecordsNum] = useState(0);
@@ -194,13 +193,15 @@ const MyLatestSubmissionsTableAsync = () => {
};
useEffect(() => {
- setLocalAsyncRequest(true);
- const paginationQuery = getPaginationQuery();
+ if (chosenCompanyId && chosenCompanyId !== 0) {
+ setLocalAsyncRequest(true);
+ const paginationQuery = getPaginationQuery();
- ApplicationService.getApplicationsPaginated(paginationQuery, getCallback, errGetCallbacks, [
- ['companyId', chosenCompanyId]
- ]);
- }, [lazyState, chosenCompanyId, companies]);
+ ApplicationService.getApplicationsPaginated(paginationQuery, getCallback, errGetCallbacks, [
+ ['companyId', chosenCompanyId]
+ ]);
+ }
+ }, [lazyState, chosenCompanyId]);
return (
diff --git a/src/pages/DashboardBeneficiarioConfidi/index.js b/src/pages/DashboardBeneficiarioConfidi/index.js
index 69144d4..7bd03bb 100644
--- a/src/pages/DashboardBeneficiarioConfidi/index.js
+++ b/src/pages/DashboardBeneficiarioConfidi/index.js
@@ -14,7 +14,7 @@ import DashboardService from '../../service/dashboard-service';
import { Button } from 'primereact/button';
import ErrorBoundary from '../../components/ErrorBoundary';
import MyLatestSubmissionsTableAsync from '../DashboardBeneficiario/components/MyLatestSubmissionsTableAsync';
-import LatestBandiTable from '../DashboardBeneficiario/components/LatestBandiTable';
+import LatestBandiBeneficiarioTableAsync from '../DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync';
const DashboardBeneficiarioConfidi = () => {
const navigate = useNavigate();
@@ -108,7 +108,7 @@ const DashboardBeneficiarioConfidi = () => {
{__('Bandi disponibili', 'gepafin')}
-
+
diff --git a/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js
index b15b0db..d801d1d 100644
--- a/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js
+++ b/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js
@@ -26,6 +26,7 @@ import { Calendar } from 'primereact/calendar';
import { Button } from 'primereact/button';
import { Link, useNavigate } from 'react-router-dom';
import getQueryParamsForPaginatedEndpoint from '../../../../helpers/getQueryParamsForPaginatedEndpoint';
+import SoccorsoResendEmails from '../../../SoccorsoEditPreInstructor/components/SoccorsoResendEmails';
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
@@ -73,7 +74,8 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
const getCallback = (resp) => {
if (resp.status === 'SUCCESS') {
- const { body, totalRecords,
+ const {
+ body, totalRecords,
//currentPage, totalPages, pageSize
} = resp.data;
setTotalRecordsNum(totalRecords);
@@ -114,7 +116,8 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
}
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) => {
@@ -130,22 +133,43 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
return getFormattedDateString(rowData.evaluationEndDate);
};
+ const updateRowData = useCallback((id, updateResponse) => {
+ const newItems = items.map((o) => {
+ if (o.id === id) {
+ o.emailSendResponse = updateResponse;
+ }
+ return o;
+ })
+ setItems(newItems);
+ }, [items]);
+
const actionsBodyTemplate = (rowData) => {
if (rowData.status === 'AWAITING') {
- return
-
-
{__('Note', 'gepafin')}
-
- updateEvaluationValue(
- e.htmlValue,
- ['note']
- )}
- style={{ height: 80 * 3, width: '100%' }}
- />
-
{__('Documenti allegati', 'gepafin')}
@@ -1241,6 +1281,7 @@ const DomandaEditInstructorManager = () => {
{actionBtns()}
+ {auxActions()}
-
-
{__('Documenti allegati', 'gepafin')}
@@ -1243,6 +1283,7 @@ const DomandaEditPreInstructor = () => {
{actionBtns()}
+ {auxActions()}
{
}
const validateCallback = (data) => {
- //console.log('login validateCallback', data)
if (data.status === 'SUCCESS') {
storeSet('setAuthData', {
token: data.data.token,
@@ -107,7 +106,7 @@ const Login = () => {
useEffect(() => {
const temp_token = searchParams.get('temp_token');
- //console.log('login temp_token', temp_token);
+
if (!isNil(temp_token) && !isEmpty(temp_token)) {
errorMsgs.current.clear();
AuthenticationService.validateExistingUser(temp_token, validateCallback, validateError);
diff --git a/src/pages/SoccorsoAddPreInstructor/index.js b/src/pages/SoccorsoAddPreInstructor/index.js
index 6b6c78b..ac114b0 100644
--- a/src/pages/SoccorsoAddPreInstructor/index.js
+++ b/src/pages/SoccorsoAddPreInstructor/index.js
@@ -32,7 +32,7 @@ const SoccorsoAddPreInstructor = () => {
const [data, setData] = useState({});
const [evaluationId, setEvaluationId] = useState(0);
const [formData, setFormData] = useState({});
- const [isVisibleConfirmDialog, setIsVisibleConfirmDialog] = useState(false)
+ const [isVisibleConfirmDialog, setIsVisibleConfirmDialog] = useState(false);
const toast = useRef(null);
const goToEvaluationPage = () => {
diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js
index 5b08a35..3345ecd 100644
--- a/src/pages/SoccorsoEditInstructorManager/index.js
+++ b/src/pages/SoccorsoEditInstructorManager/index.js
@@ -1,7 +1,7 @@
-import React, { useState, useEffect, useRef, useMemo } from 'react';
+import React, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
import { useNavigate, useParams } from 'react-router-dom';
-import { is, isEmpty } from 'ramda';
+import { is, isEmpty, isNil, pathOr } from 'ramda';
import { wrap } from 'object-path-immutable';
import { klona } from 'klona';
import { useForm } from 'react-hook-form';
@@ -28,6 +28,7 @@ import FormField from '../../components/FormField';
import { Editor } from 'primereact/editor';
import { InputNumber } from 'primereact/inputnumber';
import SoccorsoComunications from '../SoccorsoEditPreInstructor/components/SoccorsoComunications';
+import SoccorsoResendEmails from '../SoccorsoEditPreInstructor/components/SoccorsoResendEmails';
const SoccorsoEditInstructorManager = () => {
@@ -43,6 +44,7 @@ const SoccorsoEditInstructorManager = () => {
const [internalNote, setInternalNote] = useState('');
const toast = useRef(null);
const [formInitialData, setFormInitialData] = useState({});
+ const emailSendResponse = pathOr([], ['emailSendResponse'], data);
const {
control,
handleSubmit,
@@ -346,6 +348,11 @@ const SoccorsoEditInstructorManager = () => {
setIsLoadingReminding(false);
}
+ const updateEmailSendResponses = useCallback((newEmailData) => {
+ const newData = wrap(data).set(['emailSendResponse'], newEmailData).value();
+ setData(newData);
+ }, [data]);
+
useEffect(() => {
if (formInitialData) {
Object.keys(formInitialData).map(k => setValue(k, formInitialData[k]));
@@ -506,7 +513,8 @@ const SoccorsoEditInstructorManager = () => {
{
label={__('Chiudi Soccorso Istruttorio', 'gepafin')}
icon="pi pi-times" iconPos="right"/>
+