From 7f15e9ef7a4f337341ba75e96895214eed731de8 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 4 Feb 2022 09:29:37 -0800
Subject: [PATCH] IO-1695 Add validation to time ticket window for clock times.

---
 bodyshop_translations.babel                   | 49 ++++++++++++++++++-
 .../bill-form/bill-form.lines.component.jsx   |  2 +-
 .../time-ticket-modal.component.jsx           | 24 ++++++++-
 client/src/translations/en_us/common.json     |  4 ++
 client/src/translations/es/common.json        |  4 ++
 client/src/translations/fr/common.json        |  4 ++
 6 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index edec30bd5..c18ffea89 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -40261,6 +40261,53 @@
                                     </concept_node>
                                 </children>
                             </folder_node>
+                            <folder_node>
+                                <name>validation</name>
+                                <children>
+                                    <concept_node>
+                                        <name>clockoffmustbeafterclockon</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>clockoffwithoutclockon</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                </children>
+                            </folder_node>
                         </children>
                     </folder_node>
                     <folder_node>
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index 1c1b198b9..b8a1b5c9d 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -421,7 +421,7 @@ export function BillEnterModalLinesComponent({
                     </Form.Item>
                     {price &&
                       adjustmentRate &&
-                      `${(price / adjustmentRate).toFixed(2)} hrs`}
+                      `${(price / adjustmentRate).toFixed(1)} hrs`}
                   </div>
                 );
               return <></>;
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 593891939..2e362cc22 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -221,7 +221,29 @@ export function TimeTicketModalComponent({
                 }
               />
             </Form.Item>
-            <Form.Item label={t("timetickets.fields.clockoff")} name="clockoff">
+            <Form.Item
+              label={t("timetickets.fields.clockoff")}
+              name="clockoff"
+              rules={[
+                ({ getFieldValue }) => ({
+                  validator(rule, value) {
+                    const clockon = getFieldValue("clockon");
+                    console.log(value, clockon);
+                    if (!value) return Promise.resolve();
+                    if (!clockon && value)
+                      return Promise.reject(
+                        t("timetickets.validation.clockoffwithoutclockon")
+                      );
+                    if (!value.isSameOrAfter(clockon))
+                      return Promise.reject(
+                        t("timetickets.validation.clockoffmustbeafterclockon")
+                      );
+
+                    return Promise.resolve();
+                  },
+                }),
+              ]}
+            >
               <FormDateTimePicker
                 disabled={
                   !HasRbacAccess({
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index b75df9c04..5d75851df 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2406,6 +2406,10 @@
 				"clockedout": "Clocked out successfully.",
 				"created": "Time ticket entered successfully.",
 				"deleted": "Time ticket deleted successfully."
+			},
+			"validation": {
+				"clockoffmustbeafterclockon": "Clock off time must be the same or after clock in time.",
+				"clockoffwithoutclockon": "Clock off time cannot be set without a clock in time."
 			}
 		},
 		"titles": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 2a1bd2a05..5db600799 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2406,6 +2406,10 @@
 				"clockedout": "",
 				"created": "",
 				"deleted": ""
+			},
+			"validation": {
+				"clockoffmustbeafterclockon": "",
+				"clockoffwithoutclockon": ""
 			}
 		},
 		"titles": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 2a6de9d14..0885b35ac 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2406,6 +2406,10 @@
 				"clockedout": "",
 				"created": "",
 				"deleted": ""
+			},
+			"validation": {
+				"clockoffmustbeafterclockon": "",
+				"clockoffwithoutclockon": ""
 			}
 		},
 		"titles": {