From bd8b961bda90041553c103a53be26d703e4af6d1 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 20 May 2022 08:53:37 -0700
Subject: [PATCH] IO-1894 Add scheduled return to all cc list.

---
 .../courtesy-cars-list.component.jsx                 | 12 ++++++++++++
 client/src/graphql/courtesy-car.queries.js           |  1 +
 2 files changed, 13 insertions(+)

diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
index 9e725514b..a488368b9 100644
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/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) => {
diff --git a/client/src/graphql/courtesy-car.queries.js b/client/src/graphql/courtesy-car.queries.js
index efb24b2c1..d4e19bac8 100644
--- a/client/src/graphql/courtesy-car.queries.js
+++ b/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