Minor updates to scheduling + event card

This commit is contained in:
Patrick Fic
2020-02-05 12:13:15 -08:00
parent d216b9fa23
commit 0714eb21a5
7 changed files with 28 additions and 10 deletions

View File

@@ -1979,7 +1979,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>pay_date</name> <name>ownr_ph1</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -2000,7 +2000,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>phone1</name> <name>pay_date</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>

View File

@@ -57,14 +57,12 @@ export default withRouter(function JobsList({
</Link> </Link>
) : ( ) : (
// t("jobs.errors.noowner") // t("jobs.errors.noowner")
<span> <span>{`${record.ownr_fn} ${record.ownr_ln}`}</span>
{record.ownr_fn} {record.ownr_ln}
</span>
); );
} }
}, },
{ {
title: t("jobs.fields.phone1"), title: t("jobs.fields.ownr_ph1"),
dataIndex: "ownr_ph1", dataIndex: "ownr_ph1",
key: "ownr_ph1", key: "ownr_ph1",
width: "12%", width: "12%",

View File

@@ -1,15 +1,32 @@
import React from "react"; import React from "react";
import { Popover, Button } from "antd"; import { Popover, Button } from "antd";
import CurrencyFormatter from "../../utils/CurrencyFormatter"; import CurrencyFormatter from "../../utils/CurrencyFormatter";
import PhoneFormatter from "../../utils/PhoneFormatter";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { useTranslation } from "react-i18next";
export default function Event({ event }) { export default function Event({ event }) {
const { t } = useTranslation();
const popoverContent = ( const popoverContent = (
<div> <div>
Job Total: <CurrencyFormatter>{event.job.clm_total}</CurrencyFormatter> <div>{`${t("jobs.fields.ro_number")}: ${event.job.ro_number}`}</div>
<div>
{t("jobs.fields.clm_total")}:
<CurrencyFormatter>{event.job.clm_total}</CurrencyFormatter>
</div>
<div>{`${t("jobs.fields.clm_no")}: ${event.job.clm_no}`}</div>
<div>
{t("jobs.fields.ownr_ea")}:{event.job.ownr_ea}
</div>
<div>
{t("jobs.fields.ownr_ph1")}:
<PhoneFormatter>{event.job.ownr_ph1}</PhoneFormatter>
</div>
<Link to={`/manage/jobs/${event.job.id}`}> <Link to={`/manage/jobs/${event.job.id}`}>
<Button>View Job</Button> <Button>View Job</Button>
</Link> </Link>
<Button>//TODO: Reschedule</Button>
<Button>//TODO: Intake</Button>
</div> </div>
); );

View File

@@ -10,8 +10,11 @@ export const QUERY_ALL_APPOINTMENTS = gql`
ro_number ro_number
ownr_ln ownr_ln
ownr_fn ownr_fn
ownr_ph1
ownr_ea
clm_total clm_total
id id
clm_no
vehicle { vehicle {
id id
v_model_yr v_model_yr

View File

@@ -125,8 +125,8 @@
"owner": "Owner", "owner": "Owner",
"owner_owing": "Cust. Owes", "owner_owing": "Cust. Owes",
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Phone 1",
"pay_date": "Inspection Date", "pay_date": "Inspection Date",
"phone1": "Phone 1",
"phoneshort": "PH", "phoneshort": "PH",
"policy_no": "Policy #", "policy_no": "Policy #",
"ponumber": "PO Number", "ponumber": "PO Number",

View File

@@ -125,8 +125,8 @@
"owner": "Propietario", "owner": "Propietario",
"owner_owing": "Cust. Debe", "owner_owing": "Cust. Debe",
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Teléfono 1",
"pay_date": "Fecha de inspección", "pay_date": "Fecha de inspección",
"phone1": "Teléfono 1",
"phoneshort": "PH", "phoneshort": "PH",
"policy_no": "Política #", "policy_no": "Política #",
"ponumber": "numero postal", "ponumber": "numero postal",

View File

@@ -125,8 +125,8 @@
"owner": "Propriétaire", "owner": "Propriétaire",
"owner_owing": "Cust. Owes", "owner_owing": "Cust. Owes",
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Téléphone 1",
"pay_date": "Date d'inspection", "pay_date": "Date d'inspection",
"phone1": "Téléphone 1",
"phoneshort": "PH", "phoneshort": "PH",
"policy_no": "Politique #", "policy_no": "Politique #",
"ponumber": "Numéro de bon de commande", "ponumber": "Numéro de bon de commande",