Version 1.54 (#147)

NomisNostab · May 16, 2024 · a1b5417 · a1b5417
2 parents 64d03f7 + f8dbecf
commit a1b5417
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/Services/ReportService.cs b/Services/ReportService.cs
@@ -2226,7 +2226,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
             // Peak Award
             rowNumber++;
             rowNumber++;
-            sheet.Range[rowNumber, 1].Text = "Peak Award";
+            sheet.Range[rowNumber, 1].Text = $"Peak Award: {(string.IsNullOrEmpty(progressEntries.PeakAward.Awarded) ? "" : "Awarded " + progressEntries.PeakAward.Awarded)}";
             sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
 
             rowNumber++;
@@ -2244,7 +2244,6 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
             sheet.Range[rowNumber, 2].Text = progressEntries.PeakAward.PersonalReflection;
 
 
-
             sheet.Range[1, 1, rowNumber, 10].AutofitColumns();
 
             sheet.PageSetup.PaperSize = ExcelPaperSize.PaperA4;

diff --git a/Topo/Pages/Program.razor b/Topo/Pages/Program.razor
@@ -73,14 +73,17 @@
             <div class="col-sm-1">
                 <strong>Lead</strong>
             </div>
-            <div class="col-sm-2">
+            <div class="col-sm-1">
                 <strong>Assist</strong>
             </div>
             <div class="col-sm-1">
                 <strong>Challenge</strong>
             </div>
             <div class="col-sm-1">
-                <strong>Event</strong>
+                <strong>Scope</strong>
+            </div>
+            <div class="col-sm-1">
+                <strong>State</strong>
             </div>
             <div class="col-sm-2">
             </div>
@@ -101,7 +104,7 @@
                 <div class="col-sm-1">
                     @item.Lead
                 </div>
-                <div class="col-sm-2">
+                <div class="col-sm-1">
                     @item.Assist
                 </div>
                 <div class="col-sm-1">
@@ -110,6 +113,9 @@
                 <div class="col-sm-1">
                     @(item.IsUnitEvent ? "Unit" : "Group")
                 </div>
+                <div class="col-sm-1">
+                    @item.EventStatus
+                </div>
                 <div class="col-sm-2">
                     <button @onclick="@(e => SignInSheetClick(item.Id))" class="btn btn-link pt-0 pb-0">Sign in</button>
                     <button @onclick="@(e => EventAttendanceClick(item.Id))" class="btn btn-link pt-0 pb-0">Attendance</button>

diff --git a/Topo/Services/StorageService.cs b/Topo/Services/StorageService.cs
@@ -117,6 +117,6 @@ public bool IsYouthMember
             }
         }
 
-        public string Version = "1.53";
+        public string Version = "1.54";
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -117,6 +117,6 @@ public bool IsYouthMember @@
                 }
             }
-            public string Version = "1.53";
+            public string Version = "1.54";
         }
     }