From 076f8ed4d7d3c809de49128a311fb2a57649cc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nut=2E=E0=B9=84=E0=B8=9B=E0=B9=80=E0=B8=A3=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=A2?= Date: Thu, 27 Aug 2026 11:20:40 +0700 Subject: [PATCH] fix(kpi): move vision/values/uniqueness/identity sections above the strategic indicator table MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Matches the field order on the budget policy form itself, where these 4 categories are entered before ประเด็นยุทธศาสตร์/เป้าหมายหลัก/ตัวชี้วัดกลยุทธ์. --- Controllers/KPI.Controller.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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); } //}