Skip to content

Commit

Permalink
Version 1.59 (#171)
Browse files Browse the repository at this point in the history
  • Loading branch information
@NomisNostab
NomisNostab authored Aug 18, 2024
2 parents fa64108 + e3040a5 commit 9d85dd8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 19 deletions.
16 changes: 6 additions & 10 deletions Services/ReportService.cs
View file
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
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 = "",

Check failure on line 209 in Topo/Services/OASService.cs

View workflow job for this annotation

GitHub Actions / deploy-to-github-pages 

Cannot implicitly convert type 'string' to 'System.DateTime?'
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";

Check failure on line 237 in Topo/Services/OASService.cs

View workflow job for this annotation

GitHub Actions / deploy-to-github-pages 

Cannot implicitly convert type 'string' to 'System.DateTime?'
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;

Check failure on line 242 in Topo/Services/OASService.cs

View workflow job for this annotation

GitHub Actions / deploy-to-github-pages 

Cannot implicitly convert type 'string' to 'System.DateTime?'
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");

Check failure on line 278 in Topo/Services/OASService.cs

View workflow job for this annotation

GitHub Actions / deploy-to-github-pages 

Cannot implicitly convert type 'string' to 'System.DateTime?'
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");

Check failure on line 297 in Topo/Services/OASService.cs

View workflow job for this annotation

GitHub Actions / deploy-to-github-pages 

Cannot implicitly convert type 'string' to 'System.DateTime?'
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");

Check failure on line 315 in Topo/Services/OASService.cs

View workflow job for this annotation

GitHub Actions / deploy-to-github-pages 

Cannot implicitly convert type 'string' to 'System.DateTime?'
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");

Check failure on line 337 in Topo/Services/OASService.cs

View workflow job for this annotation

GitHub Actions / deploy-to-github-pages 

Cannot implicitly convert type 'string' to 'System.DateTime?'
logbookUpToDate.Answered = true;
logbookUpToDate.Awarded = true;
}
Expand Down
2 changes: 1 addition & 1 deletion Topo/Services/StorageService.cs
View file
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";
}
}

0 comments on commit 9d85dd8

Please sign in to comment.