Added rate fields to contracts BOD-233

This commit is contained in:
Patrick Fic
2020-07-29 11:52:02 -07:00
parent b19546576c
commit d185db9b41
38 changed files with 878 additions and 48 deletions

View File

@@ -3088,6 +3088,27 @@
<folder_node>
<name>fields</name>
<children>
<concept_node>
<name>actax</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>actualreturn</name>
<definition_loaded>false</definition_loaded>
@@ -3193,6 +3214,111 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>cleanupcharge</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>coverage</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>dailyfreekm</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>dailyrate</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>damagewaiver</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>driver</name>
<definition_loaded>false</definition_loaded>
@@ -3466,6 +3592,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>excesskmrate</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>federaltax</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>kmend</name>
<definition_loaded>false</definition_loaded>
@@ -3508,6 +3676,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>localtax</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>refuelcharge</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>scheduledreturn</name>
<definition_loaded>false</definition_loaded>
@@ -3550,6 +3760,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>statetax</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>status</name>
<definition_loaded>false</definition_loaded>

View File

@@ -254,6 +254,55 @@ export default function ContractFormComponent({ form }) {
<Input />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow>
<Form.Item label={t("contracts.fields.dailyrate")} name="dailyrate">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.actax")} name="actax">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.dailyfreekm")} name="dailyfreekm">
<InputNumber precision={2} />
</Form.Item>
<Form.Item
label={t("contracts.fields.refuelcharge")}
name="refuelcharge"
>
<InputNumber precision={2} />
</Form.Item>
<Form.Item
label={t("contracts.fields.excesskmrate")}
name="excesskmrate"
>
<InputNumber precision={2} />
</Form.Item>
<Form.Item
label={t("contracts.fields.cleanupcharge")}
name="cleanupcharge"
>
<InputNumber precision={2} />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow>
<Form.Item
label={t("contracts.fields.damagewaiver")}
name="damagewaiver"
>
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.federaltax")} name="federaltax">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.statetax")} name="statetax">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.localtax")} name="localtax">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.coverage")} name="coverage">
<InputNumber precision={2} />
</Form.Item>
</LayoutFormRow>
</div>
);
}

View File

@@ -1,11 +1,11 @@
import { Table, Button, Input } from "antd";
import { SyncOutlined } from "@ant-design/icons";
import { Button, Input, Table } from "antd";
import queryString from "query-string";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Link, useHistory, useLocation } from "react-router-dom";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters";
import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
import queryString from "query-string";
import { SyncOutlined } from "@ant-design/icons";
import TimeTicketsDatesSelector from "../ticket-tickets-dates-selector/time-tickets-dates-selector.component";
export default function ContractsList({ loading, contracts, refetch, total }) {

View File

@@ -68,6 +68,17 @@ export const QUERY_CONTRACT_BY_PK = gql`
driver_zip
id
jobid
dailyrate
actax
dailyfreekm
refuelcharge
excesskmrate
cleanupcharge
damagewaiver
federaltax
statetax
localtax
coverage
job {
id
est_number

View File

@@ -199,11 +199,17 @@
"selectjobandcar": "Please ensure both a car and job are selected."
},
"fields": {
"actax": "A/C Tax",
"actualreturn": "Actual Return Date",
"agreementnumber": "Agreement Number",
"cc_cardholder": "Cardholder Name",
"cc_expiry": "Credit Card Expiry Date",
"cc_num": "Credit Card Number",
"cleanupcharge": "Clean Up Charge",
"coverage": "Coverage",
"dailyfreekm": "Daily Free Mileage",
"dailyrate": "Daily Rate",
"damagewaiver": "Damage Waiver",
"driver": "Driver",
"driver_addr1": "Driver Address 1",
"driver_addr2": "Driver Address 2",
@@ -217,10 +223,15 @@
"driver_ph1": "Driver's Phone",
"driver_state": "Driver's State ",
"driver_zip": "Driver's Postal/ZIP Code",
"excesskmrate": "Excess Mileage",
"federaltax": "Federal Taxes",
"kmend": "Mileage End",
"kmstart": "Mileage Start",
"localtax": "Local Taxes",
"refuelcharge": "Refuel Charge (per liter/gallon)",
"scheduledreturn": "Scheduled Return",
"start": "Contract Start",
"statetax": "State Taxes",
"status": "Status"
},
"labels": {

View File

@@ -199,11 +199,17 @@
"selectjobandcar": ""
},
"fields": {
"actax": "",
"actualreturn": "",
"agreementnumber": "",
"cc_cardholder": "",
"cc_expiry": "",
"cc_num": "",
"cleanupcharge": "",
"coverage": "",
"dailyfreekm": "",
"dailyrate": "",
"damagewaiver": "",
"driver": "",
"driver_addr1": "",
"driver_addr2": "",
@@ -217,10 +223,15 @@
"driver_ph1": "",
"driver_state": "",
"driver_zip": "",
"excesskmrate": "",
"federaltax": "",
"kmend": "",
"kmstart": "",
"localtax": "",
"refuelcharge": "",
"scheduledreturn": "",
"start": " ",
"statetax": "",
"status": ""
},
"labels": {

View File

@@ -199,11 +199,17 @@
"selectjobandcar": ""
},
"fields": {
"actax": "",
"actualreturn": "",
"agreementnumber": "",
"cc_cardholder": "",
"cc_expiry": "",
"cc_num": "",
"cleanupcharge": "",
"coverage": "",
"dailyfreekm": "",
"dailyrate": "",
"damagewaiver": "",
"driver": "",
"driver_addr1": "",
"driver_addr2": "",
@@ -217,10 +223,15 @@
"driver_ph1": "",
"driver_state": "",
"driver_zip": "",
"excesskmrate": "",
"federaltax": "",
"kmend": "",
"kmstart": "",
"localtax": "",
"refuelcharge": "",
"scheduledreturn": "",
"start": "",
"statetax": "",
"status": ""
},
"labels": {

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "dailyrate";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "dailyrate" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "actax";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "actax" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "dailyfreekm";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "dailyfreekm" integer NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "refuelcharge";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "refuelcharge" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "excesskmrate";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "excesskmrate" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "cleanupcharge";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "cleanupcharge" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "damangewaiver";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "damangewaiver" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "federaltax";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "federaltax" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "statetax";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "statetax" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "localtax";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "localtax" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "coverage";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "coverage" numeric NULL;
type: run_sql

View File

@@ -0,0 +1,53 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_insert_permission
- args:
permission:
check:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- actualreturn
- agreementnumber
- cc_cardholder
- cc_expiry
- cc_num
- contract_date
- courtesycarid
- created_at
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- id
- jobid
- kmend
- kmstart
- scheduledreturn
- start
- status
- updated_at
set: {}
role: user
table:
name: cccontracts
schema: public
type: create_insert_permission

View File

@@ -0,0 +1,64 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_insert_permission
- args:
permission:
check:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- id
- created_at
- updated_at
- agreementnumber
- courtesycarid
- jobid
- status
- start
- scheduledreturn
- actualreturn
- kmstart
- kmend
- driver_dlnumber
- driver_dlexpiry
- driver_dlst
- driver_fn
- driver_ln
- driver_addr1
- driver_addr2
- driver_city
- driver_state
- driver_zip
- driver_ph1
- driver_dob
- cc_num
- cc_expiry
- cc_cardholder
- contract_date
- dailyrate
- actax
- dailyfreekm
- refuelcharge
- excesskmrate
- cleanupcharge
- damangewaiver
- federaltax
- statetax
- localtax
- coverage
set: {}
role: user
table:
name: cccontracts
schema: public
type: create_insert_permission

View File

@@ -0,0 +1,54 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- actualreturn
- agreementnumber
- cc_cardholder
- cc_expiry
- cc_num
- contract_date
- courtesycarid
- created_at
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- id
- jobid
- kmend
- kmstart
- scheduledreturn
- start
- status
- updated_at
computed_fields: []
filter:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: cccontracts
schema: public
type: create_select_permission

View File

@@ -0,0 +1,65 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- contract_date
- driver_dlexpiry
- driver_dob
- agreementnumber
- dailyfreekm
- actax
- cleanupcharge
- coverage
- dailyrate
- damangewaiver
- excesskmrate
- federaltax
- kmend
- kmstart
- localtax
- refuelcharge
- statetax
- cc_cardholder
- cc_expiry
- cc_num
- driver_addr1
- driver_addr2
- driver_city
- driver_dlnumber
- driver_dlst
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- status
- actualreturn
- created_at
- scheduledreturn
- start
- updated_at
- courtesycarid
- id
- jobid
computed_fields: []
filter:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: cccontracts
schema: public
type: create_select_permission

View File

@@ -0,0 +1,53 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_update_permission
- args:
permission:
columns:
- actualreturn
- agreementnumber
- cc_cardholder
- cc_expiry
- cc_num
- contract_date
- courtesycarid
- created_at
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- id
- jobid
- kmend
- kmstart
- scheduledreturn
- start
- status
- updated_at
filter:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: cccontracts
schema: public
type: create_update_permission

View File

@@ -0,0 +1,64 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_update_permission
- args:
permission:
columns:
- contract_date
- driver_dlexpiry
- driver_dob
- agreementnumber
- dailyfreekm
- actax
- cleanupcharge
- coverage
- dailyrate
- damangewaiver
- excesskmrate
- federaltax
- kmend
- kmstart
- localtax
- refuelcharge
- statetax
- cc_cardholder
- cc_expiry
- cc_num
- driver_addr1
- driver_addr2
- driver_city
- driver_dlnumber
- driver_dlst
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- status
- actualreturn
- created_at
- scheduledreturn
- start
- updated_at
- courtesycarid
- id
- jobid
filter:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: cccontracts
schema: public
type: create_update_permission

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: alter table "public"."cccontracts" rename column "damagewaiver" to "damangewaiver";
type: run_sql

View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: alter table "public"."cccontracts" rename column "damangewaiver" to "damagewaiver";
type: run_sql

View File

@@ -564,66 +564,88 @@ tables:
- active:
_eq: true
columns:
- actualreturn
- agreementnumber
- cc_cardholder
- cc_expiry
- cc_num
- contract_date
- courtesycarid
- id
- created_at
- updated_at
- agreementnumber
- courtesycarid
- jobid
- status
- start
- scheduledreturn
- actualreturn
- kmstart
- kmend
- driver_dlnumber
- driver_dlexpiry
- driver_dlst
- driver_fn
- driver_ln
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- id
- jobid
- kmend
- kmstart
- scheduledreturn
- start
- status
- updated_at
- driver_ph1
- driver_dob
- cc_num
- cc_expiry
- cc_cardholder
- contract_date
- dailyrate
- actax
- dailyfreekm
- refuelcharge
- excesskmrate
- cleanupcharge
- damagewaiver
- federaltax
- statetax
- localtax
- coverage
select_permissions:
- role: user
permission:
columns:
- actualreturn
- contract_date
- driver_dlexpiry
- driver_dob
- agreementnumber
- dailyfreekm
- actax
- cleanupcharge
- coverage
- dailyrate
- damagewaiver
- excesskmrate
- federaltax
- kmend
- kmstart
- localtax
- refuelcharge
- statetax
- cc_cardholder
- cc_expiry
- cc_num
- contract_date
- courtesycarid
- created_at
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- id
- jobid
- kmend
- kmstart
- status
- actualreturn
- created_at
- scheduledreturn
- start
- status
- updated_at
- courtesycarid
- id
- jobid
filter:
courtesycar:
bodyshop:
@@ -639,34 +661,45 @@ tables:
- role: user
permission:
columns:
- actualreturn
- contract_date
- driver_dlexpiry
- driver_dob
- agreementnumber
- dailyfreekm
- actax
- cleanupcharge
- coverage
- dailyrate
- damagewaiver
- excesskmrate
- federaltax
- kmend
- kmstart
- localtax
- refuelcharge
- statetax
- cc_cardholder
- cc_expiry
- cc_num
- contract_date
- courtesycarid
- created_at
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- id
- jobid
- kmend
- kmstart
- status
- actualreturn
- created_at
- scheduledreturn
- start
- status
- updated_at
- courtesycarid
- id
- jobid
filter:
courtesycar:
bodyshop: