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

WIP Loading Header & Remaining changes from Sprint 1

Browse Source
This commit is contained in:
Patrick Fic
2020-03-13 19:02:31 -07:00
parent f9fb5e4dc0
commit ca457c76ab
16 changed files with 663 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
client/src/components/global-loading-bar/global-loading-bar.component.jsx Normal file
View File

@@ -0,0 +1,40 @@
import React, { useEffect } from "react";
import { Progress } from "antd";
import LoadingBar from "react-top-loading-bar";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectLoading } from "../../redux/application/application.selectors";
const mapStateToProps = createStructuredSelector({
loading: selectLoading
});
export default connect(mapStateToProps, null)(GlobalLoadingHeader);
function GlobalLoadingHeader({ loading }) {
console.log("loading", loading);
let l;
useEffect(() => {
if (l) {
if (loading) {
l.continuousStart();
} else {
l.complete();
}
}
}, [loading, l]);
return (
<div>
<LoadingBar height={3} onRef={ref => (l = ref)} />
<button onClick={() => l.continuousStart()}>
Start Continuous Bar Loading
</button>
<button onClick={() => l.staticStart()}>Start Static Bar Loading</button>
<button onClick={() => l.complete()}>Complete</button>
<br />
<button onClick={() => l.add(10)}>Add 10</button>
<button onClick={() => l.add(10)}>Add 30</button>
</div>
);
}

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

@@ -1,9 +1,5 @@
import {
DeleteFilled,
PlusCircleFilled,
SyncOutlined
} from "@ant-design/icons";
import { Button, notification, Table, Typography } from "antd";
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";

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

@@ -11,6 +11,7 @@ import { UPDATE_JOB } from "../../graphql/jobs.queries";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import JobsAvailableSupplementComponent from "./jobs-available-supplement.component";
import HeaderFields from "./jobs-available-supplement.headerfields";
export default withRouter(function JobsAvailableSupplementContainer({
deleteJob,
@@ -53,15 +54,14 @@ export default withRouter(function JobsAvailableSupplementContainer({
} else {
//create upsert job
let supp = estData.data.available_jobs_by_pk.est_data;
console.log("supp before", supp);
delete supp.joblines;
//TODO How to update the estimate lines.
delete supp.owner;
delete supp.vehicle;
if (!importOptions.overrideHeaders) {
const FieldsToDelete = ["ins_ea"]; //AD1 or AD2 or VEH
delete supp["ins_ea"];
//TODO Remove all required fields.
if (importOptions.overrideHeaders) {
HeaderFields.forEach(item => delete supp[item]);
}
updateJob({

225
client/src/components/jobs-available-supplement/jobs-available-supplement.headerfields.js Normal file
View File

@@ -0,0 +1,225 @@
const headerFields = [
//AD1
"ins_co_id",
"ins_co_nm",
"ins_addr1",
"ins_addr2",
"ins_city",
"ins_st",
"ins_zip",
"ins_ctry",
"ins_ea",
"policy_no",
"ded_amt",
"ded_status",
"asgn_no",
"asgn_date",
"asgn_type",
"clm_no",
"clm_ofc_id",
"clm_ofc_nm",
"clm_addr1",
"clm_addr2",
"clm_city",
"clm_st",
"clm_zip",
"clm_ctry",
"clm_ph1",
"clm_ph1x",
"clm_ph2",
"clm_ph2x",
"clm_fax",
"clm_faxx",
"clm_ct_ln",
"clm_ct_fn",
"clm_title",
"clm_ct_ph",
"clm_ct_phx",
"clm_ea",
"payee_nms",
"pay_type",
"pay_date",
"pay_chknm",
"pay_amt",
"agt_co_id",
"agt_co_nm",
"agt_addr1",
"agt_addr2",
"agt_city",
"agt_st",
"agt_zip",
"agt_ctry",
"agt_ph1",
"agt_ph1x",
"agt_ph2",
"agt_ph2x",
"agt_fax",
"agt_faxx",
"agt_ct_ln",
"agt_ct_fn",
"agt_ct_ph",
"agt_ct_phx",
"agt_ea",
"agt_lic_no",
"loss_date",
"loss_type",
"loss_desc",
"theft_ind",
"cat_no",
"tlos_ind",
"cust_pr",
"insd_ln",
"insd_fn",
"insd_title",
"insd_co_nm",
"insd_addr1",
"insd_addr2",
"insd_city",
"insd_st",
"insd_zip",
"insd_ctry",
"insd_ph1",
"insd_ph1x",
"insd_ph2",
"insd_ph2x",
"insd_fax",
"insd_faxx",
"insd_ea",
"ownr_ln",
"ownr_fn",
"ownr_title",
"ownr_co_nm",
"ownr_addr1",
"ownr_addr2",
"ownr_city",
"ownr_st",
"ownr_zip",
"ownr_ctry",
"ownr_ph1",
"ownr_ph1x",
"ownr_ph2",
"ownr_ph2x",
"ownr_fax",
"ownr_faxx",
"ownr_ea",
"ins_ph1",
"ins_ph1x",
"ins_ph2",
"ins_ph2x",
"ins_fax",
"ins_faxx",
"ins_ct_ln",
"ins_ct_fn",
"ins_title",
"ins_ct_ph",
"ins_ct_phx",
"loss_cat",
//ad2
"clmt_ln",
"clmt_fn",
"clmt_title",
"clmt_co_nm",
"clmt_addr1",
"clmt_addr2",
"clmt_city",
"clmt_st",
"clmt_zip",
"clmt_ctry",
"clmt_ph1",
"clmt_ph1x",
"clmt_ph2",
"clmt_ph2x",
"clmt_fax",
"clmt_faxx",
"clmt_ea",
"est_co_id",
"est_co_nm",
"est_addr1",
"est_addr2",
"est_city",
"est_st",
"est_zip",
"est_ctry",
"est_ph1",
"est_ph1x",
"est_ph2",
"est_ph2x",
"est_fax",
"est_faxx",
"est_ct_ln",
"est_ct_fn",
"est_ea",
"est_lic_no",
"est_fileno",
"insp_ct_ln",
"insp_ct_fn",
"insp_addr1",
"insp_addr2",
"insp_city",
"insp_st",
"insp_zip",
"insp_ctry",
"insp_ph1",
"insp_ph1x",
"insp_ph2",
"insp_ph2x",
"insp_fax",
"insp_faxx",
"insp_ea",
"insp_code",
"insp_desc",
"insp_date",
"insp_time",
"rf_co_id",
"rf_co_nm",
"rf_addr1",
"rf_addr2",
"rf_city",
"rf_st",
"rf_zip",
"rf_ctry",
"rf_ph1",
"rf_ph1x",
"rf_ph2",
"rf_ph2x",
"rf_fax",
"rf_faxx",
"rf_ct_ln",
"rf_ct_fn",
"rf_ea",
"rf_tax_id",
"rf_lic_no",
"rf_bar_no",
"ro_in_date",
"ro_in_time",
"tar_date",
"tar_time",
"ro_cmpdate",
"ro_cmptime",
"date_out",
"time_out",
"rf_estimtr",
"mktg_type",
"mktg_src",
"loc_nm",
"loc_addr1",
"loc_addr2",
"loc_city",
"loc_st",
"loc_zip",
"loc_ctry",
"loc_ph1",
"loc_ph1x",
"loc_ph2",
"loc_ph2x",
"loc_fax",
"loc_faxx",
"loc_ct_ln",
"loc_ct_fn",
"loc_title",
"loc_ph",
"loc_phx",
"loc_ea"
];
export default headerFields;

4
client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
View File

@@ -14,7 +14,7 @@ export default function JobsFindModalComponent({
const { t } = useTranslation();
const [importOptions, setImportOptions] = importOptionsState;
console.log("importOptions", importOptions);
const columns = [
{
title: t("jobs.fields.ro_number"),
@@ -161,7 +161,7 @@ export default function JobsFindModalComponent({
onChange={e =>
setImportOptions({
...importOptions,
overrideHeader: e.target.checked
overrideHeaders: e.target.checked
})
}
>

3
client/src/components/profile-my/profile-my.component.jsx
View File

@@ -1,11 +1,10 @@
import { Button, Form, Input, notification } from "antd";
import { Button, Form, Input } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { updateUserDetails } from "../../redux/user/user.actions";
import { selectCurrentUser } from "../../redux/user/user.selectors";
import ResetForm from "../form-items-formatted/reset-form-item.component";
const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser

5
client/src/pages/manage/manage.page.component.jsx
View File

@@ -45,6 +45,10 @@ const EmailOverlayContainer = lazy(() =>
import("../../components/email-overlay/email-overlay.container.jsx")
);
const GlobalLoadingBar = lazy(() =>
import("../../components/global-loading-bar/global-loading-bar.component")
);
const { Header, Content, Footer } = Layout;
export default function Manage({ match }) {
@@ -64,6 +68,7 @@ export default function Manage({ match }) {
className="content-container"
style={{ padding: "0em 4em 4em" }}
>
<GlobalLoadingBar />
<ErrorBoundary>
<Suspense
fallback={

10
client/src/redux/application/application.actions.js Normal file
View File

@@ -0,0 +1,10 @@
import ApplicationActionTypes from "./application.types";
export const startLoading = () => ({
type: ApplicationActionTypes.START_LOADING
});
export const endLoading = options => ({
type: ApplicationActionTypes.END_LOADING,
payload: options
});

24
client/src/redux/application/application.reducer.js Normal file
View File

@@ -0,0 +1,24 @@
import ApplicationActionTypes from "./application.types";
const INITIAL_STATE = {
loading: false
};
const applicationReducer = (state = INITIAL_STATE, action) => {
switch (action.type) {
case ApplicationActionTypes.START_LOADING:
return {
...state,
loading: true
};
case ApplicationActionTypes.END_LOADING:
return {
...state,
loading: false
};
default:
return state;
}
};
export default applicationReducer;

8
client/src/redux/application/application.selectors.js Normal file
View File

@@ -0,0 +1,8 @@
import { createSelector } from "reselect";
const selectApplication = state => state.application;
export const selectLoading = createSelector(
[selectApplication],
application => application.loading
);

5
client/src/redux/application/application.types.js Normal file
View File

@@ -0,0 +1,5 @@
const ApplicationActionTypes = {
START_LOADING: "START_LOADING",
END_LOADING: "END_LOADING"
};
export default ApplicationActionTypes;

6
client/src/redux/root.reducer.js
View File

@@ -5,7 +5,8 @@ import storage from "redux-persist/lib/storage";
import userReducer from "./user/user.reducer";
import messagingReducer from "./messaging/messaging.reducer";
import emailReducer from "./email/email.reducer";
import modalsReducer from './modals/modals.reducer'
import modalsReducer from "./modals/modals.reducer";
import applicationReducer from "./application/application.reducer";
const persistConfig = {
key: "root",
storage,
@@ -17,7 +18,8 @@ const rootReducer = combineReducers({
user: userReducer,
messaging: messagingReducer,
email: emailReducer,
modals: modalsReducer
modals: modalsReducer,
application: applicationReducer
});
export default persistReducer(persistConfig, rootReducer);