bug fixed

Controllers/PlantGeneticConservationProject.Controller.cs

@@ -94,8 +94,16 @@ namespace rmutr_report.Controllers
                         sixteenthData.bophitphimuk_total = sum2;
                         sixteenthData.pohchang_total = sum3;
                         sixteenthData.klai_kangwon_total = sum4;
-                        sixteenthData.activity_table = a + sixteenthData.activity_table;
-                        t++;
+                        if (sixteenthData.activity_table != null)
+                        {
+                            sixteenthData.activity_table = a + sixteenthData.activity_table;
+                            t++;
+                        }
+
+                        if (sixteenthData.activity_table == null)
+                        {
+                            sixteenthData.activity_table = null;
+                        }
                     }
                 }
 
@@ -105,7 +113,17 @@ namespace rmutr_report.Controllers
                     {
                         int t = 1;
                         string a = "กิจกรรมที่ ";
-                        v.activity = a + v.activity;
+                        if (v.activity != null)
+                        {
+                            v.activity = a + v.activity;
+                            t++;
+                        }
+
+                        if (v.activity == null)
+                        {
+                            v.activity = null;
+                        }
+
                         foreach (var vv in v.seventeenths)
                         {
                             string na = "ครั้งที่ ";
@@ -139,6 +157,19 @@ namespace rmutr_report.Controllers
                 {
                     foreach (var v in project.eighteenth)
                     {
+                        int t = 1;
+                        string a = "กิจกรรมที่ ";
+                        if (v.activity != null)
+                        {
+                            v.activity = a + v.activity;
+                            t++;
+                        }
+
+                        if (v.activity == null)
+                        {
+                            v.activity = null;
+                        }
+
                         foreach (var vv in v.eighteenths)
                         {
                             string na = "ครั้งที่ ";
@@ -153,25 +184,64 @@ namespace rmutr_report.Controllers
                     }
                 }
 
+                if (project.nineteenth != null)
+                {
+                    foreach (var v in project.nineteenth)
+                    {
+                        foreach (var vv in v.nineteenth_data_header)
+                        {
+                            int t = 1;
+                            string a = "กิจกรรมที่ ";
+                            if (vv.activity != null)
+                            {
+                                vv.activity = a + vv.activity;
+                                t++;
+                            }
+
+                            if (vv.activity == null)
+                            {
+                                vv.activity = null;
+                            }
+                        }
+                    }
+                }
+
                 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)
                 {
                     foreach (var v in project.twenty_one)
                     {
-                        if (v.activity != null || v.activity != "")
+                        int t = 1;
+                        string a = "กิจกรรมที่ ";
+                     if (v.activity != null)
                         {
-                            v.activity = v.activity;
+                            v.activity = a + v.activity;
+                            t++;
                         }
 
+                        if (v.activity == null)
+                        {
+                            v.activity = null;
+                        }
                         foreach (var vv in v.twenty_ones)
                         {
                             // if (vv.clause1 != null || vv.clause1 != "")
@@ -268,6 +338,25 @@ namespace rmutr_report.Controllers
                 }
             }
 
+            if (project.twenty_four != null)
+            {
+                foreach (var v in project.twenty_four)
+                {
+                    int t = 1;
+                    string a = "กิจกรรมที่ ";
+                    if (v.activity != null)
+                    {
+                        v.activity = a + v.activity;
+                        t++;
+                    }
+
+                    if (v.activity == null)
+                    {
+                        v.activity = null;
+                    }
+                }
+            }
+
             var _project = new List<project_principle_rationale>() { project };
 
             Report report = new Report();