Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version 1.59 #171

Merged
merged 4 commits into from
Aug 18, 2024
Merged

Version 1.59 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73e1c06
Issue-168: Don't convert OAS verified date, just use value as string
simonbatson Aug 18, 2024
02fec00
Issue-168: Don't convert OAS verified date, just use value as string …
NomisNostab Aug 18, 2024
8d76876
Issue-168: Bump version
simonbatson Aug 18, 2024
e3040a5
Issue-168: Bump version (#170)
NomisNostab Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions Services/ReportService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,19 +1124,17 @@ private void GenerateOASWorksheetBodyLikeTerrain(IWorksheet sheet, IList<IGroupi
{
if (answer.InputId == "logbook_up_to_date")
{
sheet.Range[rowNumber, columnNumber].DateTime = answer.MemberAnswer.Value;
sheet.Range[rowNumber, columnNumber].NumberFormat = "dd/MM/yy";
sheet.Range[rowNumber, columnNumber].Text = answer.MemberAnswer;

}
sheet.Range[rowNumber, columnNumber].CellStyle.HorizontalAlignment = ExcelHAlign.HAlignCenter;
sheet.Range[rowNumber, columnNumber].CellStyle.Color = Color.DarkSeaGreen;
}
else
{
if (answer.MemberAnswer.HasValue)
if (!string.IsNullOrEmpty(answer.MemberAnswer))
{
sheet.Range[rowNumber, columnNumber].DateTime = answer.MemberAnswer.Value;
sheet.Range[rowNumber, columnNumber].NumberFormat = "dd/MM/yy";
sheet.Range[rowNumber, columnNumber].Text = answer.MemberAnswer;

}
else
Expand Down Expand Up @@ -1212,18 +1210,16 @@ private void GenerateOASWorksheetBodyOriginal(IWorksheet sheet, IList<IGrouping<
{
if (answer.InputId == "logbook_up_to_date")
{
sheet.Range[rowNumber, columnNumber].DateTime = answer.MemberAnswer.Value;
sheet.Range[rowNumber, columnNumber].NumberFormat = "dd/MM/yy";
sheet.Range[rowNumber, columnNumber].Text = answer.MemberAnswer;
}
sheet.Range[rowNumber, columnNumber].CellStyle.HorizontalAlignment = ExcelHAlign.HAlignCenter;
sheet.Range[rowNumber, columnNumber].CellStyle.Color = Color.DarkSeaGreen;
}
else
{
if (answer.MemberAnswer.HasValue)
if (!string.IsNullOrEmpty(answer.MemberAnswer))
{
sheet.Range[rowNumber, columnNumber].DateTime = answer.MemberAnswer.Value;
sheet.Range[rowNumber, columnNumber].NumberFormat = "dd/MM/yy";
sheet.Range[rowNumber, columnNumber].Text = answer.MemberAnswer;
}
else
{
Expand Down
15 changes: 7 additions & 8 deletions Topo/Services/OASService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ private async Task<List<OASWorksheetAnswers>> GenerateOASWorksheetAnswers(string
MemberId = member.id,
MemberName = $"{member.first_name} {member.last_name}",
MemberPatrol = member.patrol_name,
MemberAnswer = null,
MemberAnswer = "",
Answered = false,
Awarded = false
};
Expand Down Expand Up @@ -234,13 +234,12 @@ private async Task<List<OASWorksheetAnswers>> GenerateOASWorksheetAnswers(string
{
if (answer.Key == "logbook_up_to_date" && answer.Value == "true")
{
worksheetAnswer.MemberAnswer = "Yes";
worksheetAnswer.Answered = true;
}
else
{
// Conver string date from dd/mm/yyyy format
var verifiedDate = DateTime.ParseExact(answer.Value, "dd/MM/yyyy", CultureInfo.InvariantCulture);
worksheetAnswer.MemberAnswer = verifiedDate;
worksheetAnswer.MemberAnswer = answer.Value;
worksheetAnswer.Answered = true;
}
}
Expand Down Expand Up @@ -276,7 +275,7 @@ private async Task<List<OASWorksheetAnswers>> GenerateOASWorksheetAnswers(string
{
if (worksheetAnswer != null)
{
worksheetAnswer.MemberAnswer = importedDate;
worksheetAnswer.MemberAnswer = importedDate.ToString("dd/MM/yy");
worksheetAnswer.Answered = true;
worksheetAnswer.Awarded = true;
}
Expand All @@ -295,7 +294,7 @@ private async Task<List<OASWorksheetAnswers>> GenerateOASWorksheetAnswers(string
if (worksheetAnswer != null)
{
{
worksheetAnswer.MemberAnswer = memberAchievement.status_updated;
worksheetAnswer.MemberAnswer = memberAchievement.status_updated.ToString("dd/MM/yy");
worksheetAnswer.Answered = true;
worksheetAnswer.Awarded = true;
}
Expand All @@ -313,7 +312,7 @@ private async Task<List<OASWorksheetAnswers>> GenerateOASWorksheetAnswers(string
.FirstOrDefault();
if (worksheetAnswer != null)
{
worksheetAnswer.MemberAnswer = memberAchievement.status_updated;
worksheetAnswer.MemberAnswer = memberAchievement.status_updated.ToString("dd/MM/yy");
worksheetAnswer.Answered = true;
worksheetAnswer.Awarded = true;
}
Expand All @@ -335,7 +334,7 @@ private async Task<List<OASWorksheetAnswers>> GenerateOASWorksheetAnswers(string
.FirstOrDefault();
if (logbookUpToDate != null)
{
logbookUpToDate.MemberAnswer = memberAchievement.status_updated;
logbookUpToDate.MemberAnswer = memberAchievement.status_updated.ToString("dd/MM/yy");
logbookUpToDate.Answered = true;
logbookUpToDate.Awarded = true;
}
Expand Down
2 changes: 1 addition & 1 deletion Topo/Services/StorageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@ public bool IsYouthMember
}
}

public string Version = "1.58";
public string Version = "1.59";
}
}