diff --git a/Controllers/PlantGeneticConservationProject.Controller.cs b/Controllers/PlantGeneticConservationProject.Controller.cs index 5f8dc27..7b3abdb 100644 --- a/Controllers/PlantGeneticConservationProject.Controller.cs +++ b/Controllers/PlantGeneticConservationProject.Controller.cs @@ -28,22 +28,22 @@ namespace rmutr_report.Controllers { if (project != null) { - var total = project.activity.Count; - if (project.activity != null) - { - foreach (var v in project.activity) - { - if (v.activity != null) - { - //var total = project.activity.Select(r => r.count).Sum(t => t.Value); - project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ"; - } - else - { - project.together_with = null; - } - } - } + // var total = project.activity.Count; + // if (project.activity != null) + // { + // foreach (var v in project.activity) + // { + // if (v.activity != null) + // { + // //var total = project.activity.Select(r => r.count).Sum(t => t.Value); + // project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ"; + // } + // else + // { + // project.together_with = null; + // } + // } + // } if (project.eighth != null) { diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index b7e8250..8fd5d96 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -29,22 +29,22 @@ namespace rmutr_report.Controllers { if (project != null) { - var total = project.activity.Count; - if (project.activity != null) - { - foreach (var v in project.activity) - { - if (v.activity != null) - { - //var total = project.activity.Select(r => r.count).Sum(t => t.Value); - project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ"; - } - else - { - project.together_with = null; - } - } - } + // var total = project.activity.Count; + // if (project.activity != null) + // { + // foreach (var v in project.activity) + // { + // if (v.activity != null) + // { + // //var total = project.activity.Select(r => r.count).Sum(t => t.Value); + // project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ"; + // } + // else + // { + // project.together_with = null; + // } + // } + // } if (project.eighth != null) { diff --git a/Controllers/project_request_thailand.Controller.cs b/Controllers/project_request_thailand.Controller.cs index 66d1759..51e44ce 100644 --- a/Controllers/project_request_thailand.Controller.cs +++ b/Controllers/project_request_thailand.Controller.cs @@ -47,22 +47,22 @@ namespace rmutr_report.Controllers // } if (project != null) { - var total = project.activity.Count; - if (project.activity != null) - { - foreach (var v in project.activity) - { - if (v.activity != null) - { - //var total = project.activity.Select(r => r.count).Sum(t => t.Value); - project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ"; - } - else - { - project.together_with = null; - } - } - } + // var total = project.activity.Count; + // if (project.activity != null) + // { + // foreach (var v in project.activity) + // { + // if (v.activity != null) + // { + // //var total = project.activity.Select(r => r.count).Sum(t => t.Value); + // project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ"; + // } + // else + // { + // project.together_with = null; + // } + // } + // } if (project.eighth != null) { @@ -252,19 +252,18 @@ namespace rmutr_report.Controllers report.Export(pdf, stream); stream.Seek(0, SeekOrigin.Begin); return File(stream, "application/pdf"); - + break; case "xls": - case "xlsx": Excel2007Export excel = new Excel2007Export(); report.Export(excel, stream); stream.Seek(0, SeekOrigin.Begin); return File(stream, "application/vnd.ms-excel"); break; - case "mht": - MHTExport mht = new MHTExport(); - report.Export(mht, stream); + case "xlsx": + Excel2007Export excel1 = new Excel2007Export(); + report.Export(excel1, stream); stream.Seek(0, SeekOrigin.Begin); - return File(stream, "multipart/related"); + return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); break; case "doc": case "docx": diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 8155dd2..ba39003 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 0365242..3e410d6 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/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 8155dd2..ba39003 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 0365242..3e410d6 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 a9bab61..0b4ada4 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17000382620850638 \ No newline at end of file +17000447865139285 \ 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 2a16bdf..5a835f2 100644 --- a/wwwroot/reports/plant_genetic_conservation_project.frx +++ b/wwwroot/reports/plant_genetic_conservation_project.frx @@ -1,5 +1,5 @@  - + @@ -302,7 +302,7 @@ - + @@ -326,15 +326,15 @@ - - - - - + + + + + - + @@ -350,7 +350,7 @@ - + @@ -359,12 +359,12 @@ - + - + @@ -376,16 +376,16 @@ - + - + - + - + @@ -393,19 +393,19 @@ - + - + - + - + - + @@ -535,11 +535,11 @@ - - - - - + + + + + @@ -554,7 +554,7 @@ - + @@ -592,7 +592,7 @@ - + @@ -609,7 +609,7 @@ - + @@ -624,7 +624,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -678,7 +678,7 @@ - + @@ -693,7 +693,7 @@ - + @@ -715,7 +715,7 @@ - + @@ -732,7 +732,7 @@ - + @@ -747,7 +747,7 @@ - + @@ -769,7 +769,7 @@ - + @@ -786,7 +786,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -818,7 +818,7 @@ - + @@ -900,8 +900,8 @@ - - + + @@ -915,30 +915,30 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + @@ -963,9 +963,9 @@ - + - + @@ -973,17 +973,17 @@ - + - + - - - + + + @@ -992,10 +992,10 @@ - + - - + + @@ -1006,27 +1006,27 @@ - + - + - - - + + + - + - - + + @@ -1055,10 +1055,10 @@ - - - - + + + + diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx index c09df76..9fe0e96 100644 --- a/wwwroot/reports/project_request_thailands.frx +++ b/wwwroot/reports/project_request_thailands.frx @@ -1,5 +1,5 @@  - + @@ -302,128 +302,128 @@ - - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - + + - + - + - - + + - - + + - + - + - + - + - + - - - - - + + + + + - - - - + + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - + - + - + - + @@ -433,43 +433,43 @@ - - - - - - - - - - + + + + + + + + + + - + - + - - - - - + + + + + - + - - + + - - - - + + + + @@ -484,7 +484,7 @@ - + @@ -499,8 +499,8 @@ - - + + @@ -520,18 +520,18 @@ - - - - - + + + + + - - - - - - + + + + + + @@ -546,7 +546,7 @@ - + @@ -584,7 +584,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -616,7 +616,7 @@ - + @@ -653,7 +653,7 @@ - + @@ -670,7 +670,7 @@ - + @@ -685,7 +685,7 @@ - + @@ -707,7 +707,7 @@ - + @@ -724,7 +724,7 @@ - + @@ -739,7 +739,7 @@ - + @@ -761,7 +761,7 @@ - + @@ -778,7 +778,7 @@ - + @@ -793,7 +793,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -830,35 +830,35 @@ - - - + + + - - + + - + - + - - - - - - + + + + + + @@ -890,11 +890,11 @@ - - - - - + + + + + @@ -907,45 +907,45 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -955,39 +955,39 @@ - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + @@ -995,30 +995,30 @@ - - - + + + - + - - - + + + - - + + - - - + + + @@ -1027,36 +1027,36 @@ - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - + + + + - - + + - +