bug fixed
This commit is contained in:
kamonwan taengsuk
@@ -13,15 +13,16 @@ using Swashbuckle.AspNetCore.Annotations;
|
||||
namespace rmutr_report.Controllers
|
||||
{
|
||||
[SwaggerTag("สำหรับรายงาน ง.5")]
|
||||
public class ProjectPrincipleRationale: Controller
|
||||
public class ProjectPrincipleRationale : Controller
|
||||
{
|
||||
readonly Setting _setting;
|
||||
readonly Setting _setting;
|
||||
|
||||
public ProjectPrincipleRationale(Setting setting)
|
||||
{
|
||||
this._setting = setting;
|
||||
}
|
||||
[HttpPost, Route("reports/project_principle_rationale/{type}")]
|
||||
|
||||
[HttpPost, Route("reports/project_principle_rationale/{type}")]
|
||||
[ApiExplorerSettings(GroupName = "reports")]
|
||||
public IActionResult GetProjectReport([FromRoute] string type, [FromBody] project_principle_rationale project)
|
||||
{
|
||||
@@ -32,41 +33,46 @@ namespace rmutr_report.Controllers
|
||||
if (v.activity != null)
|
||||
{
|
||||
//var total = project.activity.Select(r => r.count).Sum(t => t.Value);
|
||||
project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total +" โครงการดังนี้คือ";
|
||||
project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ";
|
||||
}
|
||||
else
|
||||
{
|
||||
project.together_with = null;
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var v in project.eighth)
|
||||
{
|
||||
string na = "ประเด็นยุทธศาสตร์ที่ " ;
|
||||
string na = "ประเด็นยุทธศาสตร์ที่ ";
|
||||
v.strategic_issues = na + v.strategic_issues;
|
||||
string na2 = "กลยุทธ์ที่ " ;
|
||||
string na2 = "กลยุทธ์ที่ ";
|
||||
v.measure = na2 + v.measure;
|
||||
}
|
||||
|
||||
foreach (var v in project.fourteenth)
|
||||
{
|
||||
string na = "องค์ประกอบที่ " ;
|
||||
v.component = na + v.component;
|
||||
string na2 = "ตัวบ่งชี้ที่ " ;
|
||||
v.indicator = na2 + v.indicator;
|
||||
}
|
||||
// project.count_activity = total2;
|
||||
foreach (var vv in v.fourteenths)
|
||||
{
|
||||
// string na = "องค์ประกอบที่ " ;
|
||||
// vv.component = na + vv.component;
|
||||
string na2 = "ตัวบ่งชี้ที่ ";
|
||||
vv.indicator = na2 + vv.indicator;
|
||||
}
|
||||
}
|
||||
|
||||
// project.count_activity = total2;
|
||||
foreach (var v in project.eighteenth)
|
||||
{
|
||||
foreach (var vv in v.eighteenths)
|
||||
{
|
||||
|
||||
string na = "ครั้งที่ ";
|
||||
vv.the_time = na + vv.the_time;
|
||||
vv.the_time = na + vv.the_time;
|
||||
string na2 = " จำนวน ";
|
||||
vv.count_day = na2 + vv.count_day + " วัน";
|
||||
if (project.count_day != null)
|
||||
{
|
||||
project.text3 = "จำนวน " + project.count_day + " วัน";
|
||||
}
|
||||
vv.count_day = na2 + vv.count_day + " วัน";
|
||||
if (project.count_day != null)
|
||||
{
|
||||
project.text3 = "จำนวน " + project.count_day + " วัน";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,14 +80,14 @@ namespace rmutr_report.Controllers
|
||||
{
|
||||
project.text1 = "ผลรวมกลุ่มเป้าหมาย " + project.total_target;
|
||||
}
|
||||
|
||||
if (project.total_board != null)
|
||||
{
|
||||
project.text2 = "ผลรวมคณะกรรมการ " + project.total_board;
|
||||
}
|
||||
|
||||
if (project.twenty_one != null)
|
||||
{
|
||||
|
||||
|
||||
// foreach (var vv in project.twenty_one)
|
||||
// {
|
||||
// if (vv.activity != null || vv.activity!= "")
|
||||
@@ -145,7 +151,7 @@ namespace rmutr_report.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
var _project = new List<project_principle_rationale>() {project};
|
||||
var _project = new List<project_principle_rationale>() { project };
|
||||
|
||||
Report report = new Report();
|
||||
report.Load(_setting.report_path + "project_principle_rationale.frx");
|
||||
@@ -180,7 +186,8 @@ namespace rmutr_report.Controllers
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
return File(stream, "text/csv");
|
||||
break;
|
||||
case "doc": case "docx":
|
||||
case "doc":
|
||||
case "docx":
|
||||
Word2007Export word = new Word2007Export();
|
||||
report.Export(word, stream);
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
@@ -190,7 +197,8 @@ namespace rmutr_report.Controllers
|
||||
|
||||
return Ok();
|
||||
}
|
||||
[HttpPost, Route("reports/project_principle_rationale_no_activity/{type}")]
|
||||
|
||||
[HttpPost, Route("reports/project_principle_rationale_no_activity/{type}")]
|
||||
[ApiExplorerSettings(GroupName = "reports")]
|
||||
public IActionResult GetProject2Report([FromRoute] string type, [FromBody] project_principle_rationale project)
|
||||
{
|
||||
@@ -201,41 +209,46 @@ namespace rmutr_report.Controllers
|
||||
if (v.activity != null)
|
||||
{
|
||||
//var total = project.activity.Select(r => r.count).Sum(t => t.Value);
|
||||
project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total +" โครงการดังนี้คือ";
|
||||
project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ";
|
||||
}
|
||||
else
|
||||
{
|
||||
project.together_with = null;
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var v in project.eighth)
|
||||
{
|
||||
string na = "ประเด็นยุทธศาสตร์ที่ " ;
|
||||
string na = "ประเด็นยุทธศาสตร์ที่ ";
|
||||
v.strategic_issues = na + v.strategic_issues;
|
||||
string na2 = "กลยุทธ์ที่ " ;
|
||||
string na2 = "กลยุทธ์ที่ ";
|
||||
v.measure = na2 + v.measure;
|
||||
}
|
||||
|
||||
foreach (var v in project.fourteenth)
|
||||
{
|
||||
string na = "องค์ประกอบที่ " ;
|
||||
v.component = na + v.component;
|
||||
string na2 = "ตัวบ่งชี้ที่ " ;
|
||||
v.indicator = na2 + v.indicator;
|
||||
}
|
||||
// project.count_activity = total2;
|
||||
foreach (var vv in v.fourteenths)
|
||||
{
|
||||
// string na = "องค์ประกอบที่ " ;
|
||||
// vv.component = na + vv.component;
|
||||
string na2 = "ตัวบ่งชี้ที่ ";
|
||||
vv.indicator = na2 + vv.indicator;
|
||||
}
|
||||
}
|
||||
|
||||
// project.count_activity = total2;
|
||||
foreach (var v in project.eighteenth)
|
||||
{
|
||||
foreach (var vv in v.eighteenths)
|
||||
{
|
||||
|
||||
string na = "ครั้งที่ ";
|
||||
vv.the_time = na + vv.the_time;
|
||||
vv.the_time = na + vv.the_time;
|
||||
string na2 = " จำนวน ";
|
||||
vv.count_day = na2 + vv.count_day + " วัน";
|
||||
if (project.count_day != null)
|
||||
{
|
||||
project.text3 = "จำนวน " + project.count_day + " วัน";
|
||||
}
|
||||
vv.count_day = na2 + vv.count_day + " วัน";
|
||||
if (project.count_day != null)
|
||||
{
|
||||
project.text3 = "จำนวน " + project.count_day + " วัน";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -243,14 +256,14 @@ namespace rmutr_report.Controllers
|
||||
{
|
||||
project.text1 = "ผลรวมกลุ่มเป้าหมาย " + project.total_target;
|
||||
}
|
||||
|
||||
if (project.total_board != null)
|
||||
{
|
||||
project.text2 = "ผลรวมคณะกรรมการ " + project.total_board;
|
||||
}
|
||||
|
||||
if (project.twenty_one != null)
|
||||
{
|
||||
|
||||
|
||||
// foreach (var vv in project.twenty_one)
|
||||
// {
|
||||
// if (vv.activity != null || vv.activity!= "")
|
||||
@@ -314,7 +327,7 @@ namespace rmutr_report.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
var _project = new List<project_principle_rationale>() {project};
|
||||
var _project = new List<project_principle_rationale>() { project };
|
||||
|
||||
Report report = new Report();
|
||||
report.Load(_setting.report_path + "project_principle_rationale_no_activity.frx");
|
||||
@@ -349,7 +362,8 @@ namespace rmutr_report.Controllers
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
return File(stream, "text/csv");
|
||||
break;
|
||||
case "doc": case "docx":
|
||||
case "doc":
|
||||
case "docx":
|
||||
Word2007Export word = new Word2007Export();
|
||||
report.Export(word, stream);
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
@@ -359,7 +373,5 @@ namespace rmutr_report.Controllers
|
||||
|
||||
return Ok();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user