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-12-07 14:20:23 +07:00
parent de4f5a0e7b
commit 351d61ac8c
11 changed files with 77 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Controllers/PlantGeneticConservationProject.Controller.cs
View File

@@ -30,22 +30,23 @@ 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;
// }
// }
// }
if (project.activity.Any())
{
if (project.activity == null)
{
foreach (var detail in project.activity)
{
detail.activity = null;
}
}
}
else
{
project.activity.Add(new activity_data()
{
activity = ""
});
}
if (project.ninth != null)
{
foreach (var vv in project.ninth)
@@ -112,7 +113,7 @@ namespace rmutr_report.Controllers
if (project.seventeenth != null)
{
int t = 1;
int ti= 1;
//int ti= 1;
foreach (var v in project.seventeenth)
{
string a = "กิจกรรมที่ " + t + " ";
@@ -130,8 +131,8 @@ namespace rmutr_report.Controllers
foreach (var vv in v.seventeenths)
{
string na = "ครั้งที่ ";
vv.the_time = na + ti;
ti++;
vv.the_time = na + vv.the_time;
//ti++;
foreach (var detail in vv.seventeenths2)
{
string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) ";
@@ -159,7 +160,7 @@ namespace rmutr_report.Controllers
if (project.eighteenth != null)
{
int t = 1;
int ti = 1;
//int ti = 1;
foreach (var v in project.eighteenth)
{
string a = "กิจกรรมที่ " + t + " ";
@@ -177,8 +178,8 @@ namespace rmutr_report.Controllers
foreach (var vv in v.eighteenths)
{
string na = "ครั้งที่ ";
vv.the_time = na + ti;
ti++;
vv.the_time = na + vv.the_time;
//ti++;
string na2 = " จำนวน ";
vv.count_day = na2 + vv.count_day + " วัน";
if (project.count_day != null)

2
Controllers/Summary.Controller.cs
View File

@@ -799,7 +799,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, 16).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
ws.Range(ws.Cell(row, 8), ws.Cell(row, 14)).Style.NumberFormat.SetFormat("#,#");
string str = equipment3.amount;
string str2 = equipment3.amount + "\n" + equipment3.amount + "\n" + equipment3.amount;
string str2 = equipment3.amount + "\r" + equipment3.amount + "\n" + equipment3.amount;
//string str3 = str2.Substring(0, 7);
if (str.Length == 4)
{

29
Controllers/project_principle_rationale.Controller.cs
View File

@@ -29,6 +29,23 @@ namespace rmutr_report.Controllers
{
if (project != null)
{
if (project.activity.Any())
{
if (project.activity == null)
{
foreach (var detail in project.activity)
{
detail.activity = null;
}
}
}
else
{
project.activity.Add(new activity_data()
{
activity = ""
});
}
if (project.ninth != null)
{
foreach (var vv in project.ninth)
@@ -85,7 +102,7 @@ namespace rmutr_report.Controllers
if (project.seventeenth != null)
{
int t = 1;
int ti= 1;
//int ti= 1;
foreach (var v in project.seventeenth)
{
string a = "กิจกรรมที่ " + t + " ";
@@ -103,8 +120,8 @@ namespace rmutr_report.Controllers
foreach (var vv in v.seventeenths)
{
string na = "ครั้งที่ ";
vv.the_time = na + ti;
ti++;
vv.the_time = na + vv.the_time;
//ti++;
foreach (var detail in vv.seventeenths2)
{
string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) ";
@@ -132,7 +149,7 @@ namespace rmutr_report.Controllers
if (project.eighteenth != null)
{
int t = 1;
int ti = 1;
//int ti = 1;
foreach (var v in project.eighteenth)
{
string a = "กิจกรรมที่ " + t + " ";
@@ -150,8 +167,8 @@ namespace rmutr_report.Controllers
foreach (var vv in v.eighteenths)
{
string na = "ครั้งที่ ";
vv.the_time = na + ti;
ti++;
vv.the_time = na + vv.the_time;
//ti++;
string na2 = " จำนวน ";
vv.count_day = na2 + vv.count_day + " วัน";
if (project.count_day != null)

47
Controllers/project_request_thailand.Controller.cs
View File

@@ -46,22 +46,24 @@ 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;
// }
// }
// }
if (project.activity.Any())
{
if (project.activity == null)
{
foreach (var detail in project.activity)
{
detail.activity = null;
}
}
}
else
{
project.activity.Add(new activity_data()
{
activity = ""
});
}
if (project.ninth != null)
{
@@ -94,6 +96,7 @@ namespace rmutr_report.Controllers
detail = ""
});
}
}
}
@@ -130,7 +133,7 @@ namespace rmutr_report.Controllers
if (project.seventeenth != null)
{
int t = 1;
int ti= 1;
//int ti= 1;
foreach (var v in project.seventeenth)
{
string a = "กิจกรรมที่ " + t + " ";
@@ -148,8 +151,8 @@ namespace rmutr_report.Controllers
foreach (var vv in v.seventeenths)
{
string na = "ครั้งที่ ";
vv.the_time = na + ti;
ti++;
vv.the_time = na + vv.the_time;
//ti++;
foreach (var detail in vv.seventeenths2)
{
string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) ";
@@ -177,7 +180,7 @@ namespace rmutr_report.Controllers
if (project.eighteenth != null)
{
int t = 1;
int ti = 1;
//int ti = 1;
foreach (var v in project.eighteenth)
{
string a = "กิจกรรมที่ " + t + " ";
@@ -195,8 +198,8 @@ namespace rmutr_report.Controllers
foreach (var vv in v.eighteenths)
{
string na = "ครั้งที่ ";
vv.the_time = na + ti;
ti++;
vv.the_time = na + vv.the_time;
//ti++;
string na2 = " จำนวน ";
vv.count_day = na2 + vv.count_day + " วัน";
if (project.count_day != null)

BIN
bin/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

2
obj/rider.project.model.nuget.info
View File

@@ -1 +1 @@
17018549799613370
17019257662490421

2
obj/rider.project.restore.info
View File

@@ -1 +1 @@
17018574056737534
17019334991213918

6
wwwroot/reports/project_request_thailands.frx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="12/06/2023 16:25:39" ReportInfo.CreatorVersion="2021.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="12/07/2023 14:12:32" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary>
<BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
<Column Name="budget_year_name_th" DataType="System.String"/>
@@ -404,7 +404,7 @@
<TextObject Name="Text315" Width="1247.4" Height="28.35" Text="ระดับ [project_principle_rationale.fourteenth.level]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
</DataBand>
</DataBand>
<DataBand Name="Data29" Top="2135.37" Width="1247.4" Height="28.35" DataSource="twenty_four">
<DataBand Name="Data29" Top="2135.37" Width="1247.4" Height="28.35">
<TextObject Name="Text209" Width="1247.4" Height="28.35" Text="14. ผู้รับผิดชอบโครงการ" Font="TH SarabunPSK, 14pt, style=Bold"/>
<DataBand Name="Data49" Top="2168.79" Width="1247.4" Height="28.35" DataSource="twenty_four">
<TextObject Name="Text210" Width="1247.4" Height="28.35" Text="[project_principle_rationale.twenty_four.activity]" Font="TH SarabunPSK, 14pt, style=Bold"/>
@@ -479,7 +479,7 @@
<DataBand Name="Data7" Top="356.74" Width="1247.4" Height="28.35">
<TextObject Name="Text216" Width="1247.4" Height="28.35" Text="17. กลุ่มเป้าหมายผู้ร่วมโครงการ" Font="TH SarabunPSK, 14pt, style=Bold"/>
<DataBand Name="Data10" Top="390.16" Width="1247.4" Height="189" DataSource="sixteenths">
<TextObject Name="Text137" Top="4.5" Width="1247.4" Height="28.35" Text="กิจกรรมที่ 1 [project_principle_rationale.sixteenths.activity_table]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
<TextObject Name="Text137" Top="4.5" Width="1247.4" Height="28.35" Text=" [project_principle_rationale.sixteenths.activity_table]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
<TableObject Name="Table1" Left="18.9" Top="160.65" Width="718.2" Height="28.35">
<TableColumn Name="Column1" Width="151.2"/>
<TableColumn Name="Column2" Width="132.3"/>