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)