diff --git a/src/helpers/getBandoLabel.js b/src/helpers/getBandoLabel.js
index 0439b31..acd7edc 100644
--- a/src/helpers/getBandoLabel.js
+++ b/src/helpers/getBandoLabel.js
@@ -14,6 +14,9 @@ const getBandoLabel = (status) => {
case 'READY_TO_PUBLISH':
return __('Pronto', 'gepafin');
+ case 'READY':
+ return __('Pronto', 'gepafin');
+
case 'DRAFT':
return __('Bozza', 'gepafin');
@@ -23,6 +26,12 @@ const getBandoLabel = (status) => {
case 'AWAIT':
return __('In attesa', 'gepafin');
+ case 'ASSIGNED':
+ return __('Assegnato', 'gepafin');
+
+ case 'EVALUATION':
+ return __('Valutazione', 'gepafin');
+
case 'EXPIRED':
return __('Scaduto', 'gepafin');
diff --git a/src/helpers/getBandoSeverity.js b/src/helpers/getBandoSeverity.js
index e2232ee..d7c62d2 100644
--- a/src/helpers/getBandoSeverity.js
+++ b/src/helpers/getBandoSeverity.js
@@ -12,6 +12,9 @@ const getBandoSeverity = (status) => {
case 'READY_TO_PUBLISH':
return 'info';
+ case 'READY':
+ return 'info';
+
case 'DRAFT':
return 'warning';
@@ -21,6 +24,12 @@ const getBandoSeverity = (status) => {
case 'AWAIT':
return 'warning';
+ case 'ASSIGNED':
+ return 'warning';
+
+ case 'EVALUATION':
+ return 'info';
+
case 'EXPIRED':
return 'closed';
diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js
index e9259dc..12e6982 100644
--- a/src/pages/BandoApplication/index.js
+++ b/src/pages/BandoApplication/index.js
@@ -604,7 +604,7 @@ const BandoApplication = () => {
iconPos="right"/>
: null}
- {['AWAIT', 'READY', 'SUBMIT', 'EVALUATION'].includes(applicationStatus)
+ {'DRAFT' !== applicationStatus
?
)
}
-export default DashboardInstructor;
\ No newline at end of file
+export default DashboardPreInstructor;
\ No newline at end of file
diff --git a/src/pages/Evaluations/index.js b/src/pages/Evaluations/index.js
index f5913b7..480b27e 100644
--- a/src/pages/Evaluations/index.js
+++ b/src/pages/Evaluations/index.js
@@ -2,7 +2,7 @@ import React from 'react';
import { __ } from '@wordpress/i18n';
// components
-import MyEvaluationsTable from '../DashboardInstructor/components/MyEvaluationsTable';
+import PreInstructorDomandeTable from '../DashboardPreInstructor/components/PreInstructorDomandeTable';
const Bandi = () => {
return(
@@ -14,7 +14,7 @@ const Bandi = () => {
)
diff --git a/src/routes.js b/src/routes.js
index cfcc641..a38cce1 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -25,7 +25,7 @@ import ProfileCompany from './pages/ProfileCompany';
import Users from './pages/Users';
import AddCompany from './pages/AddCompany';
import ResetPassword from './pages/ResetPassword';
-import DashboardInstructor from './pages/DashboardInstructor';
+import DashboardPreInstructor from './pages/DashboardPreInstructor';
import ProfileBeneficiario from './pages/ProfileBeneficiario';
import Evaluations from './pages/Evaluations';
import EvaluationEdit from './pages/EvaluationEdit';
@@ -39,7 +39,7 @@ const routes = ({ role, chosenCompanyId }) => {
{'ROLE_SUPER_ADMIN' === role ? : null}
{'ROLE_BENEFICIARY' === role ? : null}
- {'ROLE_PRE_INSTRUCTOR' === role ? : null}
+ {'ROLE_PRE_INSTRUCTOR' === role ? : null}
}/>
{'ROLE_SUPER_ADMIN' === role ? : null}
diff --git a/src/service/assigned-application-service.js b/src/service/assigned-application-service.js
index 65c9048..1662fe7 100644
--- a/src/service/assigned-application-service.js
+++ b/src/service/assigned-application-service.js
@@ -4,7 +4,7 @@ const API_BASE_URL = process.env.REACT_APP_API_EXECUTION_ADDRESS;
export default class AssignedApplicationService {
- static getAssignedApplications = (id, callback, errCallback, queryParams) => {
+ static getAssignedApplications = (callback, errCallback, queryParams) => {
NetworkService.get(`${API_BASE_URL}/assignedApplication`, callback, errCallback, queryParams);
};