Added admin actions to view model and get all reports request. Is opt…

…ional, so only used in specific cases on the frontend.
gordon-cs · Nov 29, 2024 · d387963 · d387963
1 parent e2cf25e
commit d387963
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/Gordon360/Documentation/Gordon360.xml b/Gordon360/Documentation/Gordon360.xml
diff --git a/Gordon360/Models/ViewModels/MissingItemReportViewModel.cs b/Gordon360/Models/ViewModels/MissingItemReportViewModel.cs
@@ -1,7 +1,6 @@
-using Gordon360.Models.CCT;
-using System;
+using System;
 using System.Linq;
-using System.Reflection;
+using System.Collections.Generic;
 
 namespace Gordon360.Models.ViewModels
 {
@@ -44,6 +43,8 @@ public class MissingItemReportViewModel
 
         public bool forGuest { get; set; }
 
+        public IEnumerable<ActionsTakenViewModel>? adminActions { get; set; }
+
         public static implicit operator MissingItemReportViewModel(CCT.MissingItemData MissingReportDBModel) => new MissingItemReportViewModel
         {
             recordID = MissingReportDBModel.ID,

diff --git a/Gordon360/Services/LostAndFoundService.cs b/Gordon360/Services/LostAndFoundService.cs
@@ -223,7 +223,20 @@ public IEnumerable<MissingItemReportViewModel> GetMissingItems(string username)
         public IEnumerable<MissingItemReportViewModel> GetMissingItemsAll()
         {
             IEnumerable<MissingItemData> missingList = context.MissingItemData.AsEnumerable();
-            return missingList.Select(x => (MissingItemReportViewModel)x);
+            IEnumerable<MissingItemReportViewModel>missingModelList = missingList.Select(x => (MissingItemReportViewModel)x);
+            List<IEnumerable<ActionsTakenViewModel>> actionsTakenList = [];
+            foreach (MissingItemReportViewModel item in missingModelList)
+            {
+                if (item.recordID != null)
+                {
+                    actionsTakenList.Add(GetActionsTaken((int)item.recordID));
+                }
+            }
+
+            IEnumerator<IEnumerable<ActionsTakenViewModel>> actionsTakenEnumerator = actionsTakenList.GetEnumerator();
+
+            missingModelList = missingModelList.Select(x => { actionsTakenEnumerator.MoveNext(); x.adminActions = actionsTakenEnumerator.Current; return x; });
+            return missingModelList;
         }
 
         /// <summary>