From 86e4a0ece05da75e034e04c88a5651e3d84f0a1f Mon Sep 17 00:00:00 2001
From: xue jiahao <xuejiahao@alicorns.co.jp>
Date: Mon, 25 Aug 2025 16:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E5=80=8B=E5=88=A5=E9=85=8D=E6=85=AE?=
 =?UTF-8?q?=E3=80=8D=E3=81=AE=E5=87=BA=E5=8A=9B=E9=A0=86=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ソート条件を「学年（昇順）→ 出席番号（昇順）」に変更します
---
 src/個別配慮/main.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/個別配慮/main.js b/src/個別配慮/main.js
index 26464a2..2920a0a 100644
--- a/src/個別配慮/main.js
+++ b/src/個別配慮/main.js
@@ -91,7 +91,7 @@
       }
 
       const cols = getLabelColsMapping(worksheet, baseCells['児童名'][0].row, ['児童名', '子どもの姿', '保育者援助_配慮_環境構成']);
-      const sortedRecords = records.sort((a, b) => Number(a['レコード番号'].value) - Number(b['レコード番号'].value));
+      const sortedRecords = sort(records);
 
       for (let i = 0; i < totalPages; i++) {
         const monthLabelCell = baseCells['月'][i];
@@ -120,5 +120,20 @@
     }
   }
 
+  function sort(records) {
+    // 1. sort by 出席番号
+    const sortedRecords = records.sort((a, b) => Number(a['出席番号'].value) - Number(b['出席番号'].value));
+
+    // 2. sort by 学年
+    debugger;
+    const termOrder = {};
+    termItems.forEach((item, index) => {
+      termOrder[item.value] = index;
+    });
+    sortedRecords.sort((a, b) => {
+      return termOrder[a["学年"].value] - termOrder[b["学年"].value];
+    });
+    return sortedRecords;
+  }
 
 })();