admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetic updates

Browse Source
This commit is contained in:
Patrick Fic
2020-03-12 08:52:22 -07:00
parent a0c0a06850
commit f9fb5e4dc0
10 changed files with 70 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bodyshop_translations.babel
View File

@@ -6392,6 +6392,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>availablenew</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>
<concept_node>
<name>availablesupplements</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>
<folder_node>
<name>cards</name>
<children>

5
client/src/components/audit-trail-list/audit-trail-list.component.jsx
View File

@@ -16,7 +16,7 @@ export default function AuditTrailListComponent({ loading, data }) {
title: t("audit.fields.created"),
dataIndex: " created",
key: " created",
width: "10%",
render: (text, record) => (
<DateTimeFormatter>{record.created}</DateTimeFormatter>
),
@@ -28,6 +28,7 @@ export default function AuditTrailListComponent({ loading, data }) {
title: t("audit.fields.operation"),
dataIndex: "operation",
key: "operation",
width: "10%",
sorter: (a, b) => alphaSort(a.operation, b.operation),
sortOrder:
state.sortedInfo.columnKey === "operation" && state.sortedInfo.order
@@ -36,6 +37,7 @@ export default function AuditTrailListComponent({ loading, data }) {
title: t("audit.fields.values"),
dataIndex: " old_val",
key: " old_val",
width: "10%",
render: (text, record) => (
<AuditTrailValuesComponent
oldV={record.old_val}
@@ -47,6 +49,7 @@ export default function AuditTrailListComponent({ loading, data }) {
title: t("audit.fields.useremail"),
dataIndex: "useremail",
key: "useremail",
width: "10%",
sorter: (a, b) => alphaSort(a.useremail, b.useremail),
sortOrder:
state.sortedInfo.columnKey === "useremail" && state.sortedInfo.order

4
client/src/components/audit-trail-values/audit-trail-values.component.jsx
View File

@@ -9,7 +9,7 @@ export default function AuditTrailValuesComponent({ oldV, newV }) {
if (!oldV && newV)
return (
<List bordered size="small">
<List style={{ width: "800px" }} bordered size="small">
{Object.keys(newV).map((key, idx) => (
<List.Item key={idx} value={key}>
{key}: {JSON.stringify(newV[key])}
@@ -19,7 +19,7 @@ export default function AuditTrailValuesComponent({ oldV, newV }) {
);
return (
<List bordered size="small">
<List style={{ width: "800px" }} bordered size="small">
{Object.keys(oldV).map((key, idx) => (
<List.Item key={idx}>
{key}: {oldV[key]} <Icon component={FaArrowRight} />

18
client/src/components/jobs-available-new/jobs-available-new.component.jsx
View File

@@ -1,15 +1,11 @@
import { Button, Input, notification, Table } from "antd";
import {
PlusCircleFilled,
DeleteFilled,
SyncOutlined
} from "@ant-design/icons";
import { DeleteFilled, PlusCircleFilled, SyncOutlined } from "@ant-design/icons";
import { Button, notification, Table } from "antd";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
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,
@@ -174,13 +170,7 @@ export default function JobsAvailableComponent({
title={() => {
return (
<div>
<Input.Search
placeholder="Search...//TODO Implement Search"
onSearch={value => {
console.log(value);
}}
enterButton
/>
<strong>{t("jobs.labels.availablenew")}</strong>
<Button
onClick={() => {
refetch();

18
client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx
View File

@@ -1,15 +1,15 @@
import { Input, Table, Button, notification } from "antd";
import {
PlusCircleFilled,
DeleteFilled,
PlusCircleFilled,
SyncOutlined
} from "@ant-design/icons";
import { Button, notification, Table, Typography } from "antd";
import React, { useState } from "react";
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";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters";
import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
export default function JobsAvailableSupplementComponent({
loading,
@@ -177,13 +177,7 @@ export default function JobsAvailableSupplementComponent({
title={() => {
return (
<div>
<Input.Search
placeholder="Search..."
onSearch={value => {
console.log(value);
}}
enterButton
/>
<strong>{t("jobs.labels.availablesupplements")}</strong>
<Button
onClick={() => {
refetch();

8
client/src/components/jobs-available-supplement/jobs-available-supplement.container.jsx
View File

@@ -9,8 +9,8 @@ import {
} from "../../graphql/available-jobs.queries";
import { UPDATE_JOB } from "../../graphql/jobs.queries";
import AlertComponent from "../alert/alert.component";
import JobsAvailableSupplementComponent from "./jobs-available-supplement.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import JobsAvailableSupplementComponent from "./jobs-available-supplement.component";
export default withRouter(function JobsAvailableSupplementContainer({
deleteJob,
@@ -59,6 +59,7 @@ export default withRouter(function JobsAvailableSupplementContainer({
delete supp.vehicle;
if (!importOptions.overrideHeaders) {
const FieldsToDelete = ["ins_ea"]; //AD1 or AD2 or VEH
delete supp["ins_ea"];
//TODO Remove all required fields.
}
@@ -102,11 +103,12 @@ export default withRouter(function JobsAvailableSupplementContainer({
setSelectedJob(null);
};
if (error) return <AlertComponent type='error' message={error.message} />;
if (error) return <AlertComponent type="error" message={error.message} />;
return (
<LoadingSpinner
loading={insertLoading}
message={t("jobs.labels.creating_new_job")}>
message={t("jobs.labels.creating_new_job")}
>
<JobsAvailableSupplementComponent
loading={loading}
data={data}

3
client/src/pages/jobs-available/jobs-available.page.component.jsx
View File

@@ -8,12 +8,11 @@ export default function JobsAvailablePageComponent({
}) {
return (
<div>
Available New Jobs
<JobsAvailableContainer
deleteJob={deleteJob}
estDataLazyLoad={estDataLazyLoad}
/>
Available Supplements (//TODO LOGIC HAS NOT YET BEEN COPIED FROM OTHER COMPONENT)
<JobsAvailableSupplementContainer
deleteJob={deleteJob}
estDataLazyLoad={estDataLazyLoad}

2
client/src/translations/en_us/common.json
View File

@@ -418,6 +418,8 @@
"appointmentconfirmation": "Send confirmation to customer?",
"audit": "Audit Trail",
"available_new_jobs": "",
"availablenew": "Available New Jobs",
"availablesupplements": "Available Supplements",
"cards": {
"appraiser": "Appraiser",
"customer": "Customer Information",

2
client/src/translations/es/common.json
View File

@@ -418,6 +418,8 @@
"appointmentconfirmation": "¿Enviar confirmación al cliente?",
"audit": "",
"available_new_jobs": "",
"availablenew": "",
"availablesupplements": "",
"cards": {
"appraiser": "Tasador",
"customer": "Información al cliente",

2
client/src/translations/fr/common.json
View File

@@ -418,6 +418,8 @@
"appointmentconfirmation": "Envoyer une confirmation au client?",
"audit": "",
"available_new_jobs": "",
"availablenew": "",
"availablesupplements": "",
"cards": {
"appraiser": "Expert",
"customer": "Informations client",