Merge pull request #44 from openimis/develop

MERGING RELEASE branches
openimis · Apr 24, 2023 · 2c9f8f3 · 2c9f8f3
2 parents 821fd9d + 790c79d
commit 2c9f8f3
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 9 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -149,7 +149,7 @@ export function updateMedicalItem(mm, medicalItem, clientMutationLabel) {
   const requestedDateTime = new Date();
   return graphql(
     mutation.payload,
-    ["MEDICAL_SERVICE_MUTATION_REQ", "MEDICAL_SERVICE_UPDATE_RESP", "MEDICAL_SERVICE_MUTATION_ERR"],
+    ["MEDICAL_ITEM_MUTATION_REQ", "MEDICAL_ITEM_UPDATE_RESP", "MEDICAL_ITEM_MUTATION_ERR"],
     {
       clientMutationId: mutation.clientMutationId,
       clientMutationLabel,

diff --git a/src/components/MedicalItemForm.js b/src/components/MedicalItemForm.js
@@ -216,6 +216,7 @@ class MedicalItemForm extends Component {
               onEditedChanged={this.onEditedChanged}
               canSave={this.canSave}
               save={save ? this.save : null}
+              openDirty={save}
               onActionToConfirm={this.onActionToConfirm}
             />
           )}

diff --git a/src/components/MedicalServiceForm.js b/src/components/MedicalServiceForm.js
@@ -210,6 +210,7 @@ class MedicalServiceForm extends Component {
               onEditedChanged={this.onEditedChanged}
               canSave={this.canSave}
               save={save ? this.save : null}
+              openDirty={save}
               onActionToConfirm={this.onActionToConfirm}
             />
           )}

diff --git a/src/constants.js b/src/constants.js
@@ -61,3 +61,6 @@ export const PATIENT_CATEGORIES = [
   PATIENT_CATEGORY_MASK_ADULT,
   PATIENT_CATEGORY_MASK_MINOR,
 ];
+
+export const ITEMS_MODULE_NAME = "medicalItem";
+export const SERVICES_MODULE_NAME = "medicalService";
diff --git a/src/pages/MedicalItemsPage.js b/src/pages/MedicalItemsPage.js
@@ -1,18 +1,20 @@
 import React, { Component } from "react";
+import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
 import { injectIntl } from "react-intl";
 import { Fab } from "@material-ui/core";
 import AddIcon from "@material-ui/icons/Add";
 import { withTheme, withStyles } from "@material-ui/core/styles";
-import { RIGHT_MEDICALITEMS_ADD } from "../constants";
+import { RIGHT_MEDICALITEMS_ADD, ITEMS_MODULE_NAME} from "../constants";
 import {
   formatMessage,
   formatMessageWithValues,
   Helmet,
   historyPush,
   withHistory,
   withModulesManager,
-  withTooltip
+  withTooltip,
+  clearCurrentPaginationPage,
 } from "@openimis/fe-core";
 import MedicalItemSearcher from "../components/MedicalItemSearcher";
 
@@ -30,6 +32,11 @@ class MedicalItemsPage extends Component {
     historyPush(this.props.modulesManager, this.props.history, "medical.medicalItemNew");
   };
 
+  componentDidMount = () => {
+    const { module } = this.props;
+    if (module !== ITEMS_MODULE_NAME) this.props.clearCurrentPaginationPage();
+  };
+
   render() {
     const { classes, rights, intl } = this.props;
     return (
@@ -52,8 +59,13 @@ class MedicalItemsPage extends Component {
 
 const mapStateToProps = (state) => ({
   rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [],
+  module: state.core?.savedPagination?.module,
 });
 
+const mapDispatchToProps = (dispatch) => bindActionCreators({ clearCurrentPaginationPage }, dispatch);
+
 export default injectIntl(
-  withModulesManager(withHistory(connect(mapStateToProps)(withTheme(withStyles(styles)(MedicalItemsPage))))),
+  withModulesManager(
+    withHistory(connect(mapStateToProps, mapDispatchToProps)(withTheme(withStyles(styles)(MedicalItemsPage)))),
+  ),
 );
diff --git a/src/pages/MedicalServicesPage.js b/src/pages/MedicalServicesPage.js
@@ -1,18 +1,20 @@
 import React, { Component } from "react";
+import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
 import { injectIntl } from "react-intl";
 import { Fab } from "@material-ui/core";
 import AddIcon from "@material-ui/icons/Add";
 import { withTheme, withStyles } from "@material-ui/core/styles";
-import { RIGHT_MEDICALSERVICES_ADD } from "../constants";
+import { RIGHT_MEDICALSERVICES_ADD, SERVICES_MODULE_NAME } from "../constants";
 import {
   formatMessage,
   formatMessageWithValues,
   Helmet,
   historyPush,
   withHistory,
   withModulesManager,
-  withTooltip
+  withTooltip,
+  clearCurrentPaginationPage,
 } from "@openimis/fe-core";
 import MedicalServiceSearcher from "../components/MedicalServiceSearcher";
 
@@ -30,6 +32,11 @@ class MedicalServicesPage extends Component {
     historyPush(this.props.modulesManager, this.props.history, "medical.medicalServiceNew");
   };
 
+  componentDidMount = () => {
+    const { module } = this.props;
+    if (module !== SERVICES_MODULE_NAME) this.props.clearCurrentPaginationPage();
+  };
+
   render() {
     const { classes, rights, intl } = this.props;
     return (
@@ -52,8 +59,13 @@ class MedicalServicesPage extends Component {
 
 const mapStateToProps = (state) => ({
   rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [],
+  module: state.core?.savedPagination?.module,
 });
 
+const mapDispatchToProps = (dispatch) => bindActionCreators({ clearCurrentPaginationPage }, dispatch);
+
 export default injectIntl(
-  withModulesManager(withHistory(connect(mapStateToProps)(withTheme(withStyles(styles)(MedicalServicesPage))))),
+  withModulesManager(
+    withHistory(connect(mapStateToProps, mapDispatchToProps)(withTheme(withStyles(styles)(MedicalServicesPage)))),
+  ),
 );
diff --git a/src/translations/en.json b/src/translations/en.json
@@ -17,8 +17,7 @@
   "medical.visitType.R": "Referral",
   "medical.visitType.O": "Other",
   "medical.careType": "Care Type",
-  "medical.careType.any": "Any",
-  "medical.careType.null": "None",
+  "medical.careType.null": "Any",
   "medical.careType.I": "In - Patient",
   "medical.careType.O": "Out - Patient",
   "medical.careType.B": "In & Out - Patient",