Semi Final 7th Aug 2024

lib/pages/entry/event_entries_controller.dart

@@ -4,6 +4,8 @@ import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/services/api_service.dart';
 import 'package:flutter/material.dart';
+import 'package:timezone/timezone.dart' as tz;
+import 'package:timezone/data/latest.dart' as tz;
 
 class EventEntriesController extends GetxController {
   final ApiService _apiService = Get.find<ApiService>();
@@ -14,9 +16,12 @@ class EventEntriesController extends GetxController {
   final filteredEntries = <Entry>[].obs;
   final showTodayEntries = true.obs;
 
+  static bool _timezoneInitialized = false;
+
   @override
   void onInit() {
     super.onInit();
+    _initializeTimezone();
     // DestinationControllerが登録されていない場合に備えて、lazyPutを使用
     Get.lazyPut<DestinationController>(() => DestinationController(), fenix: true);
     _destinationController = Get.find<DestinationController>();
@@ -24,6 +29,13 @@ class EventEntriesController extends GetxController {
     fetchEntries();
   }
 
+  void _initializeTimezone() {
+    if (!_timezoneInitialized) {
+      tz.initializeTimeZones();
+      _timezoneInitialized = true;
+    }
+  }
+
   Future<void> fetchEntries() async {
     try {
       final fetchedEntries = await _apiService.getEntries();
@@ -44,6 +56,16 @@ class EventEntriesController extends GetxController {
   }
 
   void filterEntriesForToday() {
+    final now = tz.TZDateTime.now(tz.getLocation('Asia/Tokyo'));
+    filteredEntries.assignAll(entries.where((entry) {
+      final entryDate = tz.TZDateTime.from(entry.date!, tz.getLocation('Asia/Tokyo'));
+      return entryDate.year == now.year &&
+          entryDate.month == now.month &&
+          entryDate.day == now.day;
+    }));
+  }
+
+  void filterEntriesForToday_old() {
     final now = DateTime.now();
     filteredEntries.assignAll(entries.where((entry) =>
     entry.date?.year == now.year &&
@@ -66,10 +88,12 @@ class EventEntriesController extends GetxController {
   }
 
   Future<void> joinEvent(Entry entry) async {
-      final now = DateTime.now();
-      bool isToday = entry.date?.year == now.year &&
-          entry.date?.month == now.month &&
-          entry.date?.day == now.day;
+      //final now = DateTime.now();
+      final now = tz.TZDateTime.now(tz.getLocation('Asia/Tokyo'));
+      final entryDate = tz.TZDateTime.from(entry.date!, tz.getLocation('Asia/Tokyo'));
+      bool isToday = entryDate.year == now.year &&
+          entryDate.month == now.month &&
+          entryDate.day == now.day;
 
       _indexController.setReferenceMode(!isToday);
       _indexController.setSelectedEventName(entry.event.eventName);