This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user