Skip to content

Commit

Permalink
Version 1.42 (#85)
Browse files Browse the repository at this point in the history
  • Loading branch information
@NomisNostab
NomisNostab authored Jun 8, 2023
2 parents df98de7 + f91180d commit a326f97
Show file tree
Hide file tree
Showing 11 changed files with 149 additions and 86 deletions.
1 change: 1 addition & 0 deletions Model/Approvals/ApprovalsPageViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ public class ApprovalsPageViewModel
public bool ToBePresented { get; set; }
public bool IsPresented { get; set; }
public string GroupName { get; set; } = string.Empty;
public bool ShowRejected { get; set; }
}
}
2 changes: 2 additions & 0 deletions Model/OAS/OASWorksheetAnswers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@ public class OASWorksheetAnswers
public string MemberName { get; set; } = string.Empty;
public DateTime? MemberAnswer { get; set; }
public string MemberPatrol { get; set; } = string.Empty;
public bool Answered { get; set; }
public bool Awarded { get; set; }
}
}
57 changes: 41 additions & 16 deletions Services/ReportService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1114,18 +1114,30 @@ private void GenerateOASWorksheetBodyLikeTerrain(IWorksheet sheet, IList<IGroupi
foreach (var answer in groupedAnswer.OrderBy(ga => ga.InputTitleSortIndex).ThenBy(ga => ga.InputSortIndex))
{
rowNumber++;
if (answer.MemberAnswer.HasValue)
if (answer.Answered)
{
sheet.Range[rowNumber, columnNumber].DateTime = answer.MemberAnswer.Value;
sheet.Range[rowNumber, columnNumber].CellStyle.Color = Color.DarkSeaGreen;
if (answer.Awarded)
{
if (answer.InputId == "logbook_up_to_date")
{
sheet.Range[rowNumber, columnNumber].DateTime = answer.MemberAnswer.Value;
}
sheet.Range[rowNumber, columnNumber].CellStyle.HorizontalAlignment = ExcelHAlign.HAlignCenter;
sheet.Range[rowNumber, columnNumber].CellStyle.Color = Color.DarkSeaGreen;
}
else
{
sheet.Range[rowNumber, columnNumber].Text = "Y";
sheet.Range[rowNumber, columnNumber].CellStyle.HorizontalAlignment = ExcelHAlign.HAlignCenter;
sheet.Range[rowNumber, columnNumber].CellStyle.Color = Color.Orange;
}
}
sheet.Range[rowNumber, columnNumber].BorderAround();
}
rowNumber = titleRow;
sheet.AutofitColumn(columnNumber);
}

// sheet.Range[1, 1, rowNumber, columnNumber].AutofitColumns();

}
private void GenerateOASWorksheetBodyOriginal(IWorksheet sheet, IList<IGrouping<string, OASWorksheetAnswers>> groupedAnswers, ref int rowNumber, ref int columnNumber)
Expand Down Expand Up @@ -1179,10 +1191,23 @@ private void GenerateOASWorksheetBodyOriginal(IWorksheet sheet, IList<IGrouping<
foreach (var answer in groupedAnswer.OrderBy(ga => ga.InputTitleSortIndex).ThenBy(ga => ga.InputSortIndex))
{
columnNumber++;
if (answer.MemberAnswer.HasValue)
if (answer.Answered)
{
sheet.Range[rowNumber, columnNumber].DateTime = answer.MemberAnswer.Value;
sheet.Range[rowNumber, columnNumber].CellStyle.Color = Color.DarkSeaGreen;
if (answer.Awarded)
{
if (answer.InputId == "logbook_up_to_date")
{
sheet.Range[rowNumber, columnNumber].DateTime = answer.MemberAnswer.Value;
}
sheet.Range[rowNumber, columnNumber].CellStyle.HorizontalAlignment = ExcelHAlign.HAlignCenter;
sheet.Range[rowNumber, columnNumber].CellStyle.Color = Color.DarkSeaGreen;
}
else
{
sheet.Range[rowNumber, columnNumber].Text = "Y";
sheet.Range[rowNumber, columnNumber].CellStyle.HorizontalAlignment = ExcelHAlign.HAlignCenter;
sheet.Range[rowNumber, columnNumber].CellStyle.Color = Color.Orange;
}
}
sheet.Range[rowNumber, columnNumber].BorderAround();
}
Expand Down Expand Up @@ -2042,7 +2067,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "bushcraft" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "bushcraft" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand All @@ -2059,7 +2084,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "bushwalking" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "bushwalking" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand All @@ -2076,7 +2101,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "camping" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "camping" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand All @@ -2093,7 +2118,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "apline" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "apline" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand All @@ -2110,7 +2135,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "cycling" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "cycling" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand All @@ -2127,7 +2152,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "vertical" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "vertical" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand All @@ -2144,7 +2169,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "aquatics" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "aquatics" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand All @@ -2161,7 +2186,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "boating" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "boating" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand All @@ -2178,7 +2203,7 @@ public IWorkbook GenerateProgressWorkbook(ProgressDetailsPageViewModel progressE
sheet.Range[rowNumber, 1].CellStyle.Font.Bold = true;
for (int i = 1; i < 10; i++)
{
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "paddling" && o.Stage == i).FirstOrDefault();
var oas = progressEntries.OASSummaries.Where(o => o.Stream == "paddling" && o.Stage == i).OrderByDescending(o => o.Awarded).FirstOrDefault();
var oasText = "";
if (oas != null)
{
Expand Down
2 changes: 2 additions & 0 deletions Topo/Controller/ApprovalsController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ internal async Task RefreshApprovalsClick()
model.Approvals = model.Approvals.Where(a => !string.IsNullOrEmpty(a.submission_outcome) && !a.presented_date.HasValue).ToList();
if (model.IsPresented)
model.Approvals = model.Approvals.Where(a => a.presented_date.HasValue && a.presented_date != a.awarded_date).ToList();
if (!model.ShowRejected)
model.Approvals = model.Approvals.Where(a => a.submission_outcome.ToLower() != "rejected").ToList();
}
}

Expand Down
13 changes: 10 additions & 3 deletions Topo/Pages/Approvals/Approvals.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,24 @@
<label class="col-sm-2 form-check-label" for="toBePresented">
To be presented
</label>
<div class="col-sm-3">
<div class="col-sm-1">
<InputCheckbox id="toBePresented" class="form-check-input"
@bind-Value="model.ToBePresented" />
</div>
<label for="isPresented" class="col-sm-2 form-check-label">
<label class="col-sm-2 form-check-label" for="isPresented">
Has been presented
</label>
<div class="col-sm-3">
<div class="col-sm-1">
<InputCheckbox id="isPresented" class="form-check-input"
@bind-Value="model.IsPresented" />
</div>
<label class="col-sm-2 form-check-label" for="showRejected">
Show Rejected
</label>
<div class="col-sm-1">
<InputCheckbox id="showRejected" class="form-check-input"
@bind-Value="model.ShowRejected" />
</div>
</div>

<div class="mt-3 mb-3 row">
Expand Down
Loading

0 comments on commit a326f97

Please sign in to comment.