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

Resolve CI issues.

Browse Source
This commit is contained in:
Patrick Fic
2023-06-02 09:43:46 -07:00
parent 39b8ecf785
commit e6c44ec52a
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/time-ticket-list/time-ticket-list.component.jsx
View File

@@ -1,6 +1,5 @@
import { EditFilled } from "@ant-design/icons"; import { EditFilled } from "@ant-design/icons";
import { Button, Card, Checkbox, Space, Table } from "antd"; import { Button, Card, Checkbox, Space, Table } from "antd";
import Dinero from "dinero.js";
import moment from "moment"; import moment from "moment";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";

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

@@ -23,7 +23,6 @@ import JobSearchSelectComponent from "../job-search-select/job-search-select.com
import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility"; import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component"; import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
import TimeTicketsTasksPresets from "../time-ticket-tasks-presets/time-ticket-tasks-presets.component"; import TimeTicketsTasksPresets from "../time-ticket-tasks-presets/time-ticket-tasks-presets.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
@@ -55,7 +54,6 @@ export function TimeTicketTaskModalComponent({
calculateTimeTickets={calculateTimeTickets} calculateTimeTickets={calculateTimeTickets}
/> />
<Row gutter={[16, 16]}> <Row gutter={[16, 16]}>
<Col xl={12} lg={24}> <Col xl={12} lg={24}>
<Form.Item <Form.Item
name="jobid" name="jobid"
@@ -369,7 +367,10 @@ export function TimeTicketTaskModalComponent({
</Form.Item> </Form.Item>
{bodyshop?.md_tasks_presets?.use_approvals && ( {bodyshop?.md_tasks_presets?.use_approvals && (
<Col span={24}> <Col span={24}>
<Alert message={t("tt_approvals.labels.approval_queue_in_use")} type="warning" /> <Alert
message={t("tt_approvals.labels.approval_queue_in_use")}
type="warning"
/>
</Col> </Col>
)} )}
</div> </div>

7
client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx
View File

@@ -5,15 +5,12 @@ import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { import { UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
UPDATE_TIME_TICKET, import { setModalContext } from "../../redux/modals/modals.actions";
UPDATE_TIME_TICKETS,
} from "../../graphql/timetickets.queries";
import { import {
selectBodyshop, selectBodyshop,
selectCurrentUser, selectCurrentUser,
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import { setModalContext } from "../../redux/modals/modals.actions";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,