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

IO-1316 Add flat_rate to time tickets & resolve issues in job costing calculations.

Browse Source
This commit is contained in:
Patrick Fic
2021-08-18 15:39:37 -07:00
parent 86bee9ad0d
commit a269fd3ad8
19 changed files with 311 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -35796,6 +35796,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>flat_rate</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> <concept_node>
<name>memo</name> <name>memo</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

22
client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client"; import { useQuery } from "@apollo/client";
import { Form, Input, InputNumber, Select } from "antd"; import { Form, Input, InputNumber, Select, Switch } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -113,7 +113,17 @@ export function TimeTicketModalComponent({
}, },
]} ]}
> >
<EmployeeSearchSelect options={employeeAutoCompleteOptions} /> <EmployeeSearchSelect
options={employeeAutoCompleteOptions}
onSelect={(value) => {
console.log(value);
const emps =
employeeAutoCompleteOptions &&
employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
console.log(emps);
form.setFieldsValue({ flat_rate: emps && emps.flat_rate });
}}
/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
shouldUpdate={(prev, cur) => prev.employeeid !== cur.employeeid} shouldUpdate={(prev, cur) => prev.employeeid !== cur.employeeid}
@@ -140,6 +150,14 @@ export function TimeTicketModalComponent({
); );
}} }}
</Form.Item> </Form.Item>
<Form.Item
name="flat_rate"
label={t("timetickets.fields.flat_rate")}
valuePropName="checked"
>
<Switch />
</Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow> <LayoutFormRow>

1
client/src/graphql/jobs-lines.queries.js
View File

@@ -58,6 +58,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
jobid jobid
employeeid employeeid
memo memo
flat_rate
employee { employee {
id id
first_name first_name

1
client/src/graphql/jobs.queries.js
View File

@@ -318,6 +318,7 @@ export const QUERY_JOB_COSTING_DETAILS = gql`
cost_center cost_center
actualhrs actualhrs
productivehrs productivehrs
flat_rate
} }
} }
} }

5
client/src/graphql/timetickets.queries.js
View File

@@ -14,6 +14,7 @@ export const QUERY_TICKETS_BY_JOBID = gql`
id id
memo memo
jobid jobid
flat_rate
employee { employee {
employee_number employee_number
first_name first_name
@@ -42,6 +43,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
productivehrs productivehrs
memo memo
jobid jobid
flat_rate
job { job {
id id
ro_number ro_number
@@ -72,6 +74,7 @@ export const INSERT_NEW_TIME_TICKET = gql`
ciecacode ciecacode
date date
memo memo
flat_rate
} }
} }
} }
@@ -98,6 +101,7 @@ export const UPDATE_TIME_TICKET = gql`
updated_at updated_at
jobid jobid
date date
flat_rate
memo memo
} }
} }
@@ -121,6 +125,7 @@ export const QUERY_ACTIVE_TIME_TICKETS = gql`
clockon clockon
memo memo
cost_center cost_center
flat_rate
jobid jobid
job { job {
id id

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

@@ -2160,6 +2160,7 @@
"date": "Ticket Date", "date": "Ticket Date",
"efficiency": "Efficiency", "efficiency": "Efficiency",
"employee": "Employee", "employee": "Employee",
"flat_rate": "Flat Rate?",
"memo": "Memo", "memo": "Memo",
"productivehrs": "Productive Hours", "productivehrs": "Productive Hours",
"ro_number": "Job to Post Against" "ro_number": "Job to Post Against"

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

@@ -2160,6 +2160,7 @@
"date": "", "date": "",
"efficiency": "", "efficiency": "",
"employee": "", "employee": "",
"flat_rate": "",
"memo": "", "memo": "",
"productivehrs": "", "productivehrs": "",
"ro_number": "" "ro_number": ""

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

@@ -2160,6 +2160,7 @@
"date": "", "date": "",
"efficiency": "", "efficiency": "",
"employee": "", "employee": "",
"flat_rate": "",
"memo": "", "memo": "",
"productivehrs": "", "productivehrs": "",
"ro_number": "" "ro_number": ""

5
hasura/migrations/1629321680242_alter_table_public_timetickets_add_column_flat_rate/down.yaml Normal file
View File

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

6
hasura/migrations/1629321680242_alter_table_public_timetickets_add_column_flat_rate/up.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."timetickets" ADD COLUMN "flat_rate" boolean NULL DEFAULT
false;
type: run_sql

39
hasura/migrations/1629321689733_update_permission_user_public_table_timetickets/down.yaml Normal file
View File

@@ -0,0 +1,39 @@
- args:
role: user
table:
name: timetickets
schema: public
type: drop_insert_permission
- args:
permission:
check:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- actualhrs
- bodyshopid
- ciecacode
- clockoff
- clockon
- cost_center
- created_at
- date
- employeeid
- id
- jobid
- memo
- productivehrs
- rate
- updated_at
set: {}
role: user
table:
name: timetickets
schema: public
type: create_insert_permission

40
hasura/migrations/1629321689733_update_permission_user_public_table_timetickets/up.yaml Normal file
View File

@@ -0,0 +1,40 @@
- args:
role: user
table:
name: timetickets
schema: public
type: drop_insert_permission
- args:
permission:
check:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- actualhrs
- bodyshopid
- ciecacode
- clockoff
- clockon
- cost_center
- created_at
- date
- employeeid
- flat_rate
- id
- jobid
- memo
- productivehrs
- rate
- updated_at
set: {}
role: user
table:
name: timetickets
schema: public
type: create_insert_permission

40
hasura/migrations/1629321697271_update_permission_user_public_table_timetickets/down.yaml Normal file
View File

@@ -0,0 +1,40 @@
- args:
role: user
table:
name: timetickets
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- actualhrs
- bodyshopid
- ciecacode
- clockoff
- clockon
- cost_center
- created_at
- date
- employeeid
- id
- jobid
- memo
- productivehrs
- rate
- updated_at
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: timetickets
schema: public
type: create_select_permission

41
hasura/migrations/1629321697271_update_permission_user_public_table_timetickets/up.yaml Normal file
View File

@@ -0,0 +1,41 @@
- args:
role: user
table:
name: timetickets
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- actualhrs
- bodyshopid
- ciecacode
- clockoff
- clockon
- cost_center
- created_at
- date
- employeeid
- flat_rate
- id
- jobid
- memo
- productivehrs
- rate
- updated_at
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: timetickets
schema: public
type: create_select_permission

39
hasura/migrations/1629321703175_update_permission_user_public_table_timetickets/down.yaml Normal file
View File

@@ -0,0 +1,39 @@
- args:
role: user
table:
name: timetickets
schema: public
type: drop_update_permission
- args:
permission:
columns:
- actualhrs
- bodyshopid
- ciecacode
- clockoff
- clockon
- cost_center
- created_at
- date
- employeeid
- id
- jobid
- memo
- productivehrs
- rate
- updated_at
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: timetickets
schema: public
type: create_update_permission

40
hasura/migrations/1629321703175_update_permission_user_public_table_timetickets/up.yaml Normal file
View File

@@ -0,0 +1,40 @@
- args:
role: user
table:
name: timetickets
schema: public
type: drop_update_permission
- args:
permission:
columns:
- actualhrs
- bodyshopid
- ciecacode
- clockoff
- clockon
- cost_center
- created_at
- date
- employeeid
- flat_rate
- id
- jobid
- memo
- productivehrs
- rate
- updated_at
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: timetickets
schema: public
type: create_update_permission

3
hasura/migrations/metadata.yaml
View File

@@ -4097,6 +4097,7 @@ tables:
- created_at - created_at
- date - date
- employeeid - employeeid
- flat_rate
- id - id
- jobid - jobid
- memo - memo
@@ -4116,6 +4117,7 @@ tables:
- created_at - created_at
- date - date
- employeeid - employeeid
- flat_rate
- id - id
- jobid - jobid
- memo - memo
@@ -4144,6 +4146,7 @@ tables:
- created_at - created_at
- date - date
- employeeid - employeeid
- flat_rate
- id - id
- jobid - jobid
- memo - memo

2
server/graphql-client/queries.js
View File

@@ -791,6 +791,7 @@ exports.QUERY_JOB_COSTING_DETAILS = ` query QUERY_JOB_COSTING_DETAILS($id: uuid!
cost_center cost_center
actualhrs actualhrs
productivehrs productivehrs
flat_rate
} }
bodyshop{ bodyshop{
id id
@@ -893,6 +894,7 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
cost_center cost_center
actualhrs actualhrs
productivehrs productivehrs
flat_rate
} }
bodyshop { bodyshop {
id id

6
server/job/job-costing.js
View File

@@ -446,7 +446,11 @@ function GenerateCostingData(job) {
].add( ].add(
Dinero({ Dinero({
amount: Math.round((ticket_val.rate || 0) * 100), amount: Math.round((ticket_val.rate || 0) * 100),
}).multiply(ticket_val.actualhrs || ticket_val.productivehrs || 0) }).multiply(
ticket_val.flat_rate
? ticket_val.productivehrs || ticket_val.actualhrs || 0
: ticket_val.actualhrs || ticket_val.productivehrs || 0
) //Should base this on the employee.
); );
return ticket_acc; return ticket_acc;