Compare commits
1 Commits
feature/IO
...
feature/IO
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0dab92d0e |
@@ -214,7 +214,10 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
|
||||
>
|
||||
<CourtesyCarStatus />
|
||||
</Form.Item>
|
||||
<Form.Item label={t("courtesycars.fields.readiness")} name="readiness">
|
||||
<Form.Item
|
||||
label={t("courtesycars.fields.readiness")}
|
||||
name="readiness"
|
||||
>
|
||||
<CourtesyCarReadiness />
|
||||
</Form.Item>
|
||||
<div>
|
||||
@@ -231,9 +234,8 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
|
||||
>
|
||||
{() => {
|
||||
const nextservicekm = form.getFieldValue("nextservicekm");
|
||||
const mileageOver = nextservicekm
|
||||
? nextservicekm <= form.getFieldValue("mileage")
|
||||
: false;
|
||||
const mileageOver =
|
||||
nextservicekm && nextservicekm <= form.getFieldValue("mileage");
|
||||
if (mileageOver)
|
||||
return (
|
||||
<Space direction="vertical" style={{ color: "tomato" }}>
|
||||
|
||||
@@ -74,11 +74,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
|
||||
render: (text, record) => {
|
||||
const { nextservicedate, nextservicekm, mileage } = record;
|
||||
|
||||
const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
|
||||
const mileageOver = nextservicekm <= mileage;
|
||||
|
||||
const dueForService =
|
||||
nextservicedate &&
|
||||
moment(nextservicedate).endOf("day").isSameOrBefore(moment());
|
||||
nextservicedate && moment(nextservicedate).isBefore(moment());
|
||||
|
||||
return (
|
||||
<Space>
|
||||
|
||||
@@ -2023,24 +2023,24 @@
|
||||
- active:
|
||||
_eq: true
|
||||
columns:
|
||||
- labor_rates
|
||||
- percentage
|
||||
- created_at
|
||||
- updated_at
|
||||
- employeeid
|
||||
- id
|
||||
- labor_rates
|
||||
- percentage
|
||||
- teamid
|
||||
- updated_at
|
||||
select_permissions:
|
||||
- role: user
|
||||
permission:
|
||||
columns:
|
||||
- labor_rates
|
||||
- percentage
|
||||
- created_at
|
||||
- updated_at
|
||||
- employeeid
|
||||
- id
|
||||
- labor_rates
|
||||
- percentage
|
||||
- teamid
|
||||
- updated_at
|
||||
filter:
|
||||
employee_team:
|
||||
bodyshop:
|
||||
@@ -2055,13 +2055,13 @@
|
||||
- role: user
|
||||
permission:
|
||||
columns:
|
||||
- labor_rates
|
||||
- percentage
|
||||
- created_at
|
||||
- updated_at
|
||||
- employeeid
|
||||
- id
|
||||
- labor_rates
|
||||
- percentage
|
||||
- teamid
|
||||
- updated_at
|
||||
filter:
|
||||
employee_team:
|
||||
bodyshop:
|
||||
@@ -2123,21 +2123,23 @@
|
||||
_eq: true
|
||||
columns:
|
||||
- active
|
||||
- name
|
||||
- created_at
|
||||
- updated_at
|
||||
- bodyshopid
|
||||
- created_at
|
||||
- id
|
||||
- max_load
|
||||
- name
|
||||
- updated_at
|
||||
select_permissions:
|
||||
- role: user
|
||||
permission:
|
||||
columns:
|
||||
- active
|
||||
- name
|
||||
- created_at
|
||||
- updated_at
|
||||
- bodyshopid
|
||||
- created_at
|
||||
- id
|
||||
- max_load
|
||||
- name
|
||||
- updated_at
|
||||
filter:
|
||||
bodyshop:
|
||||
associations:
|
||||
@@ -2153,6 +2155,7 @@
|
||||
columns:
|
||||
- active
|
||||
- bodyshopid
|
||||
- max_load
|
||||
- name
|
||||
- updated_at
|
||||
filter:
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
-- Could not auto-generate a down migration.
|
||||
-- Please write an appropriate down migration for the SQL below:
|
||||
-- alter table "public"."employee_team_members" add column "max_load" numeric
|
||||
-- not null default '10000';
|
||||
@@ -0,0 +1,2 @@
|
||||
alter table "public"."employee_team_members" add column "max_load" numeric
|
||||
not null default '10000';
|
||||
@@ -0,0 +1,3 @@
|
||||
alter table "public"."employee_team_members" alter column "max_load" set default '10000'::numeric;
|
||||
alter table "public"."employee_team_members" alter column "max_load" drop not null;
|
||||
alter table "public"."employee_team_members" add column "max_load" numeric;
|
||||
@@ -0,0 +1 @@
|
||||
alter table "public"."employee_team_members" drop column "max_load" cascade;
|
||||
@@ -0,0 +1,4 @@
|
||||
-- Could not auto-generate a down migration.
|
||||
-- Please write an appropriate down migration for the SQL below:
|
||||
-- alter table "public"."employee_teams" add column "max_load" numeric
|
||||
-- not null default '10000';
|
||||
@@ -0,0 +1,2 @@
|
||||
alter table "public"."employee_teams" add column "max_load" numeric
|
||||
not null default '10000';
|
||||
Reference in New Issue
Block a user