OP-1833: resolve conflicts

src/actions.js

@@ -1,10 +1,19 @@
-import { formatGQLString, formatMutation, formatPageQuery, formatPageQueryWithCount, graphql, graphqlWithVariables } from "@openimis/fe-core";
+import {
+  formatGQLString,
+  formatMutation,
+  formatPageQuery,
+  formatPageQueryWithCount,
+  graphql,
+  graphqlWithVariables,
+  decodeId,
+} from "@openimis/fe-core";
 import _ from "lodash";
 
 const MEDICAL_SERVICES_SUMMARY_PROJECTION = [
   "uuid",
   "code",
   "name",
+  "packagetype",
   "type",
   "price",
   "maximumAmount",
@@ -29,6 +38,8 @@ const MEDICAL_SERVICE_FULL_PROJECTION = (mm) => [
   "uuid",
   "code",
   "name",
+  "packagetype",
+  "manualPrice",
   "type",
   "price",
   "maximumAmount",
@@ -59,13 +70,38 @@ const MEDICAL_ITEM_FULL_PROJECTION = (mm) => [
   "package",
 ];
 
+function formatGQLBoolean(value) {
+  return value ? "1" : "0";
+}
+
+export function formatDetail(type, detail) {
+  return `{
+    ${detail.id ? `id: ${detail.id}` : ""}
+    ${type}Id: ${decodeId(detail[type].id)}
+    ${detail.priceAsked ? `priceAsked: "${_.round(detail.priceAsked, 2).toFixed(2)}"` : ""}
+    ${detail.qtyProvided ? `qtyProvided: "${_.round(detail.qtyProvided, 2).toFixed(2)}"` : ""}
+    status: 1
+  }`;
+}
+
+export function formatDetails(type, details) {
+  if (!details) return "";
+
+  const dets = details
+    .filter((d) => Boolean(d[type]))
+    .map((d) => formatDetail(type, d))
+    .join("\n");
+
+  return `${type}s: [${dets}]`;
+}
+
 export function formatMedicalItemOrServiceGQL(mm, ms) {
   const req = `
     ${ms.uuid ? `uuid: "${ms.uuid}"` : ""}
     ${ms.code ? `code: "${ms.code}"` : ""}
     ${ms.name ? `name: "${formatGQLString(ms.name)}"` : ""}
     ${ms.type ? `type: "${formatGQLString(ms.type)}"` : ""}
-    ${ms.price ? `price: "${ms.price}"` : ""}
+    ${!isNaN(ms.price) ? `price: "${ms.price}"` : ""}
     ${ms.quantity ? `quantity: "${ms.quantity}"` : ""}
     ${ms.maximumAmount ? `maximumAmount: "${ms.maximumAmount}"` : ""}
     ${ms.careType ? `careType: "${formatGQLString(ms.careType)}"` : ""}
@@ -74,6 +110,10 @@ export function formatMedicalItemOrServiceGQL(mm, ms) {
     ${ms.category && ms.category !== " " ? `category: "${formatGQLString(ms.category)}"` : ""}
     ${ms.level ? `level: "${formatGQLString(ms.level)}"` : ""}
     ${ms.package ? `package: "${formatGQLString(ms.package)}"` : ""}
+    ${ms.packagetype ? `packagetype: "${formatGQLString(ms.packagetype)}"` : ""}
+    ${ms.packagetype ? `manualPrice: "${formatGQLBoolean(ms.manualPrice)}"` : ""}
+    ${formatDetails("service", ms.serviceserviceSet)}
+    ${formatDetails("item", ms.servicesLinked)}
   `;
   return req;
 }
@@ -122,12 +162,13 @@ export function createMedicalItem(mm, medicalItem, clientMutationLabel) {
   let mutation = formatMutation("createItem", formatMedicalItemOrServiceGQL(mm, medicalItem), clientMutationLabel);
   let requestedDateTime = new Date();
   return graphql(
-    mutation.payload, ["MEDICAL_ITEM_MUTATION_REQ", "MEDICAL_ITEM_CREATE_RESP", "MEDICAL_ITEM_MUTATION_ERR"],
+    mutation.payload,
+    ["MEDICAL_ITEM_MUTATION_REQ", "MEDICAL_ITEM_CREATE_RESP", "MEDICAL_ITEM_MUTATION_ERR"],
     {
       clientMutationId: mutation.clientMutationId,
       clientMutationLabel,
       requestedDateTime,
-    }
+    },
   );
 }
 
@@ -202,10 +243,24 @@ export function fetchMedicalService(mm, medicalServiceId, clientMutationId) {
   } else if (clientMutationId) {
     filters.push(`clientMutationId: "${formatGQLString(clientMutationId)}"`);
   }
-  const payload = formatPageQuery("medicalServices", filters, MEDICAL_SERVICE_FULL_PROJECTION(mm));
+
+  const projection = MEDICAL_SERVICE_FULL_PROJECTION(mm);
+
+  projection.push(
+    "serviceserviceSet{" + "id service {id code name } qtyProvided, priceAsked, scpDate" + "}",
+    "servicesLinked{" + "id item {id code name } qtyProvided, priceAsked, pcpDate" + "}",
+  );
+
+  const payload = formatPageQuery("medicalServices", filters, projection);
   return graphql(payload, "MEDICAL_SERVICE_OVERVIEW");
 }
 
+export function fetchMedicalServices(mm) {
+  const filters = [];
+  const payload = formatPageQuery("medicalServices", filters, MEDICAL_SERVICE_FULL_PROJECTION(mm));
+  return graphql(payload, "MEDICAL_SERVICE_LIST");
+}
+
 export function fetchMedicalItem(mm, medicalItemId, clientMutationId) {
   const filters = [];
   if (medicalItemId) {
@@ -219,7 +274,10 @@ export function fetchMedicalItem(mm, medicalItemId, clientMutationId) {
 
 export function newMedicalService() {
   return (dispatch) => {
-    dispatch({ type: "MEDICAL_SERVICE_NEW" });
+    dispatch({
+      type: "MEDICAL_SERVICE_NEW",
+      typepp: "MEDICAL_SERVICE_NEW",
+    });
   };
 }
 
@@ -230,20 +288,12 @@ export function newMedicalItem() {
 }
 
 export function fetchMedicalServiceMutation(mm, clientMutationId) {
-  const payload = formatPageQuery(
-    "medicalServices",
-    [`clientMutationId:"${clientMutationId}"`],
-    ["uuid"],
-  );
+  const payload = formatPageQuery("medicalServices", [`clientMutationId:"${clientMutationId}"`], ["uuid"]);
   return graphql(payload, "MEDICAL_SERVICE");
 }
 
 export function fetchMedicalItemMutation(mm, clientMutationId) {
-  const payload = formatPageQuery(
-    "medicalItems",
-    [`clientMutationId:"${clientMutationId}"`],
-    ["uuid"],
-  );
+  const payload = formatPageQuery("medicalItems", [`clientMutationId:"${clientMutationId}"`], ["uuid"]);
   return graphql(payload, "MEDICAL_ITEM");
 }
 
@@ -305,4 +355,4 @@ export function clearItemForm() {
   return (dispatch) => {
     dispatch({ type: "CLEAR_ITEM_FORM" });
   };
-}
+}

src/components/MedicalItemChildPanel.js

@@ -0,0 +1,229 @@
+import React, { Component } from "react";
+import { connect } from "react-redux";
+import { injectIntl } from "react-intl";
+import _ from "lodash";
+
+import { Paper, Box } from "@material-ui/core";
+import { withTheme, withStyles } from "@material-ui/core/styles";
+
+import {
+  formatMessage,
+  withModulesManager,
+  NumberInput,
+  Table,
+  PublishedComponent,
+  AmountInput,
+} from "@openimis/fe-core";
+import { SERVICE_TYPE_PP_F, SERVICE_TYPE_PP_P } from "../constants";
+
+const styles = (theme) => ({
+  paper: theme.paper.paper,
+});
+
+class MedicalItemChildPanel extends Component {
+  state = {
+    data: [],
+  };
+
+  constructor(props) {
+    super(props);
+    this.fixedPricesAtEnter = props.modulesManager.getConf("fe-claim", "claimForm.fixedPricesAtEnter", false);
+    this.fixedPricesAtReview = props.modulesManager.getConf("fe-claim", "claimForm.fixedPricesAtReview", false);
+    this.showJustificationAtEnter = props.modulesManager.getConf(
+      "fe-claim",
+      "claimForm.showJustificationAtEnter",
+      false,
+    );
+  }
+
+  initData = () => {
+    let data = [];
+    if (!!this.props.edited[`servicesLinked`]) {
+      data = this.props.edited[`servicesLinked`] || [];
+    }
+    if (!_.isEqual(data[data.length - 1], {})) {
+      data.push({});
+    }
+    return data;
+  };
+
+  componentDidMount() {
+    this.setState({ data: this.initData() });
+  }
+
+  componentDidUpdate(prevProps, prevState, snapshot) {
+    if (prevProps.edited_id && !this.props.edited_id) {
+      let data = [];
+      if (!this.props.forReview) {
+        data.push({});
+      }
+      this.setState({ data, reset: this.state.reset + 1 });
+    } else if (
+      prevProps.reset !== this.props.reset ||
+      (!!this.props.edited[`servicesLinked`] &&
+        !_.isEqual(prevProps.edited[`servicesLinked`], this.props.edited[`servicesLinked`]))
+    ) {
+      this.setState({
+        data: this.initData(),
+      });
+    }
+  }
+
+  _updateData = (idx, updates) => {
+    const data = [...this.state.data];
+    updates.forEach((update) => (data[idx][update.attr] = update.v));
+    if (!this.props.forReview && data.length === idx + 1) {
+      data.push({});
+    }
+    return data;
+  };
+
+  _onEditedChanged = (data) => {
+    let edited = { ...this.props.edited };
+    edited[`servicesLinked`] = data;
+    this.props.onEditedChanged(edited);
+  };
+
+  _onChange = (idx, attr, v) => {
+    let data = this._updateData(idx, [{ attr, v }]);
+    let sumItems = 0;
+    data.forEach((update) => {
+      if (!isNaN(update.priceAsked) || !isNaN(update.qtyProvided)) {
+        sumItems += update.priceAsked * update.qtyProvided;
+      }
+    });
+    this._onEditedChanged(data);
+  };
+
+  _price = (v) => {
+    return v.price;
+  };
+
+  _onChangeItem = (idx, attr, v) => {
+    let data = this._updateData(idx, [{ attr, v }]);
+    if (!v) {
+      data[idx].priceAsked = null;
+      data[idx].qtyProvided = null;
+    } else {
+      data[idx].priceAsked = this._price(v);
+      if (!data[idx].qtyProvided) {
+        data[idx].qtyProvided = 1;
+      }
+    }
+    this._onEditedChanged(data);
+  };
+
+  _onDelete = (idx) => {
+    const data = [...this.state.data];
+    data.splice(idx, 1);
+    this._onEditedChanged(data);
+  };
+
+  formatRejectedReason = (i, idx) => {
+    if (i.status === 1) return null;
+    return (
+      <PublishedComponent
+        readOnly={true}
+        pubRef="claim.RejectionReasonPicker"
+        withLabel={false}
+        value={i.rejectionReason || null}
+        compact={true}
+        onChange={(v) => this._onChange(idx, "rejectionReason", v)}
+      />
+    );
+  };
+
+  _onChangeApproval = (idx, attr, v) => {
+    let data = this._updateData(idx, [
+      { attr, v },
+      { attr: "rejectionReason", v: v === 2 ? -1 : null },
+    ]);
+    this._onEditedChanged(data);
+  };
+
+  render() {
+    const {
+      intl,
+      classes,
+      edited,
+      type,
+      picker,
+      readOnly = false,
+      forReview,
+      fetchingPricelist,
+      medicalService,
+    } = this.props;
+
+    if (!edited) return null;
+
+    const preHeaders = ["\u200b", "", "", ""];
+    let headers = [`edit.${type}s.${type}`, `edit.${type}s.quantity`, `edit.${type}s.price`];
+
+    if (medicalService.packagetype === SERVICE_TYPE_PP_F) {
+      headers[2] = `edit.${type}s.ceiling`;
+    }
+
+    const itemFormatters = [
+      (i, idx) => (
+        <Box minWidth={400}>
+          <PublishedComponent
+            readOnly={!!forReview || readOnly}
+            pubRef={picker}
+            withLabel={false}
+            value={i.item}
+            fullWidth
+            date={edited.dateClaimed}
+            onChange={(v) => this._onChangeItem(idx, type, v)}
+          />
+        </Box>
+      ),
+      (i, idx) => (
+        <NumberInput
+          readOnly={!!forReview || readOnly}
+          value={i.qtyProvided}
+          onChange={(v) => this._onChange(idx, "qtyProvided", v)}
+        />
+      ),
+      (i, idx) => (
+        <AmountInput readOnly={readOnly} value={i.priceAsked} onChange={(v) => this._onChange(idx, "priceAsked", v)} />
+      ),
+    ];
+
+    if (!!forReview || edited.status !== 2) {
+      if (!this.fixedPricesAtReview) {
+        preHeaders.push("");
+      }
+      preHeaders.push("");
+    }
+
+    const header = formatMessage(intl, "claim", `edit.${type}s.title`);
+
+    if (medicalService.packagetype === SERVICE_TYPE_PP_P || medicalService.packagetype === SERVICE_TYPE_PP_F) {
+      return (
+        <Paper className={classes.paper}>
+          <Table
+            module="claim"
+            header={header}
+            preHeaders={preHeaders}
+            headers={headers}
+            itemFormatters={itemFormatters}
+            items={!fetchingPricelist ? this.state.data : []}
+            onDelete={this._onDelete}
+          />
+        </Paper>
+      );
+    }
+
+    return null;
+  }
+}
+
+const mapStateToProps = (state) => ({
+  fetchingPricelist: !!state.medical_pricelist && state.medical_pricelist.fetchingPricelist,
+  servicesPricelists: !!state.medical_pricelist ? state.medical_pricelist.servicesPricelists : {},
+  itemsPricelists: !!state.medical_pricelist ? state.medical_pricelist.itemsPricelists : {},
+});
+
+export default withModulesManager(
+  injectIntl(withTheme(withStyles(styles)(connect(mapStateToProps)(MedicalItemChildPanel)))),
+);