IO-958 IO-955 IO-954 Numerous UI fixes.

This commit is contained in:
Patrick Fic
2021-04-28 15:42:04 -07:00
parent ff32e7d79c
commit d265c1ae3a
4 changed files with 23 additions and 25138 deletions

View File

@@ -93,12 +93,21 @@ export default function PartsOrderModalComponent({
>
<Input />
</Form.Item>
{
// <Form.Item
// label={t("parts_orders.fields.db_price")}
// key={`${index}db_price`}
// name={[field.name, "db_price"]}
// >
// <CurrencyInput />
// </Form.Item>
}
<Form.Item
label={t("parts_orders.fields.db_price")}
key={`${index}db_price`}
name={[field.name, "db_price"]}
label={t("parts_orders.fields.quantity")}
key={`${index}quantity`}
name={[field.name, "quantity"]}
>
<CurrencyInput />
<InputNumber />
</Form.Item>
<Form.Item
label={t("parts_orders.fields.act_price")}
@@ -116,14 +125,6 @@ export default function PartsOrderModalComponent({
<CurrencyInput />
</Form.Item>
)}
<Form.Item
label={t("parts_orders.fields.quantity")}
key={`${index}quantity`}
name={[field.name, "quantity"]}
>
<InputNumber />
</Form.Item>
</LayoutFormRow>
<DeleteFilled
style={{ margin: "1rem" }}

View File

@@ -4,6 +4,7 @@ import {
Card,
Col,
Form,
InputNumber,
notification,
Popover,
Row,
@@ -103,7 +104,7 @@ export function TechClockOffButton({
},
]}
>
<InputNumberCalculator precision={1} />
<InputNumber min={0} precision={1} />
</Form.Item>
<Form.Item
label={t("timetickets.fields.productivehrs")}
@@ -115,7 +116,7 @@ export function TechClockOffButton({
},
]}
>
<InputNumberCalculator precision={1} />
<InputNumber min={0} precision={1} />
</Form.Item>
</div>
) : null}

View File

@@ -178,7 +178,7 @@ const JobRelatedTicketsTable = ({
render: (text, record) =>
record.actHrs === 0 || !record.actHrs
? "∞"
: (record.prodHrs / record.actHrs) * 100,
: ((record.prodHrs / record.actHrs) * 100).toFixed(2),
},
{
title: t("timetickets.fields.clockhours"),
@@ -217,8 +217,9 @@ const JobRelatedTicketsTable = ({
<Card title={t("timetickets.labels.jobhours")}>
<Table
loading={loading}
scroll={{ x: true,// y: "50rem"
}}
scroll={{
x: true, // y: "50rem"
}}
columns={columns}
rowKey="id"
dataSource={data}
@@ -302,8 +303,9 @@ const ShiftRelatedTicketsTable = ({
<Card title={t("timetickets.labels.clockhours")}>
<Table
loading={loading}
scroll={{ x: true,// y: "50rem"
}}
scroll={{
x: true, // y: "50rem"
}}
columns={columns}
rowKey="id"
dataSource={data}

File diff suppressed because it is too large Load Diff