Added page for job closing BOD-131

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

@@ -32,37 +32,41 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      width: "8%",
-      sorter: (a, b) =>
-        alphaSort(
-          a.ro_number ? a.ro_number : a.est_number,
-          b.ro_number ? b.ro_number : b.est_number
-        ),
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
       sortOrder:
         state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
 
       render: (text, record) => (
-        <Link to={"/manage/jobs/" + record.id}>
-          {record.ro_number ? record.ro_number : record.est_number}
-        </Link>
+        <Link to={"/manage/jobs/" + record.id}>{record.ro_number}</Link>
       ),
     },
+    {
+      title: t("jobs.fields.est_number"),
+      dataIndex: "est_number",
+      key: "est_number",
+      sorter: (a, b) => a.est_number - b.est_number,
+      sortOrder:
+        state.sortedInfo.columnKey === "est_number" && state.sortedInfo.order,
+
+      render: (text, record) => (
+        <Link to={"/manage/jobs/" + record.id}>{record.est_number}</Link>
+      ),
+    },
+
     {
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
       key: "owner",
-      ellipsis: true,
       sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-      width: "25%",
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
         return record.owner ? (
           <Link to={"/manage/owners/" + record.owner.id}>
-            {`${record.ownr_fn} ${record.ownr_ln}`}
+            {`${record.ownr_fn || ""} ${record.ownr_ln || ""}`}
           </Link>
         ) : (
-          <span>{`${record.ownr_fn} ${record.ownr_ln}`}</span>
+          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""}`}</span>
         );
       },
     },
@@ -70,7 +74,6 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-      width: "12%",
       ellipsis: true,
       render: (text, record) => {
         return record.ownr_ph1 ? (
@@ -85,8 +88,6 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      width: "10%",
-      ellipsis: true,
       sorter: (a, b) => alphaSort(a.status, b.status),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
@@ -99,7 +100,6 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicle",
       key: "vehicle",
-      width: "15%",
       ellipsis: true,
       render: (text, record) => {
         return record.vehicleid ? (
@@ -119,8 +119,6 @@ export default withRouter(function JobsList({
       title: t("vehicles.fields.plate_no"),
       dataIndex: "plate_no",
       key: "plate_no",
-      width: "8%",
-      ellipsis: true,
       sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
       sortOrder:
         state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
@@ -132,7 +130,6 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
-      width: "12%",
       ellipsis: true,
       sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder:
@@ -149,7 +146,6 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.clm_total"),
       dataIndex: "clm_total",
       key: "clm_total",
-      width: "10%",
       sorter: (a, b) => a.clm_total - b.clm_total,
       sortOrder:
         state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
@@ -165,7 +161,6 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.owner_owing"),
       dataIndex: "owner_owing",
       key: "owner_owing",
-      width: "8%",
       render: (text, record) => (
         <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
       ),
@@ -210,10 +205,10 @@ export default withRouter(function JobsList({
             </div>
           );
         }}
-        size="small"
+        size='small'
         pagination={{ position: "top" }}
         columns={columns.map((item) => ({ ...item }))}
-        rowKey="id"
+        rowKey='id'
         dataSource={jobs}
         rowSelection={{
           onSelect: (record) => {