Merged in release/2022-05-20 (pull request #487)

release/2022-05-20

Approved-by: Patrick Fic

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

@@ -3,6 +3,7 @@ import { Button, Card, Input, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 
@@ -105,6 +106,17 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           </Link>
         ) : null,
     },
+    {
+      title: t("contracts.fields.scheduledreturn"),
+      dataIndex: "scheduledreturn",
+      key: "scheduledreturn",
+      render: (text, record) =>
+        record.cccontracts.length === 1 && (
+          <DateTimeFormatter>
+            {record.cccontracts[0].scheduledreturn}
+          </DateTimeFormatter>
+        ),
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {

client/src/graphql/courtesy-car.queries.js

@@ -86,6 +86,7 @@ export const QUERY_ALL_CC = gql`
         limit: 1
       ) {
         id
+        scheduledreturn
         job {
           id
           ro_number