diff --git a/Controllers/RoFive.Controller.cs b/Controllers/RoFive.Controller.cs index e057e99..e8c03f9 100644 --- a/Controllers/RoFive.Controller.cs +++ b/Controllers/RoFive.Controller.cs @@ -4113,13 +4113,19 @@ namespace rmutr_report.Controllers public IActionResult GetForm2Report([FromRoute] string type, [FromBody] form_1_2 form1) { - form1.dates = form1.date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); - form1.day_start_workings = - form1.start_working.Value.ToString("dd", CultureInfo.CreateSpecificCulture("th-TH")); - form1.month_start_workings = - form1.start_working.Value.ToString("MMMM", CultureInfo.CreateSpecificCulture("th-TH")); - form1.year_start_workings = - form1.start_working.Value.ToString("yyyy", CultureInfo.CreateSpecificCulture("th-TH")); + if (form1.date != null) + { + form1.dates = form1.date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); + } + if (form1.start_working != null) + { + form1.day_start_workings = + form1.start_working.Value.ToString("dd", CultureInfo.CreateSpecificCulture("th-TH")); + form1.month_start_workings = + form1.start_working.Value.ToString("MMMM", CultureInfo.CreateSpecificCulture("th-TH")); + form1.year_start_workings = + form1.start_working.Value.ToString("yyyy", CultureInfo.CreateSpecificCulture("th-TH")); + } var form_1 = new List() { form1 }; Report report = new Report();