- added updating status for initiating evaluation process;

- fixed issues with displaying and calcuating decimals in appl form;

src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js

@@ -1,11 +1,8 @@
 import React, { useState, useEffect} from 'react';
 import { __ } from '@wordpress/i18n';
-import { is, uniq } from 'ramda';
+import { is, isNil, uniq } from 'ramda';
 import { Link } from 'react-router-dom';
 
-// store
-import { storeGet } from '../../../../store';
-
 // api
 import AmendmentsService from '../../../../service/amendments-service';
 
@@ -26,17 +23,25 @@ import { Tag } from 'primereact/tag';
 import translationStrings from '../../../../translationStringsForComponents';
 
 
-const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
+const PreInstructorSoccorsiTable = ({ userId = null }) => {
     const [items, setItems] = useState(null);
     const [filters, setFilters] = useState(null);
     const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
     const [statuses, setStatuses] = useState([]);
 
     useEffect(() => {
-        const userData = storeGet.main.userData()
-        setLocalAsyncRequest(true);
-        AmendmentsService.getSoccorsoByPreInstructorId(userData.id, getCallback, errGetCallbacks);
-    }, []);
+        if (!isNil(userId)) {
+            setLocalAsyncRequest(true);
+
+            if (userId === 0) {
+                AmendmentsService.getSoccorsi(getCallback, errGetCallbacks);
+            } else {
+                AmendmentsService.getSoccorsi(getCallback, errGetCallbacks, [
+                    ['userId', userId]
+                ]);
+            }
+        }
+    }, [userId]);
 
     const getCallback = (data) => {
         if (data.status === 'SUCCESS') {

src/pages/SoccorsoIstruttorioPreInstructor/index.js

@@ -1,14 +1,18 @@
 import React, { useEffect, useState } from 'react';
 import { __ } from '@wordpress/i18n';
+import { pathOr } from 'ramda';
+import NumberFlow from '@number-flow/react';
+
+// store
+import { useStore } from '../../store';
 
 // components
 import PreInstructorSoccorsiTable from './components/PreInstructorSoccorsiTable';
 import DashboardService from '../../service/dashboard-service';
-import { pathOr } from 'ramda';
-import NumberFlow from '@number-flow/react';
 
 const SoccorsoIstruttorioPreInstructor = () => {
     const [mainStats, setMainStats] = useState({});
+    const userData = useStore().main.userData()
 
     const getStats = (data) => {
         if (data.status === 'SUCCESS') {
@@ -29,7 +33,7 @@ const SoccorsoIstruttorioPreInstructor = () => {
     return(
         <div className="appPage">
             <div className="appPage__pageHeader">
-                <h1>{__('Soccorso Istruttorio', 'gepafin')}</h1>
+                <h1>{__('Soccorso istruttorio', 'gepafin')}</h1>
             </div>
 
             <div className="appPage__spacer"></div>
@@ -86,7 +90,7 @@ const SoccorsoIstruttorioPreInstructor = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <PreInstructorSoccorsiTable/>
+                <PreInstructorSoccorsiTable userId={userData.id}/>
             </div>
         </div>
     )