kamonwantaengsuk/rmutr_report
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

bug fixed
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-08-04 16:55:05 +07:00
parent 6e389605d9
commit bc55d24121
21 changed files with 224 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Controllers/Budget.Controller.cs
View File

@@ -33,7 +33,6 @@ namespace rmutr_report.Controllers
{
foreach (var x in budget_reports)
{
int sum1 = budget_reports.Sum(g => int.Parse(g.salaya));
x.sum1 = sum1;
int sum2 = budget_reports.Sum(g => int.Parse(g.bophitphimuk));
@@ -2793,7 +2792,7 @@ namespace rmutr_report.Controllers
{
detail.row_no = null;
}
}
}
var summaryBudget = new List<summary_subsidy_projects>() { budget };
@@ -2819,7 +2818,7 @@ namespace rmutr_report.Controllers
return File(
stream,
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"project_summary_subsidy" + ".xlsx");
"project_summary_subsidy" + ".xlsx");
}
return Ok();

20
Controllers/RoFive.Controller.cs
View File

@@ -613,6 +613,16 @@ namespace rmutr_report.Controllers
public IActionResult GetEstimateReport([FromRoute] string type,
[FromBody] revenue_estimate_education_fee estimate)
{
if (estimate.budget_project_name_th != null)
{
string myStr = estimate.budget_project_name_th;
string[] projectname = myStr.Split("ผู้สำเร็จการศึกษา");
foreach (string projectnames in projectname)
{
estimate.side = projectnames;
}
}
var estimateEducation = new List<revenue_estimate_education_fee>() { estimate };
Report report = new Report();
@@ -4284,15 +4294,17 @@ namespace rmutr_report.Controllers
return Ok();
}
[HttpPost, Route("reports/budget_income_qualification/{type}")]
[HttpPost, Route("reports/budget_income_qualification/{type}")]
[ApiExplorerSettings(GroupName = "reports")]
public IActionResult GetForm1Report([FromRoute] string type,
[FromBody] form_1_1 form1)
{
if (form1.budget_income_qualification_date!=null)
if (form1.budget_income_qualification_date != null)
{
form1.budget_income_qualification_dates = form1.budget_income_qualification_date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH"));
form1.budget_income_qualification_dates =
form1.budget_income_qualification_date.Value.ToString("dd MMMM yyyy",
CultureInfo.CreateSpecificCulture("th-TH"));
}
if (form1.budget_project_date != null)