diff --git a/Controllers/PlantGeneticConservationProject.Controller.cs b/Controllers/PlantGeneticConservationProject.Controller.cs index 87de772..c70bf7d 100644 --- a/Controllers/PlantGeneticConservationProject.Controller.cs +++ b/Controllers/PlantGeneticConservationProject.Controller.cs @@ -105,7 +105,25 @@ namespace rmutr_report.Controllers { sixteenthData.activity_table = null; } + if (sixteenthData.total_target != null) + { + project.text1 = "ผลรวมกลุ่มเป้าหมาย " + sixteenthData.total_target; + } + if (sixteenthData.total_target == null) + { + project.text1 = "ผลรวมกลุ่มเป้าหมาย -"; + } + + if (sixteenthData.total_board != null) + { + project.text2 = "ผลรวมคณะกรรมการ " + sixteenthData.total_board; + } + + if (sixteenthData.total_board == null) + { + project.text2 = "ผลรวมคณะกรรมการ -"; + } t++; } } @@ -131,7 +149,7 @@ namespace rmutr_report.Controllers foreach (var vv in v.seventeenths) { string na = "ครั้งที่ "; - vv.the_time = na + vv.the_time; + vv.the_time = na + "1"; //ti++; foreach (var detail in vv.seventeenths2) { @@ -214,25 +232,7 @@ namespace rmutr_report.Controllers } } - if (project.total_target != null) - { - project.text1 = "ผลรวมกลุ่มเป้าหมาย " + project.total_target; - } - - if (project.total_target == null) - { - project.text1 = "ผลรวมกลุ่มเป้าหมาย -"; - } - - if (project.total_board != null) - { - project.text2 = "ผลรวมคณะกรรมการ " + project.total_board; - } - - if (project.total_board == null) - { - project.text2 = "ผลรวมคณะกรรมการ -"; - } + if (project.twenty_one != null) { @@ -366,7 +366,34 @@ namespace rmutr_report.Controllers t++; } } + if (project.twenty_fifth != null) + { + int t = 1; + foreach (var v in project.twenty_fifth) + { + foreach (var acti in v.activity) + { + v.activitys = acti; + } + foreach (var locat in v.location) + { + v.locations = locat; + } + string a = "กิจกรรมที่ " + t + " "; + if (v.activity_display_name != null) + { + v.activity_display_name = a + v.activity_display_name; + } + + if (v.activity_display_name == null) + { + v.activity_display_name = null; + } + + t++; + } + } var _project = new List() { project }; Report report = new Report(); diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index ae211e7..ed4a548 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -46,6 +46,7 @@ namespace rmutr_report.Controllers activity = "" }); } + if (project.ninth != null) { foreach (var vv in project.ninth) @@ -73,7 +74,7 @@ namespace rmutr_report.Controllers if (project.sixteenths != null) { int t = 1; - + foreach (var sixteenthData in project.sixteenths) { string a = "กิจกรรมที่ " + t + " "; @@ -95,6 +96,26 @@ namespace rmutr_report.Controllers sixteenthData.activity_table = null; } + if (sixteenthData.total_target != null) + { + project.text1 = "ผลรวมกลุ่มเป้าหมาย " + sixteenthData.total_target; + } + + if (sixteenthData.total_target == null) + { + project.text1 = "ผลรวมกลุ่มเป้าหมาย -"; + } + + if (sixteenthData.total_board != null) + { + project.text2 = "ผลรวมคณะกรรมการ " + sixteenthData.total_board; + } + + if (sixteenthData.total_board == null) + { + project.text2 = "ผลรวมคณะกรรมการ -"; + } + t++; } } @@ -120,7 +141,7 @@ namespace rmutr_report.Controllers foreach (var vv in v.seventeenths) { string na = "ครั้งที่ "; - vv.the_time = na + vv.the_time; + vv.the_time = na + "1"; //ti++; foreach (var detail in vv.seventeenths2) { @@ -203,25 +224,6 @@ namespace rmutr_report.Controllers } } - if (project.total_target != null) - { - project.text1 = "ผลรวมกลุ่มเป้าหมาย " + project.total_target; - } - - if (project.total_target == null) - { - project.text1 = "ผลรวมกลุ่มเป้าหมาย -"; - } - - if (project.total_board != null) - { - project.text2 = "ผลรวมคณะกรรมการ " + project.total_board; - } - - if (project.total_board == null) - { - project.text2 = "ผลรวมคณะกรรมการ -"; - } if (project.twenty_one != null) { @@ -349,7 +351,6 @@ namespace rmutr_report.Controllers if (project.twenty_four != null) { - int no = 1; int t = 1; foreach (var v in project.twenty_four) @@ -358,13 +359,13 @@ namespace rmutr_report.Controllers if (v.activity != null) { v.activity = aa + v.activity; - } if (v.activity == null) { v.activity = null; } + t++; foreach (var dataDetail in v.twenty_fours) { @@ -410,9 +411,10 @@ namespace rmutr_report.Controllers if (project.twenty_fifth != null) { + int t = 1; foreach (var fifthData in project.twenty_fifth) { - foreach (var acti in fifthData.activity) + foreach (var acti in fifthData.activity) { fifthData.activitys = acti; } @@ -421,6 +423,18 @@ namespace rmutr_report.Controllers { fifthData.locations = locat; } + string a = "กิจกรรมที่ " + t + " "; + if (fifthData.activity_display_name != null) + { + fifthData.activity_display_name = a + fifthData.activity_display_name; + } + + if (fifthData.activity_display_name == null) + { + fifthData.activity_display_name = null; + } + + t++; } } } diff --git a/Controllers/project_request_thailand.Controller.cs b/Controllers/project_request_thailand.Controller.cs index b0d7b64..4374778 100644 --- a/Controllers/project_request_thailand.Controller.cs +++ b/Controllers/project_request_thailand.Controller.cs @@ -125,6 +125,25 @@ namespace rmutr_report.Controllers { sixteenthData.activity_table = null; } + if (sixteenthData.total_target != null) + { + project.text1 = "ผลรวมกลุ่มเป้าหมาย " + sixteenthData.total_target; + } + + if (sixteenthData.total_target == null) + { + project.text1 = "ผลรวมกลุ่มเป้าหมาย -"; + } + + if (sixteenthData.total_board != null) + { + project.text2 = "ผลรวมคณะกรรมการ " + sixteenthData.total_board; + } + + if (sixteenthData.total_board == null) + { + project.text2 = "ผลรวมคณะกรรมการ -"; + } t++; } @@ -151,7 +170,7 @@ namespace rmutr_report.Controllers foreach (var vv in v.seventeenths) { string na = "ครั้งที่ "; - vv.the_time = na + vv.the_time; + vv.the_time = na + "1"; //ti++; foreach (var detail in vv.seventeenths2) { @@ -234,26 +253,6 @@ namespace rmutr_report.Controllers } } - if (project.total_target != null) - { - project.text1 = "ผลรวมกลุ่มเป้าหมาย " + project.total_target; - } - - if (project.total_target == null) - { - project.text1 = "ผลรวมกลุ่มเป้าหมาย -"; - } - - if (project.total_board != null) - { - project.text2 = "ผลรวมคณะกรรมการ " + project.total_board; - } - - if (project.total_board == null) - { - project.text2 = "ผลรวมคณะกรรมการ -"; - } - if (project.twenty_one != null) { int t = 1; @@ -367,6 +366,34 @@ namespace rmutr_report.Controllers t++; } } + if (project.twenty_fifth != null) + { + int t = 1; + foreach (var v in project.twenty_fifth) + { + foreach (var acti in v.activity) + { + v.activitys = acti; + } + + foreach (var locat in v.location) + { + v.locations = locat; + } + string a = "กิจกรรมที่ " + t + " "; + if (v.activity_display_name != null) + { + v.activity_display_name = a + v.activity_display_name; + } + + if (v.activity_display_name == null) + { + v.activity_display_name = null; + } + + t++; + } + } var _project = new List() { project }; diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index f236bd9..bd30f52 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -46,13 +46,13 @@ namespace rmutr_report.Models public decimal? land_building { get; set; } // ค่าที่ดินและสิ่งก่อสร้าง public List fourteenth { get; set; } //ข้อ 14 public List fifteenth { get; set; } //ข้อ 15 - public int? count_activity { get; set; } //ข้อ 16 + //public int? count_activity { get; set; } //ข้อ 16 public string text1 { get; set; } //ข้อ 16 public string text2 { get; set; } //ข้อ 16 public string operational_activitie { get; set; }//ข้อ 15 ง.5-3 public string evaluation { get; set; }//ข้อ 16 ง.5-3 - public int? total_target { get; set; } //ข้อ 16 ผลรวมกลุ่มเป้าหมาย - public int? total_board { get; set; } //ข้อ 16 ผลรวมคณะกรรมการ + // public int? total_target { get; set; } //ข้อ 16 ผลรวมกลุ่มเป้าหมาย + // public int? total_board { get; set; } //ข้อ 16 ผลรวมคณะกรรมการ public List sixteenth { get; set; } //ข้อ 16 public List sixteenths { get; set; } //ข้อ 16 detail ตาราง @@ -155,6 +155,9 @@ namespace rmutr_report.Models { public string activity_table { get; set; } public string budget_unit_name_th { get; set; } + public int? total_target { get; set; } //ข้อ 16 ผลรวมกลุ่มเป้าหมาย + public int? total_board { get; set; } //ข้อ 16 ผลรวมคณะกรรมการ + public int? count_activity { get; set; } //ข้อ 16 ผมรวมทั้งหมด public List sixteenths2 { get; set; } public decimal? salaya_total { get; set; } diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 70f46ce..0644bac 100644 Binary files a/bin/Debug/net5.0/rmutr_report.dll and b/bin/Debug/net5.0/rmutr_report.dll differ diff --git a/bin/Debug/net5.0/rmutr_report.pdb b/bin/Debug/net5.0/rmutr_report.pdb index d9d3aa5..8a2c195 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 173e5ce..ec6b373 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 4fd8eb4..161db93 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 928709a..9ad1157 100644 Binary files a/obj/Debug/net5.0/ref/rmutr_report.dll and b/obj/Debug/net5.0/ref/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr_report.dll b/obj/Debug/net5.0/refint/rmutr_report.dll index 928709a..9ad1157 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache index 3e38278..204ba5d 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -73f4f2af1cc3f6d90852199db8c00bcd253aa685 +01adf9e42f9a5cd189d448e7f6b6719026d916f6 diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 70f46ce..0644bac 100644 Binary files a/obj/Debug/net5.0/rmutr_report.dll and b/obj/Debug/net5.0/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index d9d3aa5..8a2c195 100644 Binary files a/obj/Debug/net5.0/rmutr_report.pdb and b/obj/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props index 73489c0..9aec172 100644 --- a/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +++ b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props @@ -224,6 +224,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\calculate_meeting_expenses.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\calculate_meeting_expenses.frx)) + Package rmutr_report @@ -320,6 +336,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\compensation_ro_three.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\consultant_compensation.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\consultant_compensation.frx)) + Package rmutr_report @@ -352,6 +384,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\control_cost_construction_wages.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction_wages.frx)) + Package rmutr_report @@ -800,6 +848,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\kpi_performance_expenditure_budget.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\land_rent.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\land_rent.frx)) + Package rmutr_report @@ -2240,6 +2304,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\service_fee.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\service_fee_ro_three.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\service_fee_ro_three.frx)) + Package rmutr_report diff --git a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index 4914a35..f204b69 100644 --- a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -8aa91144802a2244f9777f6b035a014da508a7f0 +dea208d6dcf8aff820dcbc6409c4fd9e41c662bb diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 173e5ce..ec6b373 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 4fd8eb4..161db93 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 82c3151..a0345ab 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17019334991213918 \ No newline at end of file +17019368780973156 \ No newline at end of file diff --git a/wwwroot/reports/plant_genetic_conservation_project.frx b/wwwroot/reports/plant_genetic_conservation_project.frx index eda90bf..04fca66 100644 --- a/wwwroot/reports/plant_genetic_conservation_project.frx +++ b/wwwroot/reports/plant_genetic_conservation_project.frx @@ -1,5 +1,5 @@  - + @@ -69,9 +69,6 @@ - - - @@ -80,6 +77,9 @@ + + + @@ -457,11 +457,11 @@ - + - + - + @@ -472,11 +472,11 @@ - + - + - + @@ -486,9 +486,9 @@ - + - + @@ -506,9 +506,9 @@ - + - + @@ -523,7 +523,7 @@ - + diff --git a/wwwroot/reports/project_principle_rationale_1.frx b/wwwroot/reports/project_principle_rationale_1.frx index 027e306..4cbd8ed 100644 --- a/wwwroot/reports/project_principle_rationale_1.frx +++ b/wwwroot/reports/project_principle_rationale_1.frx @@ -1,5 +1,5 @@  - + @@ -59,9 +59,6 @@ - - - @@ -70,6 +67,9 @@ + + + @@ -418,7 +418,7 @@ - + diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx index d7c9ec2..0574237 100644 --- a/wwwroot/reports/project_request_thailands.frx +++ b/wwwroot/reports/project_request_thailands.frx @@ -1,5 +1,5 @@  - + @@ -69,9 +69,6 @@ - - - @@ -80,6 +77,9 @@ + + + @@ -496,7 +496,7 @@ - + @@ -540,7 +540,7 @@ - + @@ -1109,13 +1109,13 @@ - - + + - + @@ -1128,7 +1128,7 @@ - +