release 4.8.9

lib/model/category.dart

@@ -34,13 +34,28 @@ class NewCategory {
       id: json['id'] ?? 0,
       categoryName: json['category_name'] ?? 'Unknown Category',
       categoryNumber: json['category_number'] ?? 0,
-      duration: Duration(seconds: json['duration'] ?? 0),
+      duration: parseDuration(json['duration']),
       numOfMember: json['num_of_member'] ?? 1,
       family: json['family'] ?? false,
       female: json['female'] ?? false,
     );
   }
 
+  static Duration parseDuration(String s) {
+    int hours = 0;
+    int minutes = 0;
+    int micros;
+    List<String> parts = s.split(':');
+    if (parts.length > 2) {
+      hours = int.parse(parts[parts.length - 3]);
+    }
+    if (parts.length > 1) {
+      minutes = int.parse(parts[parts.length - 2]);
+    }
+    micros = (double.parse(parts[parts.length - 1]) * 1000000).round();
+    return Duration(hours: hours, minutes: minutes, microseconds: micros);
+  }
+
   Map<String, dynamic> toJson() {
     return {
       'id': id,

lib/model/entry.dart

@@ -10,6 +10,7 @@ class Entry {
   final Event event;
   final NewCategory category;
   final DateTime? date;
+  final int zekkenNumber;  // 新しく追加
   final String owner;
 
   Entry({
@@ -18,6 +19,7 @@ class Entry {
     required this.event,
     required this.category,
     required this.date,
+    required this.zekkenNumber,
     required this.owner,
   });
 
@@ -30,6 +32,7 @@ class Entry {
       date: json['date'] != null
           ? DateTime.tryParse(json['date'])
           : null,
+      zekkenNumber: json['zekken_number'],  // 新しく追加
       owner: json['owner'] is Map ? json['owner']['name'] ?? '' : json['owner'] ?? '',
     );
   }
@@ -41,6 +44,7 @@ class Entry {
       'event': event.toJson(),
       'category': category.toJson(),
       'date': date?.toIso8601String(),
+      'zekken_number': zekkenNumber,  // 新しく追加
       'owner': owner,
     };
   }

lib/model/team.dart

@@ -6,7 +6,7 @@ import 'user.dart';
 
 class Team {
   final int id;
-  final String zekkenNumber;
+//  final String zekkenNumber;
   final String teamName;
   final NewCategory category;
   final User owner;
@@ -14,7 +14,7 @@ class Team {
 
   Team({
     required this.id,
-    required this.zekkenNumber,
+//    required this.zekkenNumber,
     required this.teamName,
     required this.category,
     required this.owner,
@@ -23,7 +23,7 @@ class Team {
   factory Team.fromJson(Map<String, dynamic> json) {
     return Team(
       id: json['id'] ?? 0,
-      zekkenNumber: json['zekken_number'] ?? 'Unknown',
+      //zekkenNumber: json['zekken_number'] ?? 'Unknown',
       teamName: json['team_name'] ?? 'Unknown Team',
       category: json['category'] != null
           ? NewCategory.fromJson(json['category'])
@@ -37,7 +37,7 @@ class Team {
   Map<String, dynamic> toJson() {
     return {
       'id': id,
-      'zekken_number': zekkenNumber,
+      //'zekken_number': zekkenNumber,
       'team_name': teamName,
       'category': category.toJson(),
       'owner': owner.toJson(),