diff --git a/src/components/ChartDomandePerBando/index.js b/src/components/ChartDomandePerBando/index.js
index 700e6a7..b13d369 100644
--- a/src/components/ChartDomandePerBando/index.js
+++ b/src/components/ChartDomandePerBando/index.js
@@ -22,7 +22,10 @@ const ChartDomandePerBando = ({ title, data = [] }) => {
{label}
- {__('Domande', 'gepafin')}: {payload[0].value}
+ {__('In bozza', 'gepafin')}: {payload[0].value}
+
+
+ {__('Inviate', 'gepafin')}: {payload[1].value}
);
@@ -50,7 +53,8 @@ const ChartDomandePerBando = ({ title, data = [] }) => {
}/>
-
+
+
: null}
diff --git a/src/components/ChartStatoDomande/index.js b/src/components/ChartStatoDomande/index.js
index 856fd6c..e5a9ddf 100644
--- a/src/components/ChartStatoDomande/index.js
+++ b/src/components/ChartStatoDomande/index.js
@@ -38,7 +38,7 @@ const ChartStatoDomande = ({ title, data = [] }) => {
label={({ percent }) => `${(percent * 100).toFixed(0)}%`}
outerRadius={120}
fill="#8884d8"
- dataKey="numberOfApplications"
+ dataKey="numberOfSubmitedApplications"
nameKey="status"
>
{data.map((entry, index) => (
diff --git a/src/pages/UserActivity/index.js b/src/pages/UserActivity/index.js
index 8e93f5e..699cf38 100644
--- a/src/pages/UserActivity/index.js
+++ b/src/pages/UserActivity/index.js
@@ -15,6 +15,7 @@ import getDateFromISOstring from '../../helpers/getDateFromISOstring';
import { Button } from 'primereact/button';
import { Toast } from 'primereact/toast';
import { Dropdown } from 'primereact/dropdown';
+import UserActionService from '../../service/user-action-service';
const UserActivity = () => {
@@ -25,6 +26,8 @@ const UserActivity = () => {
const [user, setUser] = useState({});
const [roles, setRoles] = useState([]);
const [chosenRole, setChosenRole] = useState(0);
+ const [actionsContext, setActionsContext] = useState([]);
+ const [userActions, setUserActions] = useState({});
const goBack = () => {
navigate(`/utenti`);
@@ -56,13 +59,13 @@ const UserActivity = () => {
}
const getStatValue = (key, fallback = 0) => {
- return pathOr(fallback, [key], {});
+ return pathOr(fallback, [key], userActions);
}
const handleRoleUpdate = () => {
if (user.role?.id !== chosenRole) {
setLoading(true);
- UserService.updateUser(user.id, {roleId: chosenRole}, updateRoleCallback, errUpdateRoleCallback)
+ UserService.updateUser(user.id, { roleId: chosenRole }, updateRoleCallback, errUpdateRoleCallback)
}
}
@@ -78,11 +81,37 @@ const UserActivity = () => {
setLoading(false);
}
+ const getActionsContextCallback = (resp) => {
+ if (resp.status === 'SUCCESS') {
+ setActionsContext(resp.data)
+ }
+ setLoading(false);
+ }
+
+ const errGetActionsContextCallback = (resp) => {
+ set404FromErrorResponse(resp);
+ setLoading(false);
+ }
+
+ const getUserActionsCallback = (resp) => {
+ if (resp.status === 'SUCCESS') {
+ setUserActions(resp.data)
+ }
+ setLoading(false);
+ }
+
+ const errGetUserActionsCallback = (resp) => {
+ set404FromErrorResponse(resp);
+ setLoading(false);
+ }
+
useEffect(() => {
if (id && !isEmpty(id)) {
setLoading(true);
UserService.getUser(id, getUserCallback, errGetUserCallback);
UserService.getRoles(getRolesCallback, errGetRolesCallback);
+ UserActionService.getActionContext(id, getActionsContextCallback, errGetActionsContextCallback);
+ UserActionService.getUserActions(id, getUserActionsCallback, errGetUserActionsCallback);
}
}, [id])
@@ -143,7 +172,10 @@ const UserActivity = () => {
disabled={isEmpty(roles) || loading}
value={chosenRole}
onChange={(e) => setChosenRole(e.value)}
- options={roles.filter(o => [3, 5].includes(o.id)).map(o => ({ label: o.roleName, value: o.id }))}
+ options={roles.filter(o => [3, 5].includes(o.id)).map(o => ({
+ label: o.roleName,
+ value: o.id
+ }))}
optionLabel="label"
placeholder={__('Seleziona ruolo', 'gepafin')}/>