diff --git a/Controllers/KPI.Controller.cs b/Controllers/KPI.Controller.cs index 75cb019..212ecd4 100644 --- a/Controllers/KPI.Controller.cs +++ b/Controllers/KPI.Controller.cs @@ -138,6 +138,12 @@ namespace rmutr_report.Controllers ws.Cell("A1").Style.Font.FontSize = 16; ws.Range("D2:E2").Merge().Value = "ค่าเป้าหมาย ปี " + _kpi.academic_year.Substring(2, 2); ws.Range("D2:E2").Style.Font.Bold = true; + + WriteReferenceHeaders(ws, _kpi.vision_data, ref row, ref rowno); + WriteReferenceHeaders(ws, _kpi.popularity_data, ref row, ref rowno); + WriteReferenceHeaders(ws, _kpi.uniqueness_data, ref row, ref rowno); + WriteReferenceHeaders(ws, _kpi.identity_data, ref row, ref rowno); + foreach (var header in _kpi.header_data) { if (header.header_1 != null || header.header_1 != "") @@ -269,11 +275,6 @@ namespace rmutr_report.Controllers } //row++; } - - WriteReferenceHeaders(ws, _kpi.vision_data, ref row, ref rowno); - WriteReferenceHeaders(ws, _kpi.popularity_data, ref row, ref rowno); - WriteReferenceHeaders(ws, _kpi.uniqueness_data, ref row, ref rowno); - WriteReferenceHeaders(ws, _kpi.identity_data, ref row, ref rowno); } //}