From cc825369703434bc8f6a4a8cb19911d301507d87 Mon Sep 17 00:00:00 2001
From: Alex H <hessmikey@gmail.com>
Date: Wed, 19 Apr 2023 02:24:28 +0000
Subject: [PATCH] fixed error in if logic which caused all fields to be
 returned as true

---
 ui/src/router/views/import-generic.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ui/src/router/views/import-generic.vue b/ui/src/router/views/import-generic.vue
index 5a3db76..0c53133 100644
--- a/ui/src/router/views/import-generic.vue
+++ b/ui/src/router/views/import-generic.vue
@@ -16,7 +16,7 @@ export default {
       required: true,
     },
   },
-  data: function () {
+  data: function() {
     return {
       file: null,
       tryingToCreate: false,
@@ -118,15 +118,19 @@ export default {
             item[k] = comments(row)
           } else if (k === 'totalAmount') {
             item[k] = calculateTotal(row)
-          } else if (this.isFullTankString) {
-            item[k] = setFullTank(row)
           } else if (k === 'isTankFull') {
-            if (this.invertFullTank) {
-              item[k] = Boolean(!row[headings[k]])
+            if (this.isFullTankString) {
+              item[k] = setFullTank(row)
             } else {
-              item[k] = Boolean(row[headings[k]])
+              if (this.invertFullTank) {
+                item[k] = Boolean(!row[headings[k]])
+              } else {
+                item[k] = Boolean(row[headings[k]])
+              }
             }
           } else if (k === 'hasMissedFillup') {
+            // TODO: need to account for this field being a string
+            item[k] = Boolean(row[headings[k]])
           } else if (k === 'date') {
             item[k] = new Date(row[headings[k]]).toISOString()
           } else {
@@ -405,4 +409,3 @@ export default {
     </b-message>
   </Layout>
 </template>
-