From 2f814110f8f63688ac140abdb6241785dc845b03 Mon Sep 17 00:00:00 2001
From: "G01\\fj2532ir" <fj2532ir@aa.jp.fujitsu.com>
Date: Tue, 27 May 2025 09:55:47 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BA=88=E7=B4=84=E3=81=8C=E4=BA=8C?=
 =?UTF-8?q?=E9=87=8D=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=ABCalendarEvent.id=E3=81=A7?=
 =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=83=88=E3=81=97=E3=81=A6=E5=8F=96=E5=BE=97?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/CalendarsAppController.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php
index 5fcd1c3..1db9ca7 100644
--- a/Controller/CalendarsAppController.php
+++ b/Controller/CalendarsAppController.php
@@ -236,13 +236,20 @@ protected function _setCalendarCommonVars($vars) {
 				$order = array(
 						'TrackableCreator' . '.handlename',
 						'CalendarEvent' . '.dtstart',
+						'CalendarEvent' . '.id',
 						);
 			} else { //時間順
-				$order = array('CalendarEvent' . '.dtstart');
+				$order = array(
+						'CalendarEvent' . '.dtstart',
+						'CalendarEvent' . '.id',
+						);
 			}
 		} else {
 			//$order = array('CalendarEvent' . '.start_date');
-			$order = array('CalendarEvent' . '.dtstart');
+			$order = array(
+					'CalendarEvent' . '.dtstart',
+					'CalendarEvent' . '.id',
+				);
 		}
 
 		//room_idとspace_idの対応表を載せておく。

From 587b89dd9a59191f7e1ee17f72f2521afc7c2068 Mon Sep 17 00:00:00 2001
From: "G01\\fj2532ir" <fj2532ir@aa.jp.fujitsu.com>
Date: Tue, 27 May 2025 14:23:11 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/CalendarsAppController.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php
index 1db9ca7..be7f08f 100644
--- a/Controller/CalendarsAppController.php
+++ b/Controller/CalendarsAppController.php
@@ -234,22 +234,22 @@ protected function _setCalendarCommonVars($vars) {
 				//$order = array('TrackableCreator' . '.username');
 				//$order = array('TrackableCreator' . '.handlename');
 				$order = array(
-						'TrackableCreator' . '.handlename',
-						'CalendarEvent' . '.dtstart',
-						'CalendarEvent' . '.id',
-						);
+					'TrackableCreator' . '.handlename',
+					'CalendarEvent' . '.dtstart',
+					'CalendarEvent' . '.id',
+				);
 			} else { //時間順
 				$order = array(
-						'CalendarEvent' . '.dtstart',
-						'CalendarEvent' . '.id',
-						);
+					'CalendarEvent' . '.dtstart',
+					'CalendarEvent' . '.id',
+				);
 			}
 		} else {
 			//$order = array('CalendarEvent' . '.start_date');
 			$order = array(
-					'CalendarEvent' . '.dtstart',
-					'CalendarEvent' . '.id',
-				);
+				'CalendarEvent' . '.dtstart',
+				'CalendarEvent' . '.id',
+			);
 		}
 
 		//room_idとspace_idの対応表を載せておく。