Cosmetic updates

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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