BOD-17 Added Contracts list page + updates and bugfixes on other pages.

client/src/components/contracts-list/contracts-list.component.jsx

@@ -0,0 +1,102 @@
+import { Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import { alphaSort } from "../../utils/sorters";
+import { DateFormatter } from "../../utils/DateFormatter";
+
+export default function ContractsList({ loading, contracts }) {
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" }
+  });
+
+  const { t } = useTranslation();
+
+  const columns = [
+    {
+      title: t("contracts.fields.agreementnumber"),
+      dataIndex: "agreementnumber",
+      key: "agreementnumber",
+      sorter: (a, b) => a.agreementnumber - b.agreementnumber,
+      sortOrder:
+        state.sortedInfo.columnKey === "agreementnumber" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <Link to={`/manage/courtesycars/contracts/${record.id}`}>
+          {record.agreementnumber || ""}
+        </Link>
+      )
+    },
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "job.ro_number",
+      key: "job.ro_number",
+      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "job.ro_number" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <Link to={`/manage/jobs/${record.job.id}`}>
+          {record.job.ro_number || ""}
+        </Link>
+      )
+    },
+    {
+      title: t("contracts.fields.driver"),
+      dataIndex: "driver_ln",
+      key: "driver_ln",
+      sorter: (a, b) => alphaSort(a.driver_ln, b.driver_ln),
+      sortOrder:
+        state.sortedInfo.columnKey === "driver_ln" && state.sortedInfo.order,
+      render: (text, record) =>
+        `${record.driver_fn || ""} ${record.driver_ln || ""}`
+    },
+    {
+      title: t("contracts.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      sorter: (a, b) => alphaSort(a.status, b.status),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      render: (text, record) => t(record.status)
+    },
+    {
+      title: t("contracts.fields.start"),
+      dataIndex: "start",
+      key: "start",
+      sorter: (a, b) => alphaSort(a.start, b.start),
+      sortOrder:
+        state.sortedInfo.columnKey === "start" && state.sortedInfo.order,
+      render: (text, record) => <DateFormatter>{record.start}</DateFormatter>
+    },
+    {
+      title: t("contracts.fields.scheduledreturn"),
+      dataIndex: "scheduledreturn",
+      key: "scheduledreturn",
+      sorter: (a, b) => alphaSort(a.scheduledreturn, b.scheduledreturn),
+      sortOrder:
+        state.sortedInfo.columnKey === "scheduledreturn" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <DateFormatter>{record.scheduledreturn}</DateFormatter>
+      )
+    }
+  ];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+
+  return (
+    <Table
+      loading={loading}
+      size="small"
+      pagination={{ position: "top" }}
+      columns={columns.map(item => ({ ...item }))}
+      rowKey="id"
+      dataSource={contracts}
+      onChange={handleTableChange}
+    />
+  );
+}

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { alphaSort } from "../../utils/sorters";
 
-export default function JobsList({ loading, courtesycars }) {
+export default function CourtesyCarsList({ loading, courtesycars }) {
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: { text: "" }

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -0,0 +1,30 @@
+import React from "react";
+import { Menu, Dropdown, Button } from "antd";
+import { useTranslation } from "react-i18next";
+import { DownCircleFilled } from "@ant-design/icons";
+import { Link } from "react-router-dom";
+
+export default function JobsDetailHeaderActions({ job }) {
+  const { t } = useTranslation();
+  const statusmenu = (
+    <Menu key="popovermenu">
+      <Menu.Item key="cccontract">
+        <Link
+          to={{
+            pathname: "/manage/courtesycars/contracts/new",
+            state: { jobId: job.id }
+          }}
+        >
+          {t("menus.jobsactions.newcccontract")}
+        </Link>
+      </Menu.Item>
+    </Menu>
+  );
+  return (
+    <Dropdown overlay={statusmenu} key="changestatus">
+      <Button>
+        {t("general.labels.actions")} <DownCircleFilled />
+      </Button>
+    </Dropdown>
+  );
+}

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -6,7 +6,6 @@ import {
   Checkbox,
   Descriptions,
   Dropdown,
-  List,
   Menu,
   notification,
   PageHeader,
@@ -16,6 +15,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import Moment from "react-moment";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import CarImage from "../../assets/car.svg";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -23,7 +23,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import BarcodePopup from "../barcode-popup/barcode-popup.component";
 import OwnerTagPopoverComponent from "../owner-tag-popover/owner-tag-popover.component";
 import VehicleTagPopoverComponent from "../vehicle-tag-popover/vehicle-tag-popover.component";
-import { Link } from "react-router-dom";
+import JobsDetailHeaderActions from "../jobs-detail-header-actions/jobs-detail-header-actions.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -36,7 +36,6 @@ export default connect(
   job,
   mutationConvertJob,
   refetch,
-  handleFinish,
   scheduleModalState,
   bodyshop,
   updateJobStatus
@@ -99,6 +98,7 @@ export default connect(
     >
       {t("jobs.actions.convert")}
     </Button>,
+    <JobsDetailHeaderActions key="actions" job={job} />,
     <Button type="primary" key="submit" htmlType="submit">
       {t("general.actions.save")}
     </Button>
@@ -156,7 +156,7 @@ export default connect(
                 key={item.id}
                 to={`/manage/courtesycars/contracts/${item.id}`}
               >
-                <div>{`${item.start} - ${item.scheduledreturn}`}</div>
+                <div>{`${item.agreementnumber} - ${item.start} - ${item.scheduledreturn}`}</div>
               </Link>
             ))}
         </Descriptions.Item>