-
setState(e.target.value)} />
-
+
+
+
+ {(job && job.ro_number) || ""}
+
+
+ {`${(job && job.v_model_yr) || ""} ${(job && job.v_make_desc) ||
+ ""} ${(job && job.v_model_desc) || ""}`}
+
+
+ {`${(job && job.ownr_fn) || ""} ${(job && job.ownr_ln) ||
+ ""} ${(job && job.ownr_co_nm) || ""}`}
+
+
+
+
+ );
+}
diff --git a/client/src/graphql/cccontracts.queries.js b/client/src/graphql/cccontracts.queries.js
index c0873e1c0..8fab495ee 100644
--- a/client/src/graphql/cccontracts.queries.js
+++ b/client/src/graphql/cccontracts.queries.js
@@ -15,10 +15,7 @@ export const UPDATE_CONTRACT = gql`
$contractId: uuid!
$cccontract: cccontracts_set_input!
) {
- update_cccontracts(
- where: { id: { _eq: $contractId } }
- _set: $cccontract
- ) {
+ update_cccontracts(where: { id: { _eq: $contractId } }, _set: $cccontract) {
returning {
id
}
@@ -49,12 +46,31 @@ export const QUERY_CONTRACT_BY_PK = gql`
driver_zip
id
jobid
+ job {
+ id
+ est_number
+ ro_number
+ v_make_desc
+ v_model_desc
+ ownr_fn
+ ownr_ln
+ ownr_co_nm
+ scheduled_completion
+ }
kmend
kmstart
scheduledreturn
start
status
updated_at
+ courtesycar {
+ id
+ fleetnumber
+ make
+ model
+ year
+ plate
+ }
}
}
`;
diff --git a/client/src/pages/contract-detail/contract-detail.page.component.jsx b/client/src/pages/contract-detail/contract-detail.page.component.jsx
index acc1cc5be..9f36f3b6b 100644
--- a/client/src/pages/contract-detail/contract-detail.page.component.jsx
+++ b/client/src/pages/contract-detail/contract-detail.page.component.jsx
@@ -2,14 +2,18 @@ import React from "react";
import ContractFormComponent from "../../components/contract-form/contract-form.component";
import { useTranslation } from "react-i18next";
import { Button } from "antd";
-export default function ContractDetailPage() {
+import ContractJobBlock from "../../components/contract-job-block/contract-job-block.component";
+import ContractCourtesyCarBlock from "../../components/contract-courtesy-car-block/contract-courtesy-car-block.component";
+
+export default function ContractDetailPage({ job, courtesyCar }) {
const { t } = useTranslation();
return (
{t("general.actions.save")}
- SOME SORT OF HEADER INFORMATION HERE.
+
+
);
diff --git a/client/src/pages/contract-detail/contract-detail.page.container.jsx b/client/src/pages/contract-detail/contract-detail.page.container.jsx
index 243078792..b125bedf0 100644
--- a/client/src/pages/contract-detail/contract-detail.page.container.jsx
+++ b/client/src/pages/contract-detail/contract-detail.page.container.jsx
@@ -78,7 +78,10 @@ export default function ContractDetailPageContainer() {
: {}
}
>
-
+
);
}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index f1e7059d7..4b66a166e 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -203,6 +203,7 @@
"year": "Year"
},
"labels": {
+ "courtesycar": "Courtesy Car",
"fuel": {
"12": "1/2",
"14": "1/4",
@@ -213,7 +214,8 @@
"78": "7/8",
"empty": "Empty",
"full": "Full"
- }
+ },
+ "vehicle": "Vehicle Description"
},
"status": {
"in": "Available",
@@ -535,6 +537,7 @@
"creating_new_job": "Creating new job...",
"documents": "Documents",
"existing_jobs": "Existing Jobs",
+ "job": "Job Details",
"lines": "Estimate Lines",
"notes": "Notes",
"override_header": "Override estimate header on import?",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index d6054a671..23d7ff0cd 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -203,6 +203,7 @@
"year": ""
},
"labels": {
+ "courtesycar": "",
"fuel": {
"12": "",
"14": "",
@@ -213,7 +214,8 @@
"78": "",
"empty": "",
"full": ""
- }
+ },
+ "vehicle": ""
},
"status": {
"in": "",
@@ -535,6 +537,7 @@
"creating_new_job": "Creando nuevo trabajo ...",
"documents": "documentos",
"existing_jobs": "Empleos existentes",
+ "job": "",
"lines": "Líneas estimadas",
"notes": "Notas",
"override_header": "¿Anular encabezado estimado al importar?",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 295a01a55..b45967ffe 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -203,6 +203,7 @@
"year": ""
},
"labels": {
+ "courtesycar": "",
"fuel": {
"12": "",
"14": "",
@@ -213,7 +214,8 @@
"78": "",
"empty": "",
"full": ""
- }
+ },
+ "vehicle": ""
},
"status": {
"in": "",
@@ -535,6 +537,7 @@
"creating_new_job": "Création d'un nouvel emploi ...",
"documents": "Les documents",
"existing_jobs": "Emplois existants",
+ "job": "",
"lines": "Estimer les lignes",
"notes": "Remarques",
"override_header": "Remplacer l'en-tête d'estimation à l'importation?",