Semi Final 7th Aug 2024

lib/pages/team/member_controller.dart

@@ -91,6 +91,7 @@ class MemberController extends GetxController {
     lastname.value = value;
   }
 
+
   Future<bool> saveMember() async {
     if (!_validateInputs()) return false;
 
@@ -139,8 +140,8 @@ class MemberController extends GetxController {
     return '${lastname.value} ${firstname.value}'.trim();
   }
 
-  Future<void> updateMember() async {
-    if (member.value == null) return;
+  Future<bool> updateMember() async {
+    if (member.value == null) return false;
     int? memberId = member.value?.id;
     try {
       final updatedMember = await _apiService.updateTeamMember(
@@ -152,15 +153,17 @@ class MemberController extends GetxController {
         female.value,
       );
       member.value = updatedMember;
+      return true;
     } catch (e) {
       print('Error updating member: $e');
+      return false;
     }
   }
 
-  Future<void> deleteMember() async {
+  Future<bool> deleteMember() async {
     if (member.value == null || member.value!.id == null) {
       Get.snackbar('エラー', 'メンバー情報が不正です', snackPosition: SnackPosition.BOTTOM);
-      return;
+      return false;
     }
 
     try {
@@ -168,11 +171,14 @@ class MemberController extends GetxController {
       await _apiService.deleteTeamMember(teamId, member.value!.id!);
       Get.snackbar('成功', 'メンバーが削除されました', snackPosition: SnackPosition.BOTTOM);
       member.value = null;
+      isLoading.value = false;
+      return true;
+
     } catch (e) {
       print('Error deleting member: $e');
       Get.snackbar('エラー', 'メンバーの削除に失敗しました: ${e.toString()}', snackPosition: SnackPosition.BOTTOM);
-    } finally {
       isLoading.value = false;
+      return false;
     }
   }
 
@@ -251,10 +257,10 @@ class MemberController extends GetxController {
       yearsFromSchoolStart--;
     }
 
-    if (yearsFromSchoolStart < 0) return '未就学';
-    if (yearsFromSchoolStart < 6) return '小${yearsFromSchoolStart + 1}';
-    if (yearsFromSchoolStart < 9) return '中${yearsFromSchoolStart - 5}';
-    if (yearsFromSchoolStart < 12) return '高${yearsFromSchoolStart - 8}';
+    if (yearsFromSchoolStart < 7) return '未就学';
+    if (yearsFromSchoolStart < 13) return '小${yearsFromSchoolStart - 6}';
+    if (yearsFromSchoolStart < 16) return '中${yearsFromSchoolStart - 12}';
+    if (yearsFromSchoolStart < 19) return '高${yearsFromSchoolStart - 15}';
     return '成人';
   }