Added base supplement functionality.

This commit is contained in:
Patrick Fic
2020-02-12 15:56:09 -08:00
parent 7e61bffce5
commit 5b873146b8
10 changed files with 64 additions and 23 deletions

View File

@@ -4577,6 +4577,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>supplemented</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children>

View File

@@ -4,6 +4,8 @@ import { useTranslation } from "react-i18next";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters";
import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.container";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
export default function JobsAvailableComponent({
loading,
data,
@@ -77,7 +79,10 @@ export default function JobsAvailableComponent({
key: "clm_amt",
sorter: (a, b) => a.clm_amt - b.clm_amt,
sortOrder:
state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order
state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order,
render: (text, record) => (
<CurrencyFormatter>{record.clm_amt}</CurrencyFormatter>
)
//width: "12%",
//ellipsis: true
},

View File

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
import { alphaSort } from "../../utils/sorters";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
export default function JobsAvailableSupplementComponent({
loading,
@@ -92,7 +93,10 @@ export default function JobsAvailableSupplementComponent({
key: "clm_amt",
sorter: (a, b) => a.clm_amt - b.clm_amt,
sortOrder:
state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order
state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order,
render: (text, record) => (
<CurrencyFormatter>{record.clm_amt}</CurrencyFormatter>
)
//width: "12%",
//ellipsis: true
},
@@ -162,7 +166,6 @@ export default function JobsAvailableSupplementComponent({
visible={modalVisible}
onOk={onModalOk}
onCancel={onModalCancel}
/>
<Table
loading={loading}

View File

@@ -32,8 +32,8 @@ export default withRouter(function JobsAvailableSupplementContainer({
const [insertLoading, setInsertLoading] = useState(false);
const [updateJob] = useMutation(UPDATE_JOB);
const [loadEstData, estData] = estDataLazyLoad;
const importOptionsState = useState({overrideHeaders: false,})
const importOptionsState = useState({ overrideHeaders: false });
const importOptions = importOptionsState[0];
const onModalOk = () => {
setModalVisible(false);
setInsertLoading(true);
@@ -51,16 +51,27 @@ const importOptionsState = useState({overrideHeaders: false,})
message: t("jobs.errors.creating", { error: "No job data present." })
});
} else {
//create upsert job
let supp = estData.data.available_jobs_by_pk.est_data;
delete supp.joblines;
delete supp.owner;
delete supp.vehicle;
if (!importOptions.overrideHeaders) {
delete supp["ins_ea"];
//Strip out the header options
}
updateJob({
variables: {
job: estData.data.available_jobs_by_pk.est_data //STRAIGHT DATA PLACE, SHOULD REMOVE
jobId: selectedJob,
job: supp
}
})
.then(r => {
notification["success"]({
message: t("jobs.successes.created"),
message: t("jobs.successes.supplemented"),
onClick: () => {
console.log("r", r);
history.push(
`/manage/jobs/${r.data.update_jobs.returning[0].id}`
);

View File

@@ -35,7 +35,6 @@ export default function OwnerFindModalContainer({
<Modal
title={t("owners.labels.existing_owners")}
width={"80%"}
okButtonProps={{ disabled: selectedOwner ? false : true }}
{...modalProps}
>
{loading ? <LoadingSpinner /> : null}

View File

@@ -25,8 +25,6 @@ const errorLink = onError(
}
if (expired) {
//User access token has expired
//props.history.push("/network-error");
console.log("We need a new token!");
console.log("Old Token", window.localStorage.getItem("token"));
// Let's refresh token through async request
@@ -35,15 +33,15 @@ const errorLink = onError(
console.log("Got the new token.", token);
window.localStorage.setItem("token", token);
const oldHeaders = operation.getContext().headers;
operation.setContext({
headers: {
...oldHeaders,
authorization: token ? `Bearer ${token}` : ""
}
});
console.log("forward", forward);
console.log("operation", operation);
// const oldHeaders = operation.getContext().headers;
// operation.setContext({
// headers: {
// ...oldHeaders,
// authorization: token ? `Bearer ${token}` : ""
// }
// });
// console.log("forward", forward);
// console.log("operation", operation);
return forward(operation).subscribe();
// return new Observable(observer => {

View File

@@ -120,6 +120,7 @@ export const GET_JOB_BY_PK = gql`
ins_co_id
policy_no
loss_date
clm_no
area_of_damage
ins_co_nm
ins_addr1

View File

@@ -283,7 +283,8 @@
"created": "Job created successfully. Click to view.",
"deleted": "Job deleted successfully.",
"save": "Job saved successfully.",
"savetitle": "Record saved successfully."
"savetitle": "Record saved successfully.",
"supplemented": "Job supplemented successfully. "
}
},
"menus": {

View File

@@ -283,7 +283,8 @@
"created": "Trabajo creado con éxito. Click para ver.",
"deleted": "Trabajo eliminado con éxito.",
"save": "Trabajo guardado con éxito.",
"savetitle": "Registro guardado con éxito."
"savetitle": "Registro guardado con éxito.",
"supplemented": "Trabajo complementado con éxito."
}
},
"menus": {

View File

@@ -283,7 +283,8 @@
"created": "Le travail a été créé avec succès. Clique pour voir.",
"deleted": "Le travail a bien été supprimé.",
"save": "Le travail a été enregistré avec succès.",
"savetitle": "Enregistrement enregistré avec succès."
"savetitle": "Enregistrement enregistré avec succès.",
"supplemented": "Travail complété avec succès."
}
},
"menus": {