fixes to warranty_amc_end_of_validity

ohcnetwork · Oct 3, 2023 · 855de50 · 855de50
1 parent 12f9c6f
commit 855de50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
@@ -966,7 +966,9 @@ export const XLSXAssetImportSchema = {
     type: String,
     parse: (date: string) => {
       if (!date) return null;
-      const parsed = new Date(date);
+      const parts = date.split("-");
+      const reformattedDateStr = `${parts[2]}-${parts[1]}-${parts[0]}`;
+      const parsed = new Date(reformattedDateStr);
 
       if (String(parsed) === "Invalid Date") {
         throw new Error("Invalid Warranty End Date:" + date);
@@ -980,7 +982,9 @@ export const XLSXAssetImportSchema = {
     type: String,
     parse: (date: string) => {
       if (!date) return null;
-      const parsed = new Date(date);
+      const parts = date.split("-");
+      const reformattedDateStr = `${parts[2]}-${parts[1]}-${parts[0]}`;
+      const parsed = new Date(reformattedDateStr);
 
       if (String(parsed) === "Invalid Date") {
         throw new Error("Invalid Last Service Date:" + date);

diff --git a/src/Components/Assets/AssetImportModal.tsx b/src/Components/Assets/AssetImportModal.tsx
@@ -129,13 +129,16 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
         qr_code_id: asset.qr_code_id,
         manufacturer: asset.manufacturer,
         meta: { ...asset.meta },
-        warranty_amc_end_of_validity: asset.warranty_amc_end_of_validity,
         note: asset.notes,
       };
 
       if (asset.last_serviced_on)
         asset_data["last_serviced_on"] = asset.last_serviced_on;
 
+      if (asset.warranty_amc_end_of_validity)
+        asset_data["warranty_amc_end_of_validity"] =
+          asset.warranty_amc_end_of_validity;
+
       const response = await fetch("/api/v1/asset/", {
         method: "POST",
         headers: {