+ rights.includes(RIGHT_GROUP_SEARCH) && (
+
)
@@ -162,6 +190,8 @@ const mapDispatchToProps = (dispatch) => bindActionCreators({
fetchGroup,
deleteGroup,
updateGroup,
+ clearGroup,
+ createGroupAndMoveIndividual,
coreConfirm,
clearConfirm,
journalize,
diff --git a/src/reducer.js b/src/reducer.js
index 067a49b..31c2869 100644
--- a/src/reducer.js
+++ b/src/reducer.js
@@ -12,7 +12,7 @@ import {
decodeId,
} from '@openimis/fe-core';
import {
- REQUEST, SUCCESS, ERROR, CLEAR,
+ REQUEST, SUCCESS, ERROR, CLEAR, SET,
} from './util/action-type';
export const ACTION_TYPE = {
@@ -28,11 +28,13 @@ export const ACTION_TYPE = {
UPDATE_INDIVIDUAL: 'INDIVIDUAL_UPDATE_INDIVIDUAL',
UPDATE_GROUP_INDIVIDUAL: 'GROUP_INDIVIDUAL_UPDATE_GROUP_INDIVIDUAL',
UPDATE_GROUP: 'GROUP_UPDATE_GROUP',
+ CREATE_GROUP_AND_MOVE_INDIVIDUAL: 'CREATE_GROUP_AND_MOVE_INDIVIDUAL',
GROUP_EXPORT: 'GROUP_EXPORT',
INDIVIDUAL_EXPORT: 'INDIVIDUAL_EXPORT',
GROUP_INDIVIDUAL_EXPORT: 'GROUP_INDIVIDUAL_EXPORT',
SEARCH_INDIVIDUAL_HISTORY: 'SEARCH_INDIVIDUAL_HISTORY',
SEARCH_GROUP_HISTORY: 'SEARCH_GROUP_HISTORY',
+ SET_GROUP_INDIVIDUAL: 'SET_GROUP_INDIVIDUAL',
};
function reducer(
@@ -382,6 +384,24 @@ function reducer(
fetchingGroupIndividualExport: false,
errorGroupIndividualExport: formatServerError(action.payload),
};
+ case CLEAR(ACTION_TYPE.GET_GROUP):
+ return {
+ ...state,
+ fetchingGroup: false,
+ fetchedGroup: false,
+ group: null,
+ errorGroup: null,
+ };
+ case CLEAR(ACTION_TYPE.SEARCH_GROUP_INDIVIDUALS):
+ return {
+ ...state,
+ fetchingGroupIndividuals: false,
+ fetchedGroupIndividuals: false,
+ groupIndividuals: [],
+ groupIndividualsPageInfo: {},
+ groupIndividualsTotalCount: 0,
+ errorGroupIndividuals: null,
+ };
case CLEAR(ACTION_TYPE.GROUP_EXPORT):
return {
...state,
@@ -409,6 +429,16 @@ function reducer(
individualExportPageInfo: {},
errorIndividualExport: null,
};
+ case SET(ACTION_TYPE.SET_GROUP_INDIVIDUAL):
+ return {
+ ...state,
+ fetchingGroupIndividuals: false,
+ fetchedGroupIndividuals: false,
+ groupIndividuals: [action?.payload],
+ groupIndividualsPageInfo: {},
+ groupIndividualsTotalCount: 1,
+ errorGroupIndividuals: null,
+ };
case REQUEST(ACTION_TYPE.MUTATION):
return dispatchMutationReq(state, action);
case ERROR(ACTION_TYPE.MUTATION):
@@ -425,6 +455,8 @@ function reducer(
return dispatchMutationResp(state, 'deleteGroup', action);
case SUCCESS(ACTION_TYPE.UPDATE_GROUP):
return dispatchMutationResp(state, 'updateGroup', action);
+ case SUCCESS(ACTION_TYPE.CREATE_GROUP_AND_MOVE_INDIVIDUAL):
+ return dispatchMutationResp(state, 'createGroupAndMoveIndividual', action);
default:
return state;
}
diff --git a/src/translations/en.json b/src/translations/en.json
index 62a8210..0140b4b 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -96,7 +96,16 @@
"message": "Deleting data does not mean erasing it from OpenIMIS database. The data will only be deactivated from the viewed list."
},
"mutationLabel": "Delete Group {id}"
- }
+ },
+ "createGroupAndMoveIndividual": {
+ "mutationLabel": "Create group and move individual."
+ },
+ "tasks" : {
+ "create": {
+ "title": "Group Create Tasks"
+ }
+ },
+ "members": "Members"
},
"groupHistory": {
"pageTitle": "Group {id}",
@@ -159,5 +168,6 @@
},
"confirm": "Confirm",
"cancel": "Cancel",
- "changeGroupButtonTooltip": "Move to another group."
+ "changeGroupButtonTooltip": "Move to another group.",
+ "moveToNewGroup": "New Group"
}
\ No newline at end of file
diff --git a/src/util/action-type.js b/src/util/action-type.js
index be3f6c7..fb01b28 100644
--- a/src/util/action-type.js
+++ b/src/util/action-type.js
@@ -2,3 +2,4 @@ export const REQUEST = (actionTypeName) => `${actionTypeName}_REQ`;
export const SUCCESS = (actionTypeName) => `${actionTypeName}_RESP`;
export const ERROR = (actionTypeName) => `${actionTypeName}_ERR`;
export const CLEAR = (actionTypeName) => `${actionTypeName}_CLEAR`;
+export const SET = (actionTypeName) => `${actionTypeName}_SET`;
From 8871be04d689a2c30909ae59c64b5258a92ea4fa Mon Sep 17 00:00:00 2001
From: sniedzielski
Date: Thu, 25 Jan 2024 15:49:28 +0100
Subject: [PATCH 49/90] hackaton
---
src/actions.js | 15 ++
src/components/IndividualTabPanel.js | 4 +
.../BenefitPlanBeneficiariesUploadDialog.js | 216 ++++++++++++++++++
src/pickers/WorkflowsPicker.js | 44 ++++
src/reducer.js | 31 +++
5 files changed, 310 insertions(+)
create mode 100644 src/components/dialogs/BenefitPlanBeneficiariesUploadDialog.js
create mode 100644 src/pickers/WorkflowsPicker.js
diff --git a/src/actions.js b/src/actions.js
index 08bc47f..9949e2e 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -1,6 +1,7 @@
import {
graphql,
formatPageQuery,
+ formatQuery,
formatPageQueryWithCount,
formatMutation,
formatGQLString,
@@ -10,6 +11,20 @@ import {
CLEAR, ERROR, REQUEST, SUCCESS,
} from './util/action-type';
+const WORKFLOWS_FULL_PROJECTION = () => [
+ 'name',
+ 'group',
+];
+
+export function fetchWorkflows() {
+ const payload = formatQuery(
+ 'workflow',
+ [],
+ WORKFLOWS_FULL_PROJECTION(),
+ );
+ return graphql(payload, ACTION_TYPE.GET_WORKFLOWS);
+}
+
const INDIVIDUAL_FULL_PROJECTION = [
'id',
'isDeleted',
diff --git a/src/components/IndividualTabPanel.js b/src/components/IndividualTabPanel.js
index c8d8439..cc6acde 100644
--- a/src/components/IndividualTabPanel.js
+++ b/src/components/IndividualTabPanel.js
@@ -8,6 +8,7 @@ import {
INDIVIDUAL_TABS_LABEL_CONTRIBUTION_KEY,
INDIVIDUAL_TABS_PANEL_CONTRIBUTION_KEY, INDIVIDUALS_LIST_TAB_VALUE,
} from '../constants';
+import BenefitPlanBeneficiariesUploadDialog from './dialogs/BenefitPlanBeneficiariesUploadDialog';
const styles = (theme) => ({
paper: theme.paper.paper,
@@ -64,6 +65,9 @@ function IndividualTabPanel({
group={group}
setConfirmedAction={setConfirmedAction}
/>
+
);
}
diff --git a/src/components/dialogs/BenefitPlanBeneficiariesUploadDialog.js b/src/components/dialogs/BenefitPlanBeneficiariesUploadDialog.js
new file mode 100644
index 0000000..21b08f3
--- /dev/null
+++ b/src/components/dialogs/BenefitPlanBeneficiariesUploadDialog.js
@@ -0,0 +1,216 @@
+import React, { useEffect, useState } from 'react';
+import { Input, Grid } from '@material-ui/core';
+import { injectIntl } from 'react-intl';
+import Button from '@material-ui/core/Button';
+import Dialog from '@material-ui/core/Dialog';
+import DialogActions from '@material-ui/core/DialogActions';
+import DialogContent from '@material-ui/core/DialogContent';
+import DialogTitle from '@material-ui/core/DialogTitle';
+import {
+ apiHeaders,
+ baseApiUrl,
+ formatMessage,
+} from '@openimis/fe-core';
+import { withTheme, withStyles } from '@material-ui/core/styles';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import WorkflowsPicker from '../../pickers/WorkflowsPicker';
+import { fetchWorkflows } from '../../actions';
+
+const styles = (theme) => ({
+ item: theme.paper.item,
+});
+
+function BenefitPlanBeneficiariesUploadDialog({
+ intl,
+ classes,
+ workflows,
+ fetchWorkflows,
+ benefitPlan,
+}) {
+ const [isOpen, setIsOpen] = useState(false);
+ const [forms, setForms] = useState({});
+
+ const handleOpen = () => {
+ setIsOpen(true);
+ };
+
+ const handleClose = () => {
+ setForms({});
+ setIsOpen(false);
+ };
+
+ useEffect(() => {
+ fetchWorkflows();
+ }, []);
+
+ const handleFieldChange = (formName, fieldName, value) => {
+ setForms({
+ ...forms,
+ [formName]: {
+ ...(forms[formName] ?? {}),
+ [fieldName]: value,
+ },
+ });
+ };
+
+ const getFieldValue = () => forms?.workflows?.values?.workflow?.label ?? {};
+
+ const onSubmit = async (values) => {
+ const fileFormat = values.file.type;
+ const formData = new FormData();
+
+ formData.append('file', values.file);
+
+ let urlImport;
+ if (fileFormat.includes('/csv')) {
+ formData.append('workflow_name', values.workflow.name);
+ formData.append('workflow_group', values.workflow.group);
+ urlImport = `${baseApiUrl}/individual/import_individuals/`;
+ }
+
+ try {
+ const response = await fetch(urlImport, {
+ headers: apiHeaders,
+ body: formData,
+ method: 'POST',
+ credentials: 'same-origin',
+ });
+
+ await response.json();
+
+ if (response.status >= 400) {
+ handleClose();
+ return;
+ }
+ handleClose();
+ } catch (error) {
+ handleClose();
+ }
+ };
+
+ return (
+ <>
+
+
+
+ );
+}
+
+const mapStateToProps = (state) => ({
+ rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [],
+ confirmed: state.core.confirmed,
+ workflows: state.socialProtection.workflows,
+});
+
+const mapDispatchToProps = (dispatch) => bindActionCreators({
+ fetchWorkflows,
+}, dispatch);
+
+export default injectIntl(
+ withTheme(
+ withStyles(styles)(
+ connect(mapStateToProps, mapDispatchToProps)(BenefitPlanBeneficiariesUploadDialog),
+ ),
+ ),
+);
diff --git a/src/pickers/WorkflowsPicker.js b/src/pickers/WorkflowsPicker.js
new file mode 100644
index 0000000..43d80d6
--- /dev/null
+++ b/src/pickers/WorkflowsPicker.js
@@ -0,0 +1,44 @@
+import React, { useEffect } from 'react';
+import { SelectInput, formatMessage } from '@openimis/fe-core';
+import { injectIntl } from 'react-intl';
+
+function WorkflowsPicker({
+ intl,
+ value,
+ label,
+ onChange,
+ workflows,
+ readOnly = false,
+ withNull = false,
+ nullLabel = null,
+ withLabel = true,
+}) {
+ const options = Array.isArray(workflows) && workflows !== undefined ? [
+ ...workflows.map((workflows) => ({
+ value: { name: workflows.name, group: workflows.group },
+ label: workflows.name,
+ })),
+ ] : [];
+
+ useEffect(() => {
+ if (withNull) {
+ options.unshift({
+ value: null,
+ label: nullLabel || formatMessage(intl, 'bill', 'emptyLabel'),
+ });
+ }
+ }, []);
+
+ return (
+
+ );
+}
+
+export default injectIntl(WorkflowsPicker);
diff --git a/src/reducer.js b/src/reducer.js
index 067a49b..86da3c3 100644
--- a/src/reducer.js
+++ b/src/reducer.js
@@ -33,6 +33,7 @@ export const ACTION_TYPE = {
GROUP_INDIVIDUAL_EXPORT: 'GROUP_INDIVIDUAL_EXPORT',
SEARCH_INDIVIDUAL_HISTORY: 'SEARCH_INDIVIDUAL_HISTORY',
SEARCH_GROUP_HISTORY: 'SEARCH_GROUP_HISTORY',
+ GET_WORKFLOWS: 'GET_WORKFLOWS',
};
function reducer(
@@ -92,6 +93,12 @@ function reducer(
groupHistory: [],
groupHistoryPageInfo: {},
groupHistoryTotalCount: 0,
+ fetchingWorkflows: true,
+ fetchedWorkflows: false,
+ workflows: [],
+ workflowsPageInfo: {},
+ workflowsGroupBeneficiaries: null,
+ errorWorkflows: null,
},
action,
) {
@@ -409,6 +416,30 @@ function reducer(
individualExportPageInfo: {},
errorIndividualExport: null,
};
+ case REQUEST(ACTION_TYPE.GET_WORKFLOWS):
+ return {
+ ...state,
+ fetchingWorkflows: true,
+ fetchedWorkflows: false,
+ workflows: [],
+ workflowsPageInfo: {},
+ errorWorkflows: null,
+ };
+ case SUCCESS(ACTION_TYPE.GET_WORKFLOWS):
+ return {
+ ...state,
+ fetchingWorkflows: false,
+ fetchedWorkflows: true,
+ workflows: action.payload.data.workflow || [],
+ workflowsPageInfo: pageInfo(action.payload.data.benefitPlan),
+ errorWorkflows: formatGraphQLError(action.payload),
+ };
+ case ERROR(ACTION_TYPE.GET_WORKFLOWS):
+ return {
+ ...state,
+ fetchingWorkflows: false,
+ errorWorkflows: formatServerError(action.payload),
+ };
case REQUEST(ACTION_TYPE.MUTATION):
return dispatchMutationReq(state, action);
case ERROR(ACTION_TYPE.MUTATION):
From 7f030b6452069c1e9c055097f91e112c558b25a1 Mon Sep 17 00:00:00 2001
From: sniedzielski
Date: Thu, 25 Jan 2024 16:14:40 +0100
Subject: [PATCH 50/90] hackaton
---
src/components/IndividualSearcher.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/components/IndividualSearcher.js b/src/components/IndividualSearcher.js
index fb35e86..c464f75 100644
--- a/src/components/IndividualSearcher.js
+++ b/src/components/IndividualSearcher.js
@@ -40,6 +40,7 @@ import {
} from '../constants';
import { applyNumberCircle } from '../util/searcher-utils';
import IndividualFilter from './IndividualFilter';
+import BenefitPlanBeneficiariesUploadDialog from './dialogs/BenefitPlanBeneficiariesUploadDialog';
function IndividualSearcher({
intl,
@@ -292,6 +293,9 @@ function IndividualSearcher({
+
)}
From ab90cb23bdcf71a60a6fba87dc9fab777c028565 Mon Sep 17 00:00:00 2001
From: sniedzielski
Date: Thu, 25 Jan 2024 16:15:21 +0100
Subject: [PATCH 51/90] hackaton2
---
src/components/IndividualTabPanel.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/components/IndividualTabPanel.js b/src/components/IndividualTabPanel.js
index cc6acde..60f6feb 100644
--- a/src/components/IndividualTabPanel.js
+++ b/src/components/IndividualTabPanel.js
@@ -65,9 +65,6 @@ function IndividualTabPanel({
group={group}
setConfirmedAction={setConfirmedAction}
/>
-
);
}
From 9abbface0b2b8a7b66673ab14ed8bc9f51281f51 Mon Sep 17 00:00:00 2001
From: sniedzielski
Date: Thu, 25 Jan 2024 16:20:51 +0100
Subject: [PATCH 52/90] hackaton3
---
src/components/IndividualSearcher.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/IndividualSearcher.js b/src/components/IndividualSearcher.js
index c464f75..943d230 100644
--- a/src/components/IndividualSearcher.js
+++ b/src/components/IndividualSearcher.js
@@ -293,12 +293,12 @@ function IndividualSearcher({
-
)}
+