From cf8c004d09338182bf20f6dc9ecb7edbe8afd5b0 Mon Sep 17 00:00:00 2001
From: Simon <simon@batson.id.au>
Date: Tue, 13 Jun 2023 21:26:09 +1000
Subject: [PATCH] Issue-86: Include approval type when matching save approvals

---
 Topo/Services/ApprovalsService.cs                 | 2 +-
 Topo/Shared/NavMenu.razor                         | 2 +-
 TopoReportFunction/aws-lambda-tools-defaults.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Topo/Services/ApprovalsService.cs b/Topo/Services/ApprovalsService.cs
index 343a4d5..41b7937 100644
--- a/Topo/Services/ApprovalsService.cs
+++ b/Topo/Services/ApprovalsService.cs
@@ -169,7 +169,7 @@ public async Task<List<ApprovalsListModel>> GetApprovalListItems(string unitId)
                 }
             }
             // Get items in allTerrainApprovals that are not in savedApprovalItems, these are new since last time
-            var newSubmissions = allTerrainApprovals.Where(all => savedApprovalItems.Count(x => x.achievement_id == all.achievement_id) == 0).ToList();
+            var newSubmissions = allTerrainApprovals.Where(all => savedApprovalItems.Count(x => x.achievement_id == all.achievement_id && x.submission_type == all.submission_type) == 0).ToList();
 
             foreach (var newApproval in newSubmissions)
             {
diff --git a/Topo/Shared/NavMenu.razor b/Topo/Shared/NavMenu.razor
index 32f5ade..ba8ac7e 100644
--- a/Topo/Shared/NavMenu.razor
+++ b/Topo/Shared/NavMenu.razor
@@ -88,7 +88,7 @@
         }
         <div class="nav-item px-3">
             <NavLink class="nav-link disabled" href="" >
-                <span class="" aria-hidden="true"></span> Version 1.42
+                <span class="" aria-hidden="true"></span> Version 1.43
             </NavLink>
         </div>
 
diff --git a/TopoReportFunction/aws-lambda-tools-defaults.json b/TopoReportFunction/aws-lambda-tools-defaults.json
index c1c6670..c8489f5 100644
--- a/TopoReportFunction/aws-lambda-tools-defaults.json
+++ b/TopoReportFunction/aws-lambda-tools-defaults.json
@@ -6,7 +6,7 @@
         "dotnet lambda help",
         "All the command line options for the Lambda command can be specified in this file."
     ],
-    "profile"     : "default",
+    "profile"     : "VSUser",
     "region"      : "ap-southeast-2",
     "configuration" : "Release",
     "function-runtime" : "dotnet6",