From 06404012c33caef0d19026a6af7abd8daf16712f Mon Sep 17 00:00:00 2001
From: will-t <w98434545@gmail.com>
Date: Mon, 24 Apr 2023 11:03:34 -0500
Subject: [PATCH 1/3] #65 - Added Locking System updates to modal duplicate
 section

---
 .../utility-optical-recognition.component.ts         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/app/utility-optical-recognition/utility-optical-recognition.component.ts b/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
index 2d598962..8b75ecea 100644
--- a/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
+++ b/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
@@ -676,6 +676,18 @@ export class UtilityOpticalRecognitionComponent implements OnInit {
     }
     this.add_to_json(this.GetProfile.attribute123, this.ocrResult);
     this.set_json();
+    if(this.GetProfile.attribute123.includes("Read Date")){
+      this.toDo = this.toDo.filter(item => item !== "Read Date");
+    } else if(this.GetProfile.attribute123.includes("Total Energy Use")){
+      this.toDo = this.toDo.filter(item => item !== "Total Energy Use");
+    } else if(this.GetProfile.attribute123.includes("Total Volume")){
+      this.toDo = this.toDo.filter(item => item !== "Total Volume");
+    }
+
+    // if toDo list is empty, hide it
+    if(this.toDo.length == 0){
+      this.showToDoAlert = false;
+    }
     await (await worker).terminate();
     this.startProcessing(null);
     this.currentpage = 1;

From 5c6f25ac1c48fef975b43eb2e3d34e8473f1386a Mon Sep 17 00:00:00 2001
From: will-t <w98434545@gmail.com>
Date: Mon, 24 Apr 2023 12:29:30 -0500
Subject: [PATCH 2/3] #65 removed bug dealing with multiple profile runs

---
 .../utility-optical-recognition.component.ts  | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/app/utility-optical-recognition/utility-optical-recognition.component.ts b/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
index 8b75ecea..f1a6f55a 100644
--- a/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
+++ b/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
@@ -150,28 +150,6 @@ export class UtilityOpticalRecognitionComponent implements OnInit {
 
   ngOnInit(): void {
     this.setupBillAttributes();
-
-    // set required attributes
-    this.undefinedMeterData.forEach(subArray => {
-      if(subArray.includes('Read Date')){
-        this.toDo.push(subArray[0]);
-      } else if(subArray.includes('Total Volume')){
-        this.toDo.push(subArray[0]);
-      } else if(subArray.includes('Total Energy Use')){
-        this.toDo.push(subArray[0]);
-      }
-    });
-
-    this.tempArrayAttributeNames.forEach(subArray => {
-      if(subArray.includes('Read Date')){
-        this.toDo.push(subArray[0]);
-      } else if(subArray.includes('Total Volume')){
-        this.toDo.push(subArray[0]);
-      } else if(subArray.includes('Total Energy Use')){
-        this.toDo.push(subArray[0]);
-      }
-    });
-
     // start scan profile
     this.newScanProfile = this.scanProfileDbService.getnewUtilityMeterProfile();
     this.interface.accountId = this.editMeter.accountId;
@@ -226,6 +204,28 @@ export class UtilityOpticalRecognitionComponent implements OnInit {
     } else{
       alert('please upload pdf file')
     }
+    //setup required attributes
+    this.undefinedMeterData.forEach(subArray => {
+      if(subArray.includes('Read Date')){
+        this.toDo.push(subArray[0]);
+      } else if(subArray.includes('Total Volume')){
+        this.toDo.push(subArray[0]);
+      } else if(subArray.includes('Total Energy Use')){
+        this.toDo.push(subArray[0]);
+      }
+    });
+
+    this.tempArrayAttributeNames.forEach(subArray => {
+      if(subArray.includes('Read Date')){
+        this.toDo.push(subArray[0]);
+      } else if(subArray.includes('Total Volume')){
+        this.toDo.push(subArray[0]);
+      } else if(subArray.includes('Total Energy Use')){
+        this.toDo.push(subArray[0]);
+      }
+    });
+    //filter out duplicates and single letters (i.e. 'R' 'T');
+    this.toDo = this.toDo.filter((item, index) => this.toDo.indexOf(item) === index && item.length > 1);
   }
 
   public afterLoadComplete(pdf: PDFDocumentProxy) {
@@ -509,6 +509,7 @@ export class UtilityOpticalRecognitionComponent implements OnInit {
 
   saveChanges(){
     if(this.toDo.length == 0){
+      alert(this.toDo.length)
       this.showToDoAlert = false;
       this.endProfile();
     } else {
@@ -647,6 +648,7 @@ export class UtilityOpticalRecognitionComponent implements OnInit {
         }
        
       }
+
       this.counterVar++;
     });
     

From b671a611c9fefaba78d1f53469c59b44f552f105 Mon Sep 17 00:00:00 2001
From: will-t <w98434545@gmail.com>
Date: Mon, 24 Apr 2023 13:38:36 -0500
Subject: [PATCH 3/3] #65 removed excess print statements

---
 .../utility-optical-recognition.component.ts                     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/utility-optical-recognition/utility-optical-recognition.component.ts b/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
index f1a6f55a..883d0d8e 100644
--- a/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
+++ b/src/app/utility-optical-recognition/utility-optical-recognition.component.ts
@@ -509,7 +509,6 @@ export class UtilityOpticalRecognitionComponent implements OnInit {
 
   saveChanges(){
     if(this.toDo.length == 0){
-      alert(this.toDo.length)
       this.showToDoAlert = false;
       this.endProfile();
     } else {