diff --git a/backend/app.js b/backend/app.js
index ee1ca6b..9cbd26c 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -34,7 +34,7 @@ function getDomain(origin) {
}
}
-const allowedDomains = ['lanebow.com', 'localhost'];
+const allowedDomains = ['lanebow.com', 'www.lanebow.com', 'localhost'];
app.use(cors({
origin: function(origin, callback) {
@@ -159,18 +159,17 @@ app.use('/api/users', userRoutes);
app.use('/api/notifications', notificationRoutes);
app.use('/api/menus', menuRoutes);
-// 정적 파일 제공 설정
+// 정적 파일 제공 설정 (Flutter Web 빌드 산출물)
const path = require('path');
-app.use(express.static(path.join(__dirname, '../frontend/dist')));
+const WEB_ROOT = process.env.FRONTEND_ROOT || path.join(__dirname, '../public');
+app.use(express.static(WEB_ROOT));
-// API 요청이 아닌 모든 요청은 Vue 앱으로 라우팅
+// API 요청이 아닌 모든 요청은 Flutter Web 앱으로 라우팅 (SPA Fallback)
app.get('*', (req, res, next) => {
- // API 요청은 무시하고 다음 미들웨어로 전달
if (req.path.startsWith('/api/')) {
return next();
}
- // Vue 앱의 index.html 반환
- res.sendFile(path.join(__dirname, '../frontend/dist/index.html'));
+ res.sendFile(path.join(WEB_ROOT, 'index.html'));
});
// 서버 시작
diff --git a/mobile/ios/Flutter/AppFrameworkInfo.plist b/mobile/ios/Flutter/AppFrameworkInfo.plist
index 7c56964..1dc6cf7 100644
--- a/mobile/ios/Flutter/AppFrameworkInfo.plist
+++ b/mobile/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
CFBundleVersion
1.0
MinimumOSVersion
- 12.0
+ 13.0
diff --git a/mobile/ios/Podfile b/mobile/ios/Podfile
index e549ee2..620e46e 100644
--- a/mobile/ios/Podfile
+++ b/mobile/ios/Podfile
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+# platform :ios, '13.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index dc2d326..ec787a8 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -98,17 +98,17 @@ SPEC CHECKSUMS:
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
- Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+ Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
in_app_purchase_storekit: d1a48cb0f8b29dbf5f85f782f5dd79b21b90a5e6
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
- path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+ path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
SDWebImage: f29024626962457f3470184232766516dee8dfea
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
- shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+ shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-PODFILE CHECKSUM: 4305caec6b40dde0ae97be1573c53de1882a07e5
+PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
COCOAPODS: 1.16.2
diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 5fcef8a..a4a16d8 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -455,7 +455,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -584,7 +584,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -635,7 +635,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 9a10e5c..7ae81e1 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -15,7 +15,7 @@ import 'screens/club/dashboard_screen.dart';
import 'screens/club/members_screen.dart';
import 'screens/club/events_screen.dart';
import 'screens/club/club_settings_screen.dart';
-import 'screens/score/club_statistics_screen.dart';
+// import 'screens/score/club_statistics_screen.dart';
import 'widgets/dialog_actions.dart';
// 전역 네비게이터 키 (인증 오류 처리용)
@@ -171,12 +171,11 @@ class _HomeScreenState extends State {
int _selectedIndex = 0;
bool _isInit = false;
- static final List _widgetOptions = [
- const DashboardScreen(),
- const MembersScreen(),
- const EventsScreen(),
- const ClubStatisticsScreen(),
- const ProfileScreen(),
+ List get _widgetOptions => const [
+ DashboardScreen(),
+ MembersScreen(),
+ EventsScreen(),
+ ProfileScreen(),
];
void _onItemTapped(int index) {
@@ -367,28 +366,29 @@ class _HomeScreenState extends State {
},
),
actions: [
- IconButton(
- icon: const Icon(Icons.notifications),
- onPressed: () async {
- // 알림 권한 요청
- final notificationService = NotificationService();
- final messenger = ScaffoldMessenger.of(context);
- final hasPermission = await notificationService.requestPermission();
- if (hasPermission) {
- if (context.mounted) {
- messenger.showSnackBar(
- const SnackBar(content: Text('알림 권한이 허용되었습니다')),
- );
+ if (_selectedIndex == 0)
+ IconButton(
+ icon: const Icon(Icons.notifications),
+ onPressed: () async {
+ // 알림 권한 요청 (대시보드에서만 노출)
+ final notificationService = NotificationService();
+ final messenger = ScaffoldMessenger.of(context);
+ final hasPermission = await notificationService.requestPermission();
+ if (hasPermission) {
+ if (context.mounted) {
+ messenger.showSnackBar(
+ const SnackBar(content: Text('알림 권한이 허용되었습니다')),
+ );
+ }
+ } else {
+ if (context.mounted) {
+ messenger.showSnackBar(
+ const SnackBar(content: Text('알림 권한이 거부되었습니다. 설정에서 권한을 허용해주세요')),
+ );
+ }
}
- } else {
- if (context.mounted) {
- messenger.showSnackBar(
- const SnackBar(content: Text('알림 권한이 거부되었습니다. 설정에서 권한을 허용해주세요')),
- );
- }
- }
- },
- ),
+ },
+ ),
],
),
body: _widgetOptions.elementAt(_selectedIndex),
@@ -407,10 +407,6 @@ class _HomeScreenState extends State {
icon: Icon(Icons.event),
label: '이벤트',
),
- BottomNavigationBarItem(
- icon: Icon(Icons.score),
- label: '통계',
- ),
BottomNavigationBarItem(
icon: Icon(Icons.person),
label: '프로필',
diff --git a/mobile/lib/models/event_model.dart b/mobile/lib/models/event_model.dart
index 1647436..96d9e52 100644
--- a/mobile/lib/models/event_model.dart
+++ b/mobile/lib/models/event_model.dart
@@ -53,12 +53,14 @@ class Event {
startDate: json['startDate'] != null ? DateTime.parse(json['startDate'].toString()) : DateTime.now(),
endDate: json['endDate'] != null ? DateTime.parse(json['endDate'].toString()) : null,
location: json['location']?.toString(),
- type: json['type']?.toString(),
+ // 서버는 eventType 키를 사용할 수 있으므로 보강
+ type: (json['type'] ?? json['eventType'])?.toString(),
status: json['status']?.toString(),
maxParticipants: json['maxParticipants'],
currentParticipants: json['currentParticipants'],
gameCount: json['gameCount'],
- participantFee: json['participantFee'] != null ? double.tryParse(json['participantFee'].toString()) : null,
+ // 참가비: 서버가 "0"/"0.00" 등으로 기본화할 수 있어 0은 null로 간주
+ participantFee: Event._parseParticipantFeeOrNull(json['participantFee']),
registrationDeadline: json['registrationDeadline'] != null ? DateTime.parse(json['registrationDeadline'].toString()) : null,
publicHash: json['publicHash']?.toString(),
accessPassword: json['accessPassword']?.toString(),
@@ -69,6 +71,19 @@ class Event {
);
}
+ // 참가비 파싱 헬퍼: null/빈문자열/0/"0.00" 모두 null로 간주
+ static double? _parseParticipantFeeOrNull(dynamic value) {
+ if (value == null) return null;
+ final s = value.toString().trim();
+ if (s.isEmpty) return null;
+ final d = double.tryParse(s);
+ if (d == null) return null;
+ // 0도 유효한 값으로 취급하여 표시되도록 그대로 반환
+ return d;
+ }
+
+
+
// Event 객체를 JSON으로 변환
Map toJson() {
return {
diff --git a/mobile/lib/models/member_model.dart b/mobile/lib/models/member_model.dart
index 8941949..ea7cbbf 100644
--- a/mobile/lib/models/member_model.dart
+++ b/mobile/lib/models/member_model.dart
@@ -14,6 +14,7 @@ class Member {
final String? memberType;
final int? handicap;
final String? status;
+ final double? average;
final DateTime? createdAt;
final DateTime? updatedAt;
final DateTime? birthDate; // 생년월일 추가
@@ -34,6 +35,7 @@ class Member {
this.memberType,
this.handicap,
this.status,
+ this.average,
this.createdAt,
this.updatedAt,
this.birthDate,
@@ -57,6 +59,12 @@ class Member {
memberType: json['memberType']?.toString(),
handicap: json['handicap'] != null ? int.tryParse(json['handicap'].toString()) : null,
status: json['status']?.toString(),
+ average: () {
+ final val = json['average'];
+ if (val == null) return null;
+ if (val is num) return val.toDouble();
+ return double.tryParse(val.toString());
+ }(),
createdAt: json['createdAt'] != null ? DateTime.parse(json['createdAt'].toString()) : null,
updatedAt: json['updatedAt'] != null ? DateTime.parse(json['updatedAt'].toString()) : null,
birthDate: json['birthDate'] != null ? DateTime.parse(json['birthDate'].toString()) : null,
@@ -81,6 +89,7 @@ class Member {
'memberType': memberType,
'handicap': handicap,
'status': status,
+ 'average': average,
'createdAt': createdAt?.toIso8601String(),
'updatedAt': updatedAt?.toIso8601String(),
'birthDate': birthDate?.toIso8601String(),
@@ -104,6 +113,7 @@ class Member {
String? memberType,
int? handicap,
String? status,
+ double? average,
DateTime? createdAt,
DateTime? updatedAt,
DateTime? birthDate,
@@ -124,6 +134,7 @@ class Member {
memberType: memberType ?? this.memberType,
handicap: handicap ?? this.handicap,
status: status ?? this.status,
+ average: average ?? this.average,
createdAt: createdAt ?? this.createdAt,
updatedAt: updatedAt ?? this.updatedAt,
birthDate: birthDate ?? this.birthDate,
diff --git a/mobile/lib/models/participant_model.dart b/mobile/lib/models/participant_model.dart
index 152d4d1..bac4b41 100644
--- a/mobile/lib/models/participant_model.dart
+++ b/mobile/lib/models/participant_model.dart
@@ -16,6 +16,9 @@ class Participant {
final DateTime? createdAt;
final DateTime? updatedAt;
String? memberType; // 회원 유형 필드 추가: '정회원', '준회원', '게스트' 등
+ final String? gender; // 성별 (서버 Member.gender에서 유추)
+ final int? handicap; // 핸디캡 (서버 Member.handicap에서 유추)
+ final double? average; // 백엔드에서 제공하는 동적 에버리지(옵션)
Participant({
required this.id,
@@ -34,11 +37,60 @@ class Participant {
this.notes,
this.createdAt,
this.updatedAt,
+ this.gender,
+ this.handicap,
+ this.average,
});
+ Participant copyWith({
+ String? id,
+ String? eventId,
+ String? memberId,
+ String? name,
+ String? email,
+ String? phoneNumber,
+ String? status,
+ DateTime? registeredAt,
+ DateTime? confirmedAt,
+ DateTime? cancelledAt,
+ DateTime? attendedAt,
+ bool? isPaid,
+ double? paidAmount,
+ String? notes,
+ DateTime? createdAt,
+ DateTime? updatedAt,
+ String? gender,
+ int? handicap,
+ double? average,
+ String? memberType,
+ }) {
+ return Participant(
+ id: id ?? this.id,
+ eventId: eventId ?? this.eventId,
+ memberId: memberId ?? this.memberId,
+ name: name ?? this.name,
+ email: email ?? this.email,
+ phoneNumber: phoneNumber ?? this.phoneNumber,
+ status: status ?? this.status,
+ registeredAt: registeredAt ?? this.registeredAt,
+ confirmedAt: confirmedAt ?? this.confirmedAt,
+ cancelledAt: cancelledAt ?? this.cancelledAt,
+ attendedAt: attendedAt ?? this.attendedAt,
+ isPaid: isPaid ?? this.isPaid,
+ paidAmount: paidAmount ?? this.paidAmount,
+ notes: notes ?? this.notes,
+ createdAt: createdAt ?? this.createdAt,
+ updatedAt: updatedAt ?? this.updatedAt,
+ gender: gender ?? this.gender,
+ handicap: handicap ?? this.handicap,
+ average: average ?? this.average,
+ // preserve mutable memberType even though not in ctor params order earlier
+ )..memberType = memberType ?? this.memberType;
+ }
+
// JSON 데이터로부터 Participant 객체 생성
factory Participant.fromJson(Map json) {
- return Participant(
+ final p = Participant(
id: json['id']?.toString() ?? '',
eventId: json['eventId']?.toString() ?? '',
memberId: json['memberId']?.toString() ?? '',
@@ -54,10 +106,29 @@ class Participant {
// 서버는 paymentStatus('paid'|'unpaid')를 줄 수 있으므로 이를 isPaid로 변환
isPaid: json['isPaid'] ?? (json['paymentStatus']?.toString().toLowerCase() == 'paid'),
paidAmount: json['paidAmount'] != null ? double.tryParse(json['paidAmount'].toString()) : null,
- notes: json['notes']?.toString(),
+ notes: (json['notes'] ?? json['comment'])?.toString(),
createdAt: json['createdAt'] != null ? DateTime.parse(json['createdAt'].toString()) : null,
updatedAt: json['updatedAt'] != null ? DateTime.parse(json['updatedAt'].toString()) : null,
+ gender: (json['gender'] ?? json['Member']?['gender'])?.toString(),
+ handicap: () {
+ final val = json['handicap'] ?? json['Member']?['handicap'];
+ if (val == null) return null;
+ if (val is num) return val.toInt();
+ return int.tryParse(val.toString());
+ }(),
+ average: () {
+ final val = json['average'] ?? json['Member']?['average'];
+ if (val == null) return null;
+ if (val is num) return val.toDouble();
+ return double.tryParse(val.toString());
+ }(),
);
+ // 회원 유형은 원시 enum 값을 유지하고, 표시 단계에서 매핑
+ final rawType = (json['memberType'] ?? json['Member']?['memberType'])?.toString();
+ if (rawType != null && rawType.isNotEmpty) {
+ p.memberType = rawType;
+ }
+ return p;
}
// Participant 객체를 JSON으로 변환
@@ -77,8 +148,12 @@ class Participant {
'isPaid': isPaid,
'paidAmount': paidAmount,
'notes': notes,
+ 'comment': notes,
'createdAt': createdAt?.toIso8601String(),
'updatedAt': updatedAt?.toIso8601String(),
+ 'gender': gender,
+ 'handicap': handicap,
+ 'average': average,
};
}
}
diff --git a/mobile/lib/models/score_model.dart b/mobile/lib/models/score_model.dart
index b01821f..f04d4df 100644
--- a/mobile/lib/models/score_model.dart
+++ b/mobile/lib/models/score_model.dart
@@ -3,9 +3,11 @@ class Score {
final String memberId;
final String eventId;
final String clubId;
+ final String? participantId; // 참가자 ID (백엔드 EventScore 필드)
final List frames;
final int totalScore;
final int? handicap; // 핸디캡 추가
+ final int? gameNumber; // 게임 번호 (백엔드 EventScore 필드)
final DateTime date;
final String? notes;
final String? participantName;
@@ -15,9 +17,11 @@ class Score {
required this.memberId,
required this.eventId,
required this.clubId,
+ this.participantId,
required this.frames,
required this.totalScore,
this.handicap,
+ this.gameNumber,
required this.date,
this.notes,
this.participantName,
@@ -32,9 +36,19 @@ class Score {
memberId: json['memberId']?.toString() ?? '',
eventId: json['eventId']?.toString() ?? '',
clubId: json['clubId']?.toString() ?? '',
+ participantId: json['participantId']?.toString(),
frames: json['frames'] != null ? List.from(json['frames']) : [],
- totalScore: json['totalScore'] ?? 0,
+ // 서버는 base 점수를 'score'로, 합계(핸디 포함)를 'totalScore'로 반환할 수 있음.
+ // 앱 내부에서는 base 점수를 totalScore 필드에 저장하여 일관되게 사용하고,
+ // 핸디 포함 합계는 getter(totalWithHandicap)로 계산한다.
+ totalScore: (json['score'] ?? json['totalScore']) ?? 0,
handicap: json['handicap'],
+ gameNumber: () {
+ final v = json['gameNumber'];
+ if (v == null) return null;
+ if (v is int) return v;
+ return int.tryParse(v.toString());
+ }(),
date: json['date'] != null ? DateTime.parse(json['date'].toString()) : DateTime.now(),
notes: json['notes']?.toString(),
participantName: json['participantName']?.toString(),
@@ -42,7 +56,7 @@ class Score {
}
Map toJson() {
- return {
+ final map = {
'id': id,
'memberId': memberId,
'eventId': eventId,
@@ -50,10 +64,15 @@ class Score {
'frames': frames,
'totalScore': totalScore,
'handicap': handicap,
+ 'gameNumber': gameNumber,
'date': date.toIso8601String(),
'notes': notes,
'participantName': participantName,
};
+ if (participantId != null) {
+ map['participantId'] = participantId;
+ }
+ return map;
}
}
diff --git a/mobile/lib/screens/club/club_settings_screen.dart b/mobile/lib/screens/club/club_settings_screen.dart
index bcd632d..992a22b 100644
--- a/mobile/lib/screens/club/club_settings_screen.dart
+++ b/mobile/lib/screens/club/club_settings_screen.dart
@@ -44,7 +44,8 @@ class _ClubSettingsScreenState extends State {
_isLoading = false;
_hasEditPermission = true; // 테스트에서는 편집 가능 상태로 둠
} else {
- _loadData();
+ // 첫 프레임 이후에 로드하여 InheritedWidget 접근 안전 보장
+ WidgetsBinding.instance.addPostFrameCallback((_) => _loadData());
}
}
@@ -62,8 +63,6 @@ class _ClubSettingsScreenState extends State {
_isLoading = true;
});
- // await 이전에 messenger 캡처 (catch에서 사용)
- final messenger = ScaffoldMessenger.of(context);
// await 이전에 authService 캡처 (이후 권한 계산에 사용)
final authService = Provider.of(context, listen: false);
@@ -115,7 +114,8 @@ class _ClubSettingsScreenState extends State {
});
}
} catch (error) {
- messenger.showSnackBar(
+ if (!mounted) return;
+ ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('데이터 로드 중 오류가 발생했습니다: $error')),
);
} finally {
diff --git a/mobile/lib/screens/club/event_details_screen.dart b/mobile/lib/screens/club/event_details_screen.dart
index 525f24e..709ba78 100644
--- a/mobile/lib/screens/club/event_details_screen.dart
+++ b/mobile/lib/screens/club/event_details_screen.dart
@@ -12,34 +12,38 @@ import '../../models/member_model.dart';
import '../../models/participant_model.dart';
import '../../models/score_model.dart';
import '../../models/team_model.dart';
-import '../../models/tie_breaker_option.dart';
import '../../services/club_service.dart';
import '../../services/event_service.dart';
import '../../services/member_service.dart';
import '../../services/notification_service.dart';
-import '../../utils/tie_breaker_util.dart';
import '../../utils/url_utils.dart';
import '../../widgets/loading_indicator.dart';
import '../../utils/enum_mappings.dart';
-import 'participant_form_screen.dart';
+// participant_form_screen 제거: 모든 추가는 기존 회원 빠른추가 경로로 통일
import 'score_form_screen.dart';
-import 'team_generator_screen.dart';
-import '../../theme/badges.dart';
+import 'event_form_screen.dart';
+import '../score/score_batch_edit_screen.dart';
+import 'tabs/scores_tab.dart';
+import 'tabs/basic_info_tab.dart';
+import 'tabs/participants_tab.dart';
+import 'tabs/teams_tab.dart';
class EventDetailsScreen extends StatefulWidget {
final Event event;
+ // 테스트 시 초기 비동기 로드를 건너뛰기 위한 플래그
+ @visibleForTesting
+ static bool testMode = false;
- const EventDetailsScreen({
- Key? key,
- required this.event,
- }) : super(key: key);
+ const EventDetailsScreen({Key? key, required this.event}) : super(key: key);
@override
State createState() => _EventDetailsScreenState();
}
-class _EventDetailsScreenState extends State with SingleTickerProviderStateMixin {
+class _EventDetailsScreenState extends State
+ with SingleTickerProviderStateMixin {
late TabController _tabController;
+ Event? _event; // 최신 이벤트 정보 보관
List _participants = [];
List _scores = [];
List _teams = [];
@@ -49,20 +53,16 @@ class _EventDetailsScreenState extends State with SingleTick
Club? _club;
bool _isLoading = true;
int _teamGenerationMethod = 1; // 1: 팀 인원수로 나누기, 2: 팀 개수로 나누기
- final TextEditingController _teamSizeController = TextEditingController(text: '4');
- final TextEditingController _teamCountController = TextEditingController(text: '2');
+ final TextEditingController _teamSizeController = TextEditingController(
+ text: '4',
+ );
+ final TextEditingController _teamCountController = TextEditingController(
+ text: '2',
+ );
bool _showTeamTab = false;
bool _includeHandicap = true; // 핸디캡 포함 여부
- // 참가자 필터/검색 상태
- String? _participantFilterMemberType; // null: 전체
- String? _participantFilterStatus; // null: 전체
- bool? _participantFilterPaid; // null: 전체, true: 결제완료, false: 미결제
- final TextEditingController _participantSearchController = TextEditingController();
- // 참가자 빠른추가 상태
- String? _quickAddSelectedMemberId;
- bool _quickAddLoading = false;
+ bool _groupByParticipant = false; // 점수 표시 방식: false=점수별(기존), true=참가자별 그룹
bool _clubMembersLoading = false;
- String? _clubMembersError;
VoidCallback? _memberServiceListener;
MemberService? _memberServiceRef;
@@ -88,7 +88,6 @@ class _EventDetailsScreenState extends State with SingleTick
setState(() {
_clubMembers = memberService.members;
_clubMembersLoading = memberService.isLoading;
- _clubMembersError = memberService.lastError;
});
// 리스너 등록: 회원 목록/로딩 상태 변화 시 동기화
_memberServiceListener = () {
@@ -96,15 +95,121 @@ class _EventDetailsScreenState extends State with SingleTick
setState(() {
_clubMembers = memberService.members;
_clubMembersLoading = memberService.isLoading;
- _clubMembersError = memberService.lastError;
});
};
memberService.addListener(_memberServiceListener!);
- // 이벤트 상세 로드
- _loadEventDetails();
+ // 이벤트 상세 로드 (테스트 모드에서는 스킵)
+ if (!EventDetailsScreen.testMode) {
+ _loadEventDetails();
+ } else {
+ setState(() {
+ _isLoading = false;
+ });
+ }
});
}
+ // 드래그앤드롭으로 팀 간 참가자 이동 처리
+ void _moveParticipantBetweenTeams(
+ Participant participant,
+ Team fromTeam,
+ Team toTeam,
+ int toIndex,
+ ) {
+ setState(() {
+ final fromIdx = _teams.indexWhere((t) => t.id == fromTeam.id);
+ final toIdx = _teams.indexWhere((t) => t.id == toTeam.id);
+ if (toIdx < 0) return;
+
+ final memberId = participant.memberId;
+ // remove from source (미배정에서 오는 경우 fromIdx는 -1이 될 수 있음)
+ List? fromMemberIds;
+ if (fromIdx >= 0) {
+ fromMemberIds = List.from(_teams[fromIdx].memberIds);
+ fromMemberIds.remove(memberId);
+ }
+
+ // insert into target at index
+ final toMemberIds = List.from(_teams[toIdx].memberIds);
+ // 중복 방지: 기존에 있으면 먼저 제거 (같은 팀 이동 시 길이가 줄어듦)
+ toMemberIds.remove(memberId);
+ // 제거 이후 길이에 맞춰 인덱스 보정
+ int insertIndex = toIndex.clamp(0, toMemberIds.length);
+ toMemberIds.insert(insertIndex, memberId);
+
+ if (fromIdx >= 0 && fromMemberIds != null) {
+ _teams[fromIdx] = Team(
+ id: _teams[fromIdx].id,
+ eventId: _teams[fromIdx].eventId,
+ name: _teams[fromIdx].name,
+ memberIds: fromMemberIds,
+ description: _teams[fromIdx].description,
+ createdAt: _teams[fromIdx].createdAt,
+ updatedAt: _teams[fromIdx].updatedAt,
+ );
+ }
+
+ _teams[toIdx] = Team(
+ id: _teams[toIdx].id,
+ eventId: _teams[toIdx].eventId,
+ name: _teams[toIdx].name,
+ memberIds: toMemberIds,
+ description: _teams[toIdx].description,
+ createdAt: _teams[toIdx].createdAt,
+ updatedAt: _teams[toIdx].updatedAt,
+ );
+ });
+ }
+
+
+
+ // 참가자 추가 선택 시트: 기존 회원 추가 vs 게스트 추가
+ Future _openAddChooser() async {
+ if (!mounted) return;
+ await showModalBottomSheet(
+ context: context,
+ shape: const RoundedRectangleBorder(
+ borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+ ),
+ builder: (ctx) {
+ return SafeArea(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ ListTile(
+ key: const Key('add_existing_member'),
+ leading: const Icon(Icons.person_add_alt_1),
+ title: const Text('기존 회원 추가'),
+ onTap: () async {
+ Navigator.of(ctx).pop();
+ await _openMemberQuickAddModal();
+ },
+ ),
+ ListTile(
+ key: const Key('add_guest'),
+ leading: const Icon(Icons.group_add),
+ title: const Text('게스트 추가'),
+ onTap: () async {
+ Navigator.of(ctx).pop();
+ await _openGuestModal();
+ },
+ ),
+ const SizedBox(height: 8),
+ ],
+ ),
+ );
+ },
+ );
+ }
+
+ // 테스트 전용: 탭 전환 없이 모달을 직접 오픈
+ @visibleForTesting
+ Future openQuickAddForTest() => _openMemberQuickAddModal();
+
+ // 테스트 전용: 탭 전환/ FAB 없이 추가 선택 시트를 직접 오픈
+ @visibleForTesting
+ Future openAddChooserForTest() => _openAddChooser();
+
Future _duplicateEvent() async {
final messenger = ScaffoldMessenger.of(context);
try {
@@ -121,6 +226,93 @@ class _EventDetailsScreenState extends State with SingleTick
}
}
+ @visibleForTesting
+ List> buildServerTeamsForSave(
+ List teams,
+ List participants,
+ ) {
+ final List> serverTeams = [];
+ for (int i = 0; i < teams.length; i++) {
+ final team = teams[i];
+ final members = >[];
+ for (int j = 0; j < team.memberIds.length; j++) {
+ final memberId = team.memberIds[j];
+ final participant = participants.firstWhere(
+ (p) => p.memberId == memberId,
+ orElse: () => Participant(id: '', eventId: widget.event.id, memberId: memberId),
+ );
+ if (participant.id.isNotEmpty) {
+ members.add({'id': participant.id, 'order': j + 1});
+ }
+ }
+ serverTeams.add({'teamNumber': i + 1, 'handicap': 0, 'members': members});
+ }
+ return serverTeams;
+ }
+
+ // ===== 테스트 훅들 (TDD 지원) =====
+ @visibleForTesting
+ void debugSetTeamsAndParticipants(List teams, List participants) {
+ setState(() {
+ _teams = teams;
+ _participants = participants;
+ });
+ }
+
+ @visibleForTesting
+ List debugGetTeams() => _teams.map((t) => Team(
+ id: t.id,
+ eventId: t.eventId,
+ name: t.name,
+ memberIds: List.from(t.memberIds),
+ description: t.description,
+ createdAt: t.createdAt,
+ updatedAt: t.updatedAt,
+ )).toList();
+
+ @visibleForTesting
+ void testMoveParticipantBetweenTeams(
+ Participant participant,
+ Team fromTeam,
+ Team toTeam,
+ int toIndex,
+ ) {
+ _moveParticipantBetweenTeams(participant, fromTeam, toTeam, toIndex);
+ }
+
+ @visibleForTesting
+ double debugCalculateTeamAverage(Team team) => _calculateTeamAverage(team);
+
+ @visibleForTesting
+ void debugSetScores(List scores) {
+ setState(() {
+ _scores = scores;
+ });
+ }
+
+ // 참가자별 점수 일괄 수정 화면으로 이동
+ Future _openBatchEdit(
+ Participant participant,
+ List scores,
+ ) async {
+ if (!mounted) return;
+ final messenger = ScaffoldMessenger.of(context);
+ final result = await Navigator.of(context).push(
+ MaterialPageRoute(
+ builder: (_) => ScoreBatchEditScreen(
+ eventId: widget.event.id,
+ participant: participant,
+ scores: scores,
+ gameCount: widget.event.gameCount ?? scores.length,
+ ),
+ ),
+ );
+ if (result == true && mounted) {
+ await _loadEventDetails();
+ messenger.showSnackBar(const SnackBar(content: Text('점수를 일괄 수정했습니다')));
+ }
+ }
+
@override
void dispose() {
// MemberService 리스너 해제: dispose 시점의 BuildContext 사용을 피하기 위해 보관한 ref 사용
@@ -130,17 +322,13 @@ class _EventDetailsScreenState extends State with SingleTick
} catch (_) {}
_memberServiceListener = null;
}
+
_tabController.dispose();
_teamSizeController.dispose();
_teamCountController.dispose();
- _participantSearchController.dispose();
super.dispose();
}
-
-
-
-
// 게스트 사전입력 모달 열기
Future _openGuestModal() async {
// await 이전에 필요한 의존성/서비스를 캡처
@@ -176,11 +364,18 @@ class _EventDetailsScreenState extends State with SingleTick
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
- const Text('게스트 정보 입력', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16)),
+ const Text(
+ '게스트 정보 입력',
+ style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
+ ),
const SizedBox(height: 12),
TextField(
controller: nameController,
- decoration: const InputDecoration(labelText: '이름(선택)', border: OutlineInputBorder(), prefixIcon: Icon(Icons.person)),
+ decoration: const InputDecoration(
+ labelText: '이름(선택)',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.person),
+ ),
),
const SizedBox(height: 8),
Row(
@@ -189,11 +384,29 @@ class _EventDetailsScreenState extends State with SingleTick
child: DropdownButtonFormField(
key: const Key('event_details_guest_gender_dropdown'),
value: gender,
- decoration: const InputDecoration(labelText: '성별', border: OutlineInputBorder(), prefixIcon: Icon(Icons.wc)),
+ decoration: const InputDecoration(
+ labelText: '성별',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.wc),
+ ),
isExpanded: true,
items: [
- DropdownMenuItem(value: 'male', child: Text('남', maxLines: 1, overflow: TextOverflow.ellipsis)),
- DropdownMenuItem(value: 'female', child: Text('여', maxLines: 1, overflow: TextOverflow.ellipsis)),
+ DropdownMenuItem(
+ value: 'male',
+ child: Text(
+ '남',
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ DropdownMenuItem(
+ value: 'female',
+ child: Text(
+ '여',
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
],
onChanged: (v) => gender = v ?? 'male',
),
@@ -202,9 +415,15 @@ class _EventDetailsScreenState extends State with SingleTick
Expanded(
child: TextField(
controller: handicapController,
- decoration: const InputDecoration(labelText: '핸디캡(선택)', border: OutlineInputBorder(), prefixIcon: Icon(Icons.calculate)),
+ decoration: const InputDecoration(
+ labelText: '핸디캡(선택)',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.calculate),
+ ),
keyboardType: TextInputType.number,
- inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+ inputFormatters: [
+ FilteringTextInputFormatter.digitsOnly,
+ ],
),
),
],
@@ -215,7 +434,11 @@ class _EventDetailsScreenState extends State with SingleTick
Expanded(
child: TextField(
controller: phoneController,
- decoration: const InputDecoration(labelText: '전화(선택)', border: OutlineInputBorder(), prefixIcon: Icon(Icons.phone)),
+ decoration: const InputDecoration(
+ labelText: '전화(선택)',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.phone),
+ ),
keyboardType: TextInputType.phone,
),
),
@@ -223,27 +446,53 @@ class _EventDetailsScreenState extends State with SingleTick
Expanded(
child: TextField(
controller: emailController,
- decoration: const InputDecoration(labelText: '이메일(선택)', border: OutlineInputBorder(), prefixIcon: Icon(Icons.email)),
+ decoration: const InputDecoration(
+ labelText: '이메일(선택)',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.email),
+ ),
keyboardType: TextInputType.emailAddress,
),
),
],
),
const SizedBox(height: 12),
- const Text('참가 정보', style: TextStyle(fontWeight: FontWeight.bold)),
+ const Text(
+ '참가 정보',
+ style: TextStyle(fontWeight: FontWeight.bold),
+ ),
const SizedBox(height: 8),
Row(
children: [
Expanded(
child: DropdownButtonFormField(
- key: const Key('event_details_participant_status_dropdown'),
- value: (participantStatusOptions.keys.contains(participantStatus)) ? participantStatus : null,
- decoration: const InputDecoration(labelText: '상태', border: OutlineInputBorder(), prefixIcon: Icon(Icons.verified_user)),
+ key: const Key(
+ 'event_details_participant_status_dropdown',
+ ),
+ value:
+ (participantStatusOptions.keys.contains(
+ participantStatus,
+ ))
+ ? participantStatus
+ : null,
+ decoration: const InputDecoration(
+ labelText: '상태',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.verified_user),
+ ),
isExpanded: true,
- items: participantStatusOptions.entries.map((e) => DropdownMenuItem(
- value: e.key,
- child: Text(e.value, maxLines: 1, overflow: TextOverflow.ellipsis),
- )).toList(),
+ items: participantStatusOptions.entries
+ .map(
+ (e) => DropdownMenuItem(
+ value: e.key,
+ child: Text(
+ e.value,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ )
+ .toList(),
onChanged: (v) => participantStatus = v ?? 'pending',
),
),
@@ -251,13 +500,28 @@ class _EventDetailsScreenState extends State with SingleTick
Expanded(
child: DropdownButtonFormField(
key: const Key('event_details_payment_status_dropdown'),
- value: (paymentStatusOptions.keys.contains(paymentStatus)) ? paymentStatus : null,
- decoration: const InputDecoration(labelText: '결제', border: OutlineInputBorder(), prefixIcon: Icon(Icons.payment)),
+ value:
+ (paymentStatusOptions.keys.contains(paymentStatus))
+ ? paymentStatus
+ : null,
+ decoration: const InputDecoration(
+ labelText: '결제',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.payment),
+ ),
isExpanded: true,
- items: paymentStatusOptions.entries.map((e) => DropdownMenuItem(
- value: e.key,
- child: Text(e.value, maxLines: 1, overflow: TextOverflow.ellipsis),
- )).toList(),
+ items: paymentStatusOptions.entries
+ .map(
+ (e) => DropdownMenuItem(
+ value: e.key,
+ child: Text(
+ e.value,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ )
+ .toList(),
onChanged: (v) => paymentStatus = v ?? 'unpaid',
),
),
@@ -266,7 +530,11 @@ class _EventDetailsScreenState extends State with SingleTick
const SizedBox(height: 8),
TextField(
controller: commentController,
- decoration: const InputDecoration(labelText: '비고(선택)', border: OutlineInputBorder(), prefixIcon: Icon(Icons.notes)),
+ decoration: const InputDecoration(
+ labelText: '비고(선택)',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.notes),
+ ),
maxLines: 2,
),
const SizedBox(height: 12),
@@ -296,19 +564,27 @@ class _EventDetailsScreenState extends State with SingleTick
},
);
- if (result != true) return;
+ if (result != true) {
+ return;
+ }
// 저장 처리: 입력값 기반으로 회원 생성 후 참가자 추가
- setState(() => _quickAddLoading = true);
+ setState(() => _isLoading = true);
try {
final Map memberPayload = {
- 'name': (nameController.text.trim().isEmpty) ? '게스트' : nameController.text.trim(),
+ 'name': (nameController.text.trim().isEmpty)
+ ? '게스트'
+ : nameController.text.trim(),
'gender': gender, // 백엔드 필수
'memberType': 'guest',
'status': 'active',
};
- if (phoneController.text.trim().isNotEmpty) memberPayload['phone'] = phoneController.text.trim();
- if (emailController.text.trim().isNotEmpty) memberPayload['email'] = emailController.text.trim();
+ if (phoneController.text.trim().isNotEmpty) {
+ memberPayload['phone'] = phoneController.text.trim();
+ }
+ if (emailController.text.trim().isNotEmpty) {
+ memberPayload['email'] = emailController.text.trim();
+ }
if (handicapController.text.trim().isNotEmpty) {
final parsed = int.tryParse(handicapController.text.trim());
if (parsed != null) memberPayload['handicap'] = parsed;
@@ -322,19 +598,22 @@ class _EventDetailsScreenState extends State with SingleTick
'status': participantStatus,
'paymentStatus': paymentStatus,
};
- if (commentController.text.trim().isNotEmpty) participantPayload['comment'] = commentController.text.trim();
+ if (commentController.text.trim().isNotEmpty) {
+ participantPayload['comment'] = commentController.text.trim();
+ }
- final newParticipant = await eventService.addParticipant(widget.event.id, participantPayload);
- if (!mounted) return;
- setState(() {
- _participants.add(newParticipant);
- });
+ await eventService.addParticipant(widget.event.id, participantPayload);
+ if (!mounted) {
+ return;
+ }
+ // 서버 재조회로 상세 정보 반영
+ await _loadEventDetails();
messenger.showSnackBar(const SnackBar(content: Text('게스트를 추가했습니다.')));
} catch (e) {
messenger.showSnackBar(SnackBar(content: Text('게스트 추가 실패: $e')));
} finally {
if (mounted) {
- setState(() => _quickAddLoading = false);
+ setState(() => _isLoading = false);
}
}
}
@@ -353,22 +632,75 @@ class _EventDetailsScreenState extends State with SingleTick
eventService.setClubId(widget.event.clubId);
// MemberService도 clubId가 필요하므로 함께 주입한다.
await memberService.setClubId(widget.event.clubId);
-
+
+ // 최신 이벤트 상세 로드
+ final fetchedEvent = await eventService.fetchEventById(widget.event.id);
+
// 참가자 목록 로드
- final participants = await eventService.fetchEventParticipants(widget.event.id);
-
+ final participants = await eventService.fetchEventParticipants(
+ widget.event.id,
+ );
+
// 점수 목록 로드
final scores = await eventService.fetchEventScores(widget.event.id);
-
+
+ // participantId 누락 데이터 보정: memberId로 매칭하여 participantId 채움
+ final Map memberIdToParticipantId = {
+ for (final p in participants) p.memberId: p.id,
+ };
+ final adjustedScores = scores.map((s) {
+ if (s.participantId == null || s.participantId!.isEmpty) {
+ final pid = memberIdToParticipantId[s.memberId];
+ if (pid != null) {
+ return Score(
+ id: s.id,
+ memberId: s.memberId,
+ eventId: s.eventId,
+ clubId: s.clubId,
+ participantId: pid,
+ frames: s.frames,
+ totalScore: s.totalScore,
+ handicap: s.handicap,
+ gameNumber: s.gameNumber,
+ date: s.date,
+ notes: s.notes,
+ participantName: s.participantName,
+ );
+ }
+ }
+ return s;
+ }).toList();
+
// 클럽 정보 로드
final club = await clubService.fetchClub(widget.event.clubId);
-
+
// 회원 정보 로드 (동점자 처리 시 생년월일 사용)
final memberIds = participants.map((p) => p.memberId).toList();
- final members = await memberService.fetchMembersByIds(widget.event.clubId, memberIds);
+ final members = await memberService.fetchMembersByIds(
+ widget.event.clubId,
+ memberIds,
+ );
+ // 참가자 정보 보강: Member에서 handicap/gender/name 보완
+ final Map memberById = {for (final m in members) m.id: m};
+ final List enrichedParticipants = participants.map((p) {
+ final m = memberById[p.memberId];
+ if (m == null) return p;
+ final int? pHcp = p.handicap;
+ final bool needHcp = pHcp == null || pHcp <= 0;
+ final String? pGender = p.gender;
+ final bool needGender = pGender == null || pGender.isEmpty;
+ final String? pName = p.name;
+ final bool needName = pName == null || pName.isEmpty;
+ if (!needHcp && !needGender && !needName) return p;
+ return p.copyWith(
+ handicap: needHcp ? m.handicap : p.handicap,
+ gender: needGender ? m.gender : p.gender,
+ name: needName ? m.name : p.name,
+ );
+ }).toList();
// 빠른추가용 클럽 전체 회원 목록 로드 (MemberService 리스너로 동기화되므로 별도 setState 없이 호출만)
await memberService.fetchClubMembers();
-
+
// 팀 목록 로드 (선택적)
List teams = [];
try {
@@ -382,8 +714,9 @@ class _EventDetailsScreenState extends State with SingleTick
if (mounted) {
setState(() {
- _participants = participants;
- _scores = scores;
+ _event = fetchedEvent;
+ _participants = enrichedParticipants;
+ _scores = adjustedScores;
_teams = teams;
_club = club;
_members = members;
@@ -396,52 +729,35 @@ class _EventDetailsScreenState extends State with SingleTick
setState(() {
_isLoading = false;
});
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(content: Text('이벤트 정보를 불러오는데 실패했습니다: $e')),
- );
+ ScaffoldMessenger.of(
+ context,
+ ).showSnackBar(SnackBar(content: Text('이벤트 정보를 불러오는데 실패했습니다: $e')));
}
}
}
- Future _reloadClubMembers() async {
- try {
- setState(() => _clubMembersLoading = true);
- final memberService = Provider.of(context, listen: false);
- await memberService.fetchClubMembers();
- if (!mounted) return;
- setState(() {
- _clubMembers = memberService.members;
- _clubMembersLoading = false;
- _clubMembersError = memberService.lastError;
- });
- } catch (e) {
- if (!mounted) return;
- setState(() {
- _clubMembersLoading = false;
- _clubMembersError = e.toString();
- });
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(content: Text('회원 목록을 불러오지 못했습니다: $e')),
- );
- }
- }
+ // 상단 빠른추가 제거로 재조회 핸들러는 더 이상 사용하지 않습니다.
// 이벤트 공유 기능
void _shareEvent() {
// 공유할 내용 구성
final String eventTitle = widget.event.title;
- final String eventType = widget.event.type ?? '기타';
- final String eventDate = DateFormat('yyyy-MM-dd HH:mm').format(widget.event.startDate);
+ final String eventType = getEventTypeLabel(widget.event.type);
+ final String eventDate = DateFormat(
+ 'yyyy-MM-dd HH:mm',
+ ).format(widget.event.startDate);
final String eventLocation = widget.event.location ?? '장소 미정';
-
+
// 공개 URL 생성
String shareUrl = '';
- if (widget.event.publicHash != null && widget.event.publicHash!.isNotEmpty) {
+ if (widget.event.publicHash != null &&
+ widget.event.publicHash!.isNotEmpty) {
shareUrl = UrlUtils.getEventPublicUrl(widget.event.publicHash!);
}
-
+
// 공유 메시지 구성
- final String shareText = '''
+ final String shareText =
+ '''
[볼링 이벤트 초대]
$eventTitle
@@ -454,58 +770,25 @@ $eventTitle
${shareUrl.isNotEmpty ? '참가 링크: $shareUrl' : ''}
${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty ? '비밀번호: ${widget.event.accessPassword}' : ''}
''';
-
+
// 공유 다이얼로그 표시 (Share는 deprecated)
SharePlus.instance.share(
- ShareParams(
- text: shareText,
- subject: '볼링 이벤트: $eventTitle',
- ),
+ ShareParams(text: shareText, subject: '볼링 이벤트: $eventTitle'),
);
}
- // 공통 배지 위젯 빌더
- Widget _buildBadge({
- required String text,
- required Color color,
- required IconData icon,
- }) {
- return Chip(
- avatar: Icon(
- icon,
- color: Theme.of(context).colorScheme.onPrimary,
- size: 18,
- ),
- label: Text(
- text,
- style: TextStyle(
- color: Theme.of(context).colorScheme.onPrimary,
- fontWeight: FontWeight.w600,
- ),
- ),
- backgroundColor: color,
- padding: const EdgeInsets.symmetric(horizontal: 8),
- materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
- visualDensity: VisualDensity.compact,
- );
- }
+
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(
- widget.event.title,
+ (_event ?? widget.event).title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
- actions: [
- IconButton(
- icon: const Icon(Icons.copy),
- tooltip: '복제',
- onPressed: _duplicateEvent,
- ),
- ],
+ actions: _buildAppBarActions(),
bottom: TabBar(
controller: _tabController,
tabs: [
@@ -527,951 +810,100 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
if (_showTeamTab) _buildTeamsTab(),
],
),
- floatingActionButton: _buildFloatingActionButton(),
+ // FAB 제거: 상단 AppBar actions로 통합
);
}
- Widget _buildFloatingActionButton() {
+ List _buildAppBarActions() {
final currentTab = _tabController.index;
-
+ final actions = [];
switch (currentTab) {
- case 0: // 기본 정보 탭
- return FloatingActionButton(
- onPressed: _editEvent,
- child: const Icon(Icons.edit),
+ case 0: // 기본 정보
+ actions.add(
+ IconButton(
+ tooltip: '이벤트 수정',
+ icon: const Icon(Icons.edit),
+ onPressed: _editEvent,
+ ),
);
- case 1: // 참가자 탭
- return FloatingActionButton(
- onPressed: _addParticipant,
- child: const Icon(Icons.person_add),
+ break;
+ case 1: // 참가자
+ actions.add(
+ IconButton(
+ tooltip: '참가자 추가',
+ icon: const Icon(Icons.person_add),
+ onPressed: _openAddChooser,
+ ),
);
- case 2: // 점수 탭
- return FloatingActionButton(
- onPressed: _addScore,
- child: const Icon(Icons.add_chart),
+ break;
+ case 2: // 점수
+ actions.add(
+ IconButton(
+ tooltip: '점수 추가',
+ icon: const Icon(Icons.add_chart),
+ onPressed: _addScore,
+ ),
);
- case 3: // 팀 탭 (표시되는 경우)
+ break;
+ case 3: // 팀
if (_showTeamTab) {
- return FloatingActionButton(
- onPressed: _generateTeams,
- child: const Icon(Icons.group_add),
- );
+ actions.addAll([
+ IconButton(
+ tooltip: '팀 재생성',
+ icon: const Icon(Icons.refresh),
+ onPressed: _isLoading ? null : _generateTeams,
+ ),
+ IconButton(
+ tooltip: '팀 저장',
+ icon: const Icon(Icons.save),
+ onPressed: _isLoading ? null : _saveTeams,
+ ),
+ ]);
}
- return Container();
- default:
- return Container();
+ break;
}
+ return actions;
}
// 기본 정보 탭
Widget _buildBasicInfoTab() {
- return SingleChildScrollView(
- padding: const EdgeInsets.all(16),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- // 이벤트 유형 및 상태 뱃지
- Row(
- children: [
- Expanded(
- child: Wrap(
- spacing: 8,
- runSpacing: 4,
- children: [
- _buildBadge(
- text: widget.event.type ?? '기타',
- color: _getTypeColor(widget.event.type ?? '기타'),
- icon: _getTypeIcon(widget.event.type ?? '기타'),
- ),
- if (widget.event.status != null)
- BadgeStyles.eventStatus(widget.event.status!),
- ],
- ),
- ),
- // 공유 버튼 추가
- IconButton(
- icon: const Icon(Icons.share),
- onPressed: _shareEvent,
- tooltip: '이벤트 공유',
- ),
- ],
- ),
- const SizedBox(height: 16),
-
- // 이벤트 설명
- if (widget.event.description != null && widget.event.description!.isNotEmpty) ...[
- const Text(
- '설명',
- style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
- ),
- const SizedBox(height: 8),
- Container(
- width: double.infinity,
- padding: const EdgeInsets.all(12),
- decoration: BoxDecoration(
- color: Colors.grey[100],
- borderRadius: BorderRadius.circular(8),
- ),
- child: Text(widget.event.description ?? ''),
- ),
- const SizedBox(height: 16),
- ],
-
- // 이벤트 정보
- const Text(
- '이벤트 정보',
- style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
- ),
- const SizedBox(height: 8),
- _buildInfoRow(
- Icons.calendar_today,
- '시작: ${DateFormat('yyyy-MM-dd HH:mm').format(widget.event.startDate)}',
- ),
- if (widget.event.endDate != null)
- _buildInfoRow(
- Icons.calendar_today,
- '종료: ${DateFormat('yyyy-MM-dd HH:mm').format(widget.event.endDate!)}',
- ),
- if (widget.event.location != null && widget.event.location!.isNotEmpty)
- _buildInfoRow(Icons.location_on, '장소: ${widget.event.location}'),
- if (widget.event.maxParticipants != null)
- _buildInfoRow(
- Icons.people,
- '최대 참가자: ${widget.event.maxParticipants}명',
- ),
- if (widget.event.gameCount != null)
- _buildInfoRow(
- Icons.sports,
- '게임 수: ${widget.event.gameCount}게임',
- ),
- if (widget.event.participantFee != null)
- _buildInfoRow(
- Icons.attach_money,
- '참가비: ${NumberFormat.currency(locale: 'ko_KR', symbol: '₩', decimalDigits: 0).format(widget.event.participantFee)}',
- ),
- if (widget.event.registrationDeadline != null)
- _buildInfoRow(
- Icons.timer,
- '신청마감: ${DateFormat('yyyy-MM-dd HH:mm').format(widget.event.registrationDeadline!)}',
- ),
- const SizedBox(height: 16),
-
- // 공개 접근 정보
- const Text(
- '공개 접근',
- style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
- ),
- const SizedBox(height: 8),
- if (widget.event.publicHash != null && widget.event.publicHash!.isNotEmpty) ...[
- Row(
- children: [
- Expanded(
- child: _buildInfoRow(
- Icons.link,
- UrlUtils.getEventPublicUrl(widget.event.publicHash!),
- isSelectable: true,
- ),
- ),
- IconButton(
- icon: const Icon(Icons.copy),
- onPressed: () {
- final publicUrl = UrlUtils.getEventPublicUrl(widget.event.publicHash!);
- UrlUtils.copyUrlToClipboard(context, publicUrl);
- },
- tooltip: 'URL 복사',
- ),
- ],
- ),
- ],
- if (widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty)
- _buildInfoRow(
- Icons.lock,
- '접근 비밀번호: ${widget.event.accessPassword}',
- ),
-
- // 참가자 정보
- const SizedBox(height: 16),
- const Text(
- '참가자 정보',
- style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
- ),
- const SizedBox(height: 8),
- _buildInfoRow(
- Icons.people,
- '현재 참가자: ${_participants.length}명',
- ),
-
- // 알림 설정 버튼
- const SizedBox(height: 24),
- ElevatedButton.icon(
- onPressed: _setEventReminders,
- icon: const Icon(Icons.notifications_active),
- label: const Text('알림 설정'),
- style: ElevatedButton.styleFrom(
- foregroundColor: Colors.white,
- backgroundColor: Colors.green,
- minimumSize: const Size(double.infinity, 48),
- ),
- ),
- ],
- ),
+ return BasicInfoTab(
+ event: _event ?? widget.event,
+ participantsCount: _participants.length,
+ onShareEvent: _shareEvent,
+ onSetEventReminders: _setEventReminders,
);
}
- String _buildParticipantFilterSummary() {
- final List parts = [];
- // 상태(선택된 경우에만 표시)
- if (_participantFilterStatus != null && _participantFilterStatus!.isNotEmpty) {
- parts.add('상태: ${_participantFilterStatus!}');
- }
- // 회원 유형(선택된 경우에만 표시)
- if (_participantFilterMemberType != null && _participantFilterMemberType!.isNotEmpty) {
- parts.add('유형: ${_participantFilterMemberType!}');
- }
- // 결제 상태(선택된 경우에만 표시)
- if (_participantFilterPaid != null) {
- parts.add('결제: ${_participantFilterPaid! ? '완료' : '미결제'}');
- }
- // 검색어(입력된 경우에만 표시)
- final q = _participantSearchController.text.trim();
- if (q.isNotEmpty) {
- parts.add("검색: '$q'");
- }
- if (parts.isEmpty) {
- return '필터 없음';
- }
- return parts.join(' · ');
- }
-
- bool _hasActiveParticipantFilters() {
- return (_participantFilterStatus != null && _participantFilterStatus!.isNotEmpty) ||
- (_participantFilterMemberType != null && _participantFilterMemberType!.isNotEmpty) ||
- (_participantFilterPaid != null) ||
- (_participantSearchController.text.trim().isNotEmpty);
- }
+
// 참가자 탭
Widget _buildParticipantsTab() {
- // 빠른추가용 드롭다운 후보: 아직 참가자가 아닌 회원만
- final existingMemberIds = _participants.map((p) => p.memberId).whereType().toSet();
- final quickAddCandidates = _clubMembers
- .where((m) => !existingMemberIds.contains(m.id))
- .toList()
- ..sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
- final candidateIds = quickAddCandidates.map((m) => m.id).toSet();
- final String? safeSelectedMemberId =
- (_quickAddSelectedMemberId != null && candidateIds.contains(_quickAddSelectedMemberId))
- ? _quickAddSelectedMemberId
- : null;
- // 필터 옵션 집계
- final Set memberTypeOptions = _participants
- .where((p) => (p.memberType ?? '').isNotEmpty)
- .map((p) => p.memberType!)
- .toSet();
- final Set statusOptions = _participants
- .where((p) => (p.status ?? '').isNotEmpty)
- .map((p) => p.status!)
- .toSet();
-
- // 필터/검색 적용된 목록
- final List filtered = _participants.where((p) {
- final matchesType = _participantFilterMemberType == null || (_participantFilterMemberType!.isEmpty) || p.memberType == _participantFilterMemberType;
- final matchesStatus = _participantFilterStatus == null || (_participantFilterStatus!.isEmpty) || p.status == _participantFilterStatus;
- final matchesPaid = _participantFilterPaid == null || p.isPaid == _participantFilterPaid;
- final query = _participantSearchController.text.trim().toLowerCase();
- final matchesQuery = query.isEmpty || (p.name ?? '').toLowerCase().contains(query);
- return matchesType && matchesStatus && matchesPaid && matchesQuery;
- }).toList();
-
- return ListView.builder(
- itemCount: filtered.length + 1,
- itemBuilder: (context, index) {
- if (index == 0) {
- // 필터/검색 바 UI
- return Padding(
- padding: const EdgeInsets.fromLTRB(12, 8, 12, 4),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- // 참가자 빠른추가 영역
- Card(
- color: Colors.orange.shade50,
- child: Padding(
- padding: const EdgeInsets.all(12),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text('참가자 빠른추가', style: TextStyle(fontWeight: FontWeight.bold)),
- const SizedBox(height: 8),
- if (_clubMembersLoading) ...[
- Row(
- key: const Key('club_members_loading_row'),
- children: const [
- SizedBox(
- key: Key('club_members_loading_spinner'),
- width: 18,
- height: 18,
- child: CircularProgressIndicator(strokeWidth: 2)),
- SizedBox(width: 8),
- Text('회원 목록을 불러오는 중...', key: Key('club_members_loading_text')),
- ],
- ),
- const SizedBox(height: 8),
- ] else if (_clubMembersError != null && _clubMembersError!.isNotEmpty) ...[
- Row(
- key: const Key('club_members_error_row'),
- children: [
- const Icon(Icons.error_outline, color: Colors.red),
- const SizedBox(width: 8),
- Expanded(child: Text('회원 목록 오류: ${_clubMembersError!}', key: const Key('club_members_error_text'))),
- TextButton.icon(
- key: const Key('club_members_retry_button'),
- onPressed: _reloadClubMembers,
- icon: const Icon(Icons.refresh),
- label: const Text('재시도'),
- )
- ],
- ),
- const SizedBox(height: 8),
- ] else if (quickAddCandidates.isEmpty) ...[
- Row(
- key: const Key('club_members_empty_row'),
- children: const [
- Icon(Icons.info_outline, color: Colors.grey),
- SizedBox(width: 8),
- Expanded(child: Text('추가 가능한 회원이 없습니다.', key: Key('club_members_empty_text'))),
- ],
- ),
- const SizedBox(height: 8),
- ],
- Row(
- children: [
- // 회원 선택 드롭다운
- Expanded(
- child: DropdownButtonFormField(
- value: safeSelectedMemberId,
- isExpanded: true,
- decoration: const InputDecoration(
- labelText: '회원 선택',
- border: OutlineInputBorder(),
- prefixIcon: Icon(Icons.person_search),
- ),
- items: quickAddCandidates.map((m) {
- return DropdownMenuItem(
- value: m.id,
- child: Text(
- m.name,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- );
- }).toList(),
- onChanged: _clubMembersLoading ? null : (val) => setState(() => _quickAddSelectedMemberId = val),
- ),
- ),
- const SizedBox(width: 8),
- // 재조회 버튼
- IconButton(
- tooltip: '회원 목록 새로고침',
- onPressed: _clubMembersLoading ? null : _reloadClubMembers,
- icon: _clubMembersLoading
- ? const SizedBox(width: 18, height: 18, child: CircularProgressIndicator(strokeWidth: 2))
- : const Icon(Icons.refresh),
- ),
- const SizedBox(width: 4),
- ElevatedButton.icon(
- onPressed: (_quickAddLoading || _quickAddSelectedMemberId == null)
- ? null
- : _quickAddMember,
- icon: _quickAddLoading
- ? const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2))
- : const Icon(Icons.person_add),
- label: const Text('추가'),
- style: ElevatedButton.styleFrom(minimumSize: const Size(90, 48)),
- ),
- ],
- ),
- const SizedBox(height: 8),
- Align(
- alignment: Alignment.centerRight,
- child: OutlinedButton.icon(
- key: const Key('guest_preinput_button'),
- onPressed: _quickAddLoading ? null : _openGuestModal,
- icon: const Icon(Icons.group_add),
- label: const Text('게스트 추가'),
- ),
- )
- ],
- ),
- ),
- ),
- ExpansionTile(
- initiallyExpanded: false,
- leading: Icon(
- Icons.filter_list,
- color: _hasActiveParticipantFilters() ? Theme.of(context).colorScheme.primary : null,
- ),
- title: Text(
- '필터/검색',
- style: TextStyle(
- color: _hasActiveParticipantFilters() ? Theme.of(context).colorScheme.primary : null,
- fontWeight: _hasActiveParticipantFilters() ? FontWeight.w600 : FontWeight.w500,
- ),
- ),
- subtitle: Text(
- _buildParticipantFilterSummary(),
- style: TextStyle(color: _hasActiveParticipantFilters() ? Colors.black87 : Colors.black54),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- childrenPadding: const EdgeInsets.only(bottom: 8, left: 8, right: 8),
- children: [
- // 검색 필드
- TextField(
- controller: _participantSearchController,
- decoration: InputDecoration(
- hintText: '이름 검색',
- prefixIcon: const Icon(Icons.search),
- suffixIcon: _participantSearchController.text.isNotEmpty
- ? IconButton(
- icon: const Icon(Icons.clear),
- onPressed: () {
- setState(() {
- _participantSearchController.clear();
- });
- },
- tooltip: '검색 지우기',
- )
- : null,
- border: const OutlineInputBorder(),
- ),
- onChanged: (_) => setState(() {}),
- ),
- const SizedBox(height: 8),
- // 상태/유형/결제 필터
- Wrap(
- spacing: 8,
- runSpacing: 4,
- children: [
- // 참가 상태 필터
- FilterChip(
- selected: _participantFilterStatus == null,
- label: const Text('상태: 전체'),
- onSelected: (_) {
- setState(() => _participantFilterStatus = null);
- },
- ),
- ...statusOptions.map((s) => FilterChip(
- selected: _participantFilterStatus == s,
- label: Text('상태: $s'),
- onSelected: (_) {
- setState(() => _participantFilterStatus = s);
- },
- )),
-
- // 회원 유형 필터
- FilterChip(
- selected: _participantFilterMemberType == null,
- label: const Text('유형: 전체'),
- onSelected: (_) {
- setState(() => _participantFilterMemberType = null);
- },
- ),
- ...memberTypeOptions.map((t) => FilterChip(
- selected: _participantFilterMemberType == t,
- label: Text('유형: $t'),
- onSelected: (_) {
- setState(() => _participantFilterMemberType = t);
- },
- )),
-
- // 결제 필터
- FilterChip(
- selected: _participantFilterPaid == null,
- label: const Text('결제: 전체'),
- onSelected: (_) {
- setState(() => _participantFilterPaid = null);
- },
- ),
- FilterChip(
- selected: _participantFilterPaid == true,
- label: const Text('결제: 완료'),
- onSelected: (_) {
- setState(() => _participantFilterPaid = true);
- },
- ),
- FilterChip(
- selected: _participantFilterPaid == false,
- label: const Text('결제: 미결제'),
- onSelected: (_) {
- setState(() => _participantFilterPaid = false);
- },
- ),
- // 초기화
- ActionChip(
- label: const Text('필터 초기화'),
- avatar: const Icon(Icons.refresh, size: 16),
- onPressed: () {
- setState(() {
- _participantFilterMemberType = null;
- _participantFilterStatus = null;
- _participantFilterPaid = null;
- _participantSearchController.clear();
- });
- },
- ),
- ],
- ),
- ],
- ),
- const SizedBox(height: 8),
- Text('표시: ${filtered.length} / 전체 ${_participants.length}명', style: const TextStyle(fontSize: 12, color: Colors.black54)),
- const Divider(height: 16),
- ],
- ),
- );
- }
-
- final participant = filtered[index - 1];
- return Card(
- margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
- child: ListTile(
- leading: CircleAvatar(
- backgroundColor: Colors.blue.shade100,
- child: Text(
- participant.name?.substring(0, 1) ?? '?',
- style: const TextStyle(color: Colors.blue),
- ),
- ),
- title: Text(
- participant.name ?? '이름 없음',
- style: const TextStyle(fontWeight: FontWeight.bold),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- subtitle: Wrap(
- spacing: 4,
- runSpacing: 4,
- children: [
- // 회원 유형 뱃지
- if (participant.memberType != null && participant.memberType!.isNotEmpty)
- Container(
- margin: const EdgeInsets.only(right: 4),
- child: BadgeStyles.memberType(participant.memberType!),
- ),
- // 참가 상태 뱃지
- if (participant.status != null)
- Container(
- margin: const EdgeInsets.only(right: 4),
- child: BadgeStyles.participantStatus(participant.status!),
- ),
- // 결제 상태 뱃지
- Container(
- margin: const EdgeInsets.only(right: 0),
- child: BadgeStyles.payment(participant.isPaid),
- ),
- ],
- ),
- trailing: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- IconButton(
- icon: const Icon(Icons.edit, size: 20),
- tooltip: '참가자 정보 수정',
- onPressed: () => _editParticipant(participant),
- ),
- IconButton(
- icon: const Icon(Icons.delete, size: 20),
- tooltip: '참가자 삭제',
- onPressed: () => _removeParticipant(participant),
- ),
- ],
- ),
- onTap: () => _showParticipantDetails(participant),
- ),
- );
- },
+ return ParticipantsTab(
+ participants: _participants,
+ scores: _scores,
+ onEditParticipant: _editParticipant,
);
}
- // 회원 선택 빠른추가 처리
- Future _quickAddMember() async {
- if (_quickAddSelectedMemberId == null) return;
- setState(() => _quickAddLoading = true);
- try {
- final eventService = Provider.of(context, listen: false);
- // 서버에는 상태를 영문 표준값으로 전송
- final newParticipant = await eventService.addParticipant(
- widget.event.id,
- {
- 'memberId': _quickAddSelectedMemberId,
- 'status': 'confirmed',
- // 백엔드 모델 ENUM은 'unpaid'|'paid' 이므로 기본 미납을 명시
- 'paymentStatus': 'unpaid',
- },
- );
- if (!mounted) return;
- setState(() {
- _participants.add(newParticipant);
- _quickAddSelectedMemberId = null;
- });
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(content: Text('참가자를 추가했습니다.')),
- );
- } catch (e) {
- if (!mounted) return;
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(content: Text('참가자 추가 실패: $e')),
- );
- } finally {
- if (mounted) {
- setState(() => _quickAddLoading = false);
- }
- }
- }
+ // 상단 빠른추가 제거로 개별 추가 핸들러는 더 이상 사용하지 않습니다.
// 점수 탭
Widget _buildScoresTab() {
- if (_scores.isEmpty) {
- return const Center(
- child: Text('등록된 점수가 없습니다.'),
- );
- }
-
- // 동점자 처리 옵션 가져오기
- List? tieBreakerOptions;
- if (_club != null && _club!.tieBreakerOptions != null && _club!.tieBreakerOptions!.isNotEmpty) {
- tieBreakerOptions = _club!.tieBreakerOptions;
- }
-
- // TieBreakerUtil을 사용하여 점수 정렬 및 순위 계산
- final sortedScores = TieBreakerUtil.sortScoresByOptions(
- _scores,
- tieBreakerOptions,
- _members,
- _includeHandicap
- );
-
- // 순위 계산
- final ranks = TieBreakerUtil.calculateRanks(sortedScores, _includeHandicap);
-
- // 평균 점수 계산
- final totalScoreSum = sortedScores.fold(0, (sum, score) =>
- sum + ((_includeHandicap) ? score.totalScore + (score.handicap ?? 0) : score.totalScore));
- final averageScore = sortedScores.isNotEmpty ? totalScoreSum / sortedScores.length : 0;
-
- // 최고/최저 점수 계산
- final int? maxScore = sortedScores.isNotEmpty
- ? sortedScores.map((s) => (_includeHandicap ? s.totalScore + (s.handicap ?? 0) : s.totalScore)).reduce((a, b) => a > b ? a : b)
- : null;
- final int? minScore = sortedScores.isNotEmpty
- ? sortedScores.map((s) => (_includeHandicap ? s.totalScore + (s.handicap ?? 0) : s.totalScore)).reduce((a, b) => a < b ? a : b)
- : null;
-
- return Column(
- children: [
- // 요약 카드
- Padding(
- padding: const EdgeInsets.fromLTRB(16, 12, 16, 0),
- child: Row(
- children: [
- Expanded(
- child: Card(
- color: Colors.blue.shade50,
- child: Padding(
- padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
- child: Row(
- children: [
- const Icon(Icons.analytics, color: Colors.blue),
- const SizedBox(width: 8),
- Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text('평균', style: TextStyle(fontSize: 12, color: Colors.black54)),
- Text(averageScore.toStringAsFixed(1), style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
- ],
- ),
- ],
- ),
- ),
- ),
- ),
- const SizedBox(width: 8),
- Expanded(
- child: Card(
- color: Colors.green.shade50,
- child: Padding(
- padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
- child: Row(
- children: [
- const Icon(Icons.trending_up, color: Colors.green),
- const SizedBox(width: 8),
- Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text('최고', style: TextStyle(fontSize: 12, color: Colors.black54)),
- Text(maxScore?.toString() ?? '-', style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
- ],
- ),
- ],
- ),
- ),
- ),
- ),
- const SizedBox(width: 8),
- Expanded(
- child: Card(
- color: Colors.red.shade50,
- child: Padding(
- padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
- child: Row(
- children: [
- const Icon(Icons.trending_down, color: Colors.red),
- const SizedBox(width: 8),
- Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text('최저', style: TextStyle(fontSize: 12, color: Colors.black54)),
- Text(minScore?.toString() ?? '-', style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
- ],
- ),
- ],
- ),
- ),
- ),
- ),
- ],
- ),
- ),
- const SizedBox(height: 8),
- // 핸디캡 포함 여부 토글
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- const Text('핸디캡 포함:', style: TextStyle(fontWeight: FontWeight.bold)),
- Switch(
- value: _includeHandicap,
- onChanged: (value) {
- setState(() {
- _includeHandicap = value;
- });
- },
- activeColor: Colors.blue,
- ),
- ],
- ),
- ),
-
- // 평균 점수 표시
- Container(
- padding: const EdgeInsets.all(8),
- margin: const EdgeInsets.all(8),
- decoration: BoxDecoration(
- color: Colors.blue.shade50,
- borderRadius: BorderRadius.circular(8),
- border: Border.all(color: Colors.blue.shade200),
- ),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- const Icon(Icons.score, color: Colors.blue),
- const SizedBox(width: 8),
- Text(
- '평균 점수: ${averageScore.toStringAsFixed(1)}',
- style: const TextStyle(fontWeight: FontWeight.bold),
- ),
- ],
- ),
- ),
-
- // 동점자 처리 옵션 표시
- if (tieBreakerOptions != null && tieBreakerOptions.isNotEmpty)
- Container(
- padding: const EdgeInsets.all(8),
- margin: const EdgeInsets.symmetric(horizontal: 8),
- decoration: BoxDecoration(
- color: Colors.green.shade50,
- borderRadius: BorderRadius.circular(8),
- border: Border.all(color: Colors.green.shade200),
- ),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text(
- '동점자 처리 우선순위:',
- style: TextStyle(fontWeight: FontWeight.bold),
- ),
- const SizedBox(height: 4),
- Wrap(
- spacing: 8,
- children: tieBreakerOptions.map((option) {
- String optionText = '';
- switch (option) {
- case TieBreakerOption.lowerHandicap:
- optionText = '핸디캡 낮은 순';
- break;
- case TieBreakerOption.lowerScoreGap:
- optionText = '점수 격차 작은 순';
- break;
- case TieBreakerOption.olderAge:
- optionText = '연장자 우선';
- break;
- case TieBreakerOption.none:
- optionText = '없음';
- break;
- }
- return Chip(
- label: Text(optionText),
- backgroundColor: Colors.green.shade100,
- );
- }).toList(),
- ),
- ],
- ),
- ),
-
- // 점수 목록
- Expanded(
- child: ListView.builder(
- itemCount: sortedScores.length,
- itemBuilder: (context, index) {
- final score = sortedScores[index];
- final rank = ranks[score.id] ?? (index + 1); // 동점자 처리된 순위
-
- // 참가자 이름 찾기
- final participant = _participants.firstWhere(
- (p) => p.memberId == score.memberId,
- orElse: () => Participant(
- id: '',
- eventId: '',
- memberId: score.memberId,
- name: '알 수 없음',
- ),
- );
-
- return Card(
- margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
- child: ListTile(
- leading: Stack(
- children: [
- // 배경 원
- Container(
- width: 40,
- height: 40,
- decoration: BoxDecoration(
- color: _getRankColor(rank),
- shape: BoxShape.circle,
- ),
- ),
- // 순위 텍스트
- Container(
- width: 40,
- height: 40,
- alignment: Alignment.center,
- child: Text(
- rank.toString(),
- key: Key('rank_${rank}_text'),
- style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
- ),
- ),
- // 테스트를 위한 추가 텍스트 (투명)
- Positioned(
- left: 0,
- right: 0,
- top: 0,
- child: Text(
- rank.toString(),
- textAlign: TextAlign.center,
- style: const TextStyle(color: Colors.transparent),
- ),
- ),
- ],
- ),
- title: Row(
- children: [
- Expanded(
- child: Text(
- participant.name ?? '알 수 없음',
- style: const TextStyle(fontWeight: FontWeight.bold),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- ),
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
- decoration: BoxDecoration(
- color: Colors.blue.shade100,
- borderRadius: BorderRadius.circular(12),
- ),
- child: Text(
- _includeHandicap
- ? '총점: ${score.totalScore + (score.handicap ?? 0)} (${score.totalScore}+${score.handicap ?? 0})'
- : '총점: ${score.totalScore}',
- style: const TextStyle(fontWeight: FontWeight.bold),
- ),
- ),
- ],
- ),
- subtitle: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const SizedBox(height: 4),
- Text(
- '날짜: ${DateFormat('yyyy-MM-dd').format(score.date)}',
- ),
- const SizedBox(height: 4),
- SingleChildScrollView(
- scrollDirection: Axis.horizontal,
- child: Row(
- children: score.frames.asMap().entries.map((entry) {
- return Container(
- width: 30,
- height: 30,
- margin: const EdgeInsets.only(right: 4),
- decoration: BoxDecoration(
- color: _getScoreColor(entry.value),
- borderRadius: BorderRadius.circular(4),
- ),
- child: Center(
- child: Text(
- // 스트라이크는 'X'로, 스페어는 '/'로 표시
- _getFrameDisplay(entry.key, entry.value, score.frames),
- style: const TextStyle(
- color: Colors.white,
- fontWeight: FontWeight.bold,
- ),
- ),
- ),
- );
- }).toList(),
- ),
- ),
- ],
- ),
- trailing: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- IconButton(
- icon: const Icon(Icons.edit, size: 20),
- tooltip: '점수 수정',
- onPressed: () => _editScore(score),
- ),
- IconButton(
- icon: const Icon(Icons.delete, size: 20),
- tooltip: '점수 삭제',
- onPressed: () => _deleteScore(score),
- ),
- ],
- ),
- onTap: () => _showScoreDetails(score),
- ),
- );
- },
- ),
- ),
- ],
+ return ScoresTab(
+ eventId: widget.event.id,
+ participants: _participants,
+ scores: _scores,
+ members: _members,
+ clubMembers: _clubMembers,
+ club: _club,
+ includeHandicap: _includeHandicap,
+ onIncludeHandicapChanged: (v) => setState(() => _includeHandicap = v),
+ groupByParticipant: _groupByParticipant,
+ onGroupByParticipantChanged: (v) => setState(() => _groupByParticipant = v),
+ onOpenBatchEdit: _openBatchEdit,
+ onEditScore: _editScore,
+ onDeleteScore: _deleteScore,
);
}
@@ -1482,6 +914,7 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
builder: (_) => ScoreFormScreen(
eventId: widget.event.id,
participants: _participants,
+ gameCount: widget.event.gameCount ?? 1,
),
),
);
@@ -1512,468 +945,126 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
}
}
- // 참가자 상세 정보 다이얼로그
- void _showParticipantDetails(Participant participant) {
+ // 팀 탭
+ Widget _buildTeamsTab() {
+ return TeamsTab(
+ event: widget.event,
+ isLoading: _isLoading,
+ teams: _teams,
+ participants: _participants,
+ scores: _scores,
+ teamGenerationMethod: _teamGenerationMethod,
+ teamSizeController: _teamSizeController,
+ teamCountController: _teamCountController,
+ unassignedParticipants: _getUnassignedParticipants(),
+ onChangeTeamGenerationMethod: (value) => setState(() => _teamGenerationMethod = value),
+ onGenerateTeams: _generateTeams,
+ onSaveTeams: _saveTeams,
+ onRemoveFromTeam: _removeFromTeam,
+ onShowParticipantSelectionDialog: _showParticipantSelectionDialog,
+ onShowTeamSelectionDialog: _showTeamSelectionDialog,
+ calculateTeamAverage: _calculateTeamAverage,
+ onShareEvent: _shareEvent,
+ onMoveParticipant: _moveParticipantBetweenTeams,
+ );
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+ // 이벤트 알림 설정 기능
+ Future _setEventReminders() async {
+ final notificationService = NotificationService();
+
+ final hasPermission = await notificationService.requestPermission();
+ if (!hasPermission) {
+ if (mounted) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text('알림 권한이 없습니다. 설정에서 권한을 허용해주세요.')),
+ );
+ }
+ return;
+ }
+
+ if (!mounted) return;
+ final messenger = ScaffoldMessenger.of(context);
+
showDialog(
context: context,
builder: (dialogContext) => AlertDialog(
- title: Text(participant.name ?? '이름 없음'),
+ title: const Text('이벤트 알림 설정'),
content: Column(
mainAxisSize: MainAxisSize.min,
- crossAxisAlignment: CrossAxisAlignment.start,
children: [
- if (participant.memberType != null)
- Text('유형: ${participant.memberType}')
- else
- const SizedBox.shrink(),
- if (participant.status != null)
- Text('상태: ${participant.status}')
- else
- const SizedBox.shrink(),
- Text('결제: ${participant.isPaid ? '결제완료' : '미결제'}'),
- if (participant.notes != null && participant.notes!.isNotEmpty) ...[
- const SizedBox(height: 8),
- Text('메모: ${participant.notes!}')
- ],
+ ListTile(
+ leading: const Icon(Icons.notifications_active),
+ title: const Text('이벤트 시작 알림'),
+ subtitle: Text(
+ '${DateFormat('yyyy-MM-dd HH:mm').format(widget.event.startDate)} 1시간 전',
+ ),
+ onTap: () async {
+ final navigator = Navigator.of(dialogContext);
+ navigator.pop();
+ await notificationService.scheduleEventStartReminder(
+ widget.event,
+ );
+ messenger.showSnackBar(
+ const SnackBar(content: Text('이벤트 시작 알림이 설정되었습니다')),
+ );
+ },
+ ),
+ if (widget.event.registrationDeadline != null)
+ ListTile(
+ leading: const Icon(Icons.timer),
+ title: const Text('등록 마감 알림'),
+ subtitle: Text(
+ '${DateFormat('yyyy-MM-dd HH:mm').format(widget.event.registrationDeadline!)} 1일 전',
+ ),
+ onTap: () async {
+ final navigator = Navigator.of(dialogContext);
+ navigator.pop();
+ await notificationService
+ .scheduleRegistrationDeadlineReminder(widget.event);
+ messenger.showSnackBar(
+ const SnackBar(content: Text('등록 마감 알림이 설정되었습니다')),
+ );
+ },
+ ),
+ ListTile(
+ leading: const Icon(Icons.notifications_off),
+ title: const Text('알림 취소'),
+ subtitle: const Text('이 이벤트에 대한 모든 알림 취소'),
+ onTap: () async {
+ final navigator = Navigator.of(dialogContext);
+ navigator.pop();
+ await notificationService.cancelEventNotifications(
+ widget.event.id,
+ );
+ messenger.showSnackBar(
+ const SnackBar(content: Text('이벤트 알림이 취소되었습니다')),
+ );
+ },
+ ),
],
),
- actions: DialogActions.confirm(
- onCancel: () => Navigator.of(dialogContext).pop(),
- onConfirm: () => Navigator.of(dialogContext).pop(),
- confirmText: '확인',
- ),
- ),
- );
- }
-
- // 팀 탭
- Widget _buildTeamsTab() {
- if (_teams.isEmpty) {
- return Center(
- child: Padding(
- padding: const EdgeInsets.all(16.0),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- const Icon(Icons.groups, size: 64, color: Colors.blue),
- const SizedBox(height: 16),
- const Text('생성된 팀이 없습니다.', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
- const SizedBox(height: 24),
- // 팀 생성 옵션
- Card(
- child: Padding(
- padding: const EdgeInsets.all(16.0),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text('팀 생성 옵션', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
- const SizedBox(height: 16),
- // 팀 생성 방법 선택
- Row(
- children: [
- Radio(
- value: 1,
- groupValue: _teamGenerationMethod,
- onChanged: (value) {
- setState(() {
- _teamGenerationMethod = value!;
- });
- },
- ),
- const Text('팀 인원수로 나누기'),
- ],
- ),
- if (_teamGenerationMethod == 1)
- Padding(
- padding: const EdgeInsets.only(left: 32.0),
- child: Row(
- children: [
- SizedBox(
- width: 80,
- child: TextFormField(
- controller: _teamSizeController,
- decoration: const InputDecoration(
- labelText: '인원수',
- suffixText: '명',
- ),
- keyboardType: TextInputType.number,
- inputFormatters: [FilteringTextInputFormatter.digitsOnly],
- ),
- ),
- const SizedBox(width: 16),
- Text('총 ${_participants.length}명 참가자'),
- ],
- ),
- ),
- const SizedBox(height: 8),
- Row(
- children: [
- Radio(
- value: 2,
- groupValue: _teamGenerationMethod,
- onChanged: (value) {
- setState(() {
- _teamGenerationMethod = value!;
- });
- },
- ),
- const Text('팀 개수로 나누기'),
- ],
- ),
- if (_teamGenerationMethod == 2)
- Padding(
- padding: const EdgeInsets.only(left: 32.0),
- child: Row(
- children: [
- SizedBox(
- width: 80,
- child: TextFormField(
- controller: _teamCountController,
- decoration: const InputDecoration(
- labelText: '팀 수',
- suffixText: '개',
- ),
- keyboardType: TextInputType.number,
- inputFormatters: [FilteringTextInputFormatter.digitsOnly],
- ),
- ),
- const SizedBox(width: 16),
- Text('총 ${_participants.length}명 참가자'),
- ],
- ),
- ),
- const SizedBox(height: 16),
- // 팀 생성 버튼
- Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- ElevatedButton.icon(
- onPressed: _isLoading ? null : _generateTeams,
- icon: _isLoading
- ? const SizedBox(
- width: 16,
- height: 16,
- child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white),
- )
- : const Icon(Icons.group_add),
- label: Text(_isLoading ? '생성 중...' : '팀 생성하기'),
- style: ElevatedButton.styleFrom(
- backgroundColor: Colors.blue,
- foregroundColor: Colors.white,
- padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
- ),
- ),
- ],
- ),
- ],
- ),
- ),
- ),
- ],
+ actions: [
+ TextButton(
+ onPressed: () => Navigator.of(dialogContext).pop(),
+ child: const Text('닫기'),
),
- ),
- );
- }
-
- // 미배정 참가자 목록 조회
- final List unassignedParticipants = _getUnassignedParticipants();
-
- return Column(
- children: [
- // 팀 관리 버튼
- Padding(
- padding: const EdgeInsets.all(8.0),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceEvenly,
- children: [
- ElevatedButton.icon(
- onPressed: _isLoading ? null : _generateTeams,
- icon: _isLoading
- ? const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white))
- : const Icon(Icons.refresh),
- label: Text(_isLoading ? '재생성 중...' : '팀 재생성'),
- style: ElevatedButton.styleFrom(
- backgroundColor: Colors.blue,
- foregroundColor: Colors.white,
- ),
- ),
- ElevatedButton.icon(
- onPressed: _isLoading ? null : _saveTeams,
- icon: _isLoading
- ? const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white))
- : const Icon(Icons.save),
- label: Text(_isLoading ? '저장 중...' : '팀 저장'),
- style: ElevatedButton.styleFrom(
- backgroundColor: Colors.green,
- foregroundColor: Colors.white,
- ),
- ),
- ],
- ),
- ),
-
- // 이벤트 설명
- if (widget.event.description != null && widget.event.description!.isNotEmpty)
- Padding(
- padding: const EdgeInsets.symmetric(vertical: 16.0),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text(
- '이벤트 설명',
- style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
- ),
- const SizedBox(height: 8),
- Text(widget.event.description!),
- ],
- ),
- ),
-
- // 공유 버튼
- Padding(
- padding: const EdgeInsets.symmetric(vertical: 16.0),
- child: ElevatedButton.icon(
- onPressed: _shareEvent,
- icon: const Icon(Icons.share),
- label: const Text('이벤트 공유'),
- style: ElevatedButton.styleFrom(
- foregroundColor: Colors.white,
- backgroundColor: Colors.blue,
- ),
- ),
- ),
-
- // 미배정 참가자 섹션
- if (unassignedParticipants.isNotEmpty)
- Card(
- margin: const EdgeInsets.all(8),
- color: Colors.amber.shade50,
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Padding(
- padding: const EdgeInsets.all(8.0),
- child: Row(
- children: [
- const Icon(Icons.person_off, color: Colors.amber),
- const SizedBox(width: 8),
- Text('미배정 참가자 (${unassignedParticipants.length}명)',
- style: const TextStyle(fontWeight: FontWeight.bold),
- ),
- ],
- ),
- ),
- const Divider(height: 1),
- Wrap(
- children: unassignedParticipants.map((participant) {
- return Padding(
- padding: const EdgeInsets.all(4.0),
- child: Chip(
- avatar: const CircleAvatar(
- child: Icon(Icons.person, size: 16),
- ),
- label: Text(participant.name ?? '알 수 없음'),
- deleteIcon: const Icon(Icons.add_circle, size: 18),
- onDeleted: () => _showTeamSelectionDialog(participant),
- ),
- );
- }).toList(),
- ),
- ],
- ),
- ),
-
- // 팀 목록
- Expanded(
- child: ListView.builder(
- itemCount: _teams.length,
- itemBuilder: (context, index) {
- final team = _teams[index];
- final teamMembers = _getTeamMembers(team);
- final teamAverage = _calculateTeamAverage(team);
-
- return Card(
- margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
- child: ExpansionTile(
- leading: CircleAvatar(
- backgroundColor: Colors.blue.shade700,
- child: Text('${index + 1}', style: const TextStyle(color: Colors.white)),
- ),
- title: Row(
- children: [
- Text('팀 ${team.name}', style: const TextStyle(fontWeight: FontWeight.bold)),
- const SizedBox(width: 8),
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
- decoration: BoxDecoration(
- color: Colors.blue.shade100,
- borderRadius: BorderRadius.circular(12),
- ),
- child: Text('${team.memberIds.length}명'),
- ),
- ],
- ),
- subtitle: Wrap(
- spacing: 4,
- crossAxisAlignment: WrapCrossAlignment.center,
- children: [
- const Icon(Icons.bar_chart, size: 16, color: Colors.blue),
- Text('팀 에버리지: ${teamAverage.toStringAsFixed(1)}'),
- ],
- ),
- children: [
- ...teamMembers.map((participant) {
- // 참가자의 평균 점수 계산
- final participantScores = _scores.where((s) => s.memberId == participant.memberId).toList();
- final participantAverage = participantScores.isNotEmpty
- ? participantScores.fold(0, (sum, s) => sum + s.totalScore) / participantScores.length
- : 0.0;
-
- return ListTile(
- leading: const CircleAvatar(
- child: Icon(Icons.person, size: 16),
- ),
- title: Text(
- participant.name ?? '알 수 없음',
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- subtitle: Text('평균: ${participantAverage.toStringAsFixed(1)}'),
- trailing: IconButton(
- icon: const Icon(Icons.remove_circle, color: Colors.red),
- tooltip: '팀에서 제외',
- onPressed: () => _removeFromTeam(team, participant),
- ),
- );
- }),
- // 팀원 추가 버튼
- if (unassignedParticipants.isNotEmpty)
- ListTile(
- leading: const Icon(Icons.add_circle, color: Colors.green),
- title: const Text('팀원 추가하기'),
- onTap: () => _showParticipantSelectionDialog(team),
- ),
- ],
- ),
- );
- },
- ),
- ),
- ],
- );
- }
-
- // 정보 행 위젯
- Widget _buildInfoRow(IconData icon, String text, {bool isSelectable = false}) {
- return Padding(
- padding: const EdgeInsets.symmetric(vertical: 8.0),
- child: Row(
- children: [
- Icon(icon, color: Colors.blue),
- const SizedBox(width: 8),
- isSelectable
- ? Expanded(
- child: SelectableText(
- text,
- style: const TextStyle(fontSize: 16),
- ),
- )
- : Expanded(
- child: Text(
- text,
- style: const TextStyle(fontSize: 16),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- ),
],
),
);
}
- // 이벤트 유형에 따른 색상 반환
- Color _getTypeColor(String type) {
- switch (type.toLowerCase()) {
- case '개인전':
- case 'individual':
- return Colors.blue;
- case '팀전':
- case 'team':
- return Colors.purple;
- case '리그':
- case 'league':
- return Colors.green;
- case '토너먼트':
- case 'tournament':
- return Colors.orange;
- default:
- return Colors.grey;
- }
- }
-
-
- // 이벤트 유형 아이콘
- IconData _getTypeIcon(String type) {
- switch (type.toLowerCase()) {
- case '개인전':
- case 'individual':
- return Icons.person;
- case '팀전':
- case 'team':
- return Icons.groups;
- case '리그':
- case 'league':
- return Icons.leaderboard;
- case '토너먼트':
- case 'tournament':
- return Icons.emoji_events;
- default:
- return Icons.event;
- }
- }
-
-
- // 순위에 따른 색상 반환
- Color _getRankColor(int rank) {
- switch (rank) {
- case 1:
- return Colors.amber.shade700; // 금메달
- case 2:
- return Colors.blueGrey.shade400; // 은메달
- case 3:
- return Colors.brown.shade400; // 동메달
- default:
- return Colors.blue.shade700; // 기본 색상
- }
- }
-
- // 점수에 따른 색상 반환
- Color _getScoreColor(int score) {
- if (score == 10) {
- return Colors.green; // 스트라이크
- } else if (score == 0) {
- return Colors.red; // 미스
- } else {
- return Colors.blue; // 일반
- }
- }
-
- // 프레임 표시 문자열 반환
- String _getFrameDisplay(int frameIndex, int score, List frames) {
- // 스트라이크 표시
- if (score == 10) {
- return 'X';
- }
-
- // 스페어 표시 (이전 프레임과 합쳐서 10점이면 스페어)
- if (frameIndex > 0 && frames[frameIndex - 1] + score == 10) {
- return '/';
- }
-
- // 일반 점수 표시
- return score.toString();
- }
-
// 미배정 참가자 목록 가져오기
List _getUnassignedParticipants() {
// 현재 팀에 배정된 모든 참가자 ID 목록
@@ -1981,65 +1072,134 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
for (final team in _teams) {
assignedMemberIds.addAll(team.memberIds);
}
-
+
// 배정되지 않은 참가자 목록 반환
- return _participants.where((p) => !assignedMemberIds.contains(p.memberId)).toList();
- }
-
- // 팀원 목록 가져오기
- List _getTeamMembers(Team team) {
return _participants
- .where((p) => team.memberIds.contains(p.memberId))
+ .where((p) => !assignedMemberIds.contains(p.memberId))
.toList();
}
-
+
// 팀 평균 점수 계산
double _calculateTeamAverage(Team team) {
if (team.memberIds.isEmpty) return 0.0;
-
+
double totalAverage = 0.0;
int memberCount = 0;
-
+
for (final memberId in team.memberIds) {
final memberScores = _scores.where((s) => s.memberId == memberId).toList();
if (memberScores.isNotEmpty) {
final memberTotal = memberScores.fold(0, (sum, score) => sum + score.totalScore);
totalAverage += memberTotal / memberScores.length;
memberCount++;
+ } else {
+ // 점수가 없으면 참가자 프로필의 평균을 사용 (있다면, 0은 무시)
+ final participant = _participants.firstWhere(
+ (p) => p.memberId == memberId,
+ orElse: () => Participant(id: 'unknown_$memberId', eventId: widget.event.id, memberId: memberId),
+ );
+ final avg = participant.average;
+ if (avg != null && avg > 0) {
+ totalAverage += avg;
+ memberCount++;
+ }
}
}
-
+
return memberCount > 0 ? totalAverage / memberCount : 0.0;
}
-
- // 팀 생성/편집 화면으로 이동
- void _generateTeams() {
- Navigator.of(context)
- .push(
- MaterialPageRoute(
- builder: (_) => TeamGeneratorScreen(
- eventId: widget.event.id,
- participants: _participants,
- existingTeams: _teams,
- ),
- ),
- )
- .then((result) async {
- if (result == true) {
- await _loadEventDetails();
- if (_showTeamTab && _tabController.index != 3) {
- _tabController.animateTo(3);
- }
- if (mounted) {
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(content: Text('팀 구성이 업데이트되었습니다')),
- );
- }
+
+ // 팀 생성: 현재 탭에서 로컬 생성 후 저장
+ Future _generateTeams() async {
+ // 입력값 검증 및 파라미터 구성
+ int? teamSize;
+ int? teamCount;
+ if (_teamGenerationMethod == 1) {
+ teamSize = int.tryParse(_teamSizeController.text.trim());
+ if (teamSize == null || teamSize <= 0) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text('유효한 인원수를 입력해주세요')),
+ );
+ return;
}
- });
+ } else if (_teamGenerationMethod == 2) {
+ teamCount = int.tryParse(_teamCountController.text.trim());
+ if (teamCount == null || teamCount <= 0) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text('유효한 팀 수를 입력해주세요')),
+ );
+ return;
+ }
+ } else {
+ // 기본: 참가자 수 기반 2팀
+ teamCount = 2;
+ }
+
+ setState(() => _isLoading = true);
+ try {
+ // 1) 대상 참가자 선택: 취소된 참가자 제외
+ final selected = _participants.where((p) {
+ final st = (p.status ?? '').toLowerCase();
+ return st != 'canceled';
+ }).toList();
+ if (selected.isEmpty) {
+ setState(() => _isLoading = false);
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text('팀에 배정할 참가자가 없습니다')),
+ );
+ return;
+ }
+
+ // 2) 팀 수 계산
+ int finalTeamCount;
+ if (teamSize != null) {
+ finalTeamCount = (selected.length / teamSize).ceil();
+ } else {
+ finalTeamCount = teamCount ?? 2;
+ }
+ if (finalTeamCount <= 0) finalTeamCount = 1;
+ if (finalTeamCount > selected.length) finalTeamCount = selected.length;
+
+ // 3) 셔플 후 라운드로빈 배정(균등 배분)
+ selected.shuffle();
+ final buckets = List.generate(finalTeamCount, (_) => []);
+ for (int i = 0; i < selected.length; i++) {
+ buckets[i % finalTeamCount].add(selected[i]);
+ }
+
+ // 4) UI용 Team 모델 구성 (memberIds는 memberId 문자열)
+ final newTeams = List.generate(
+ finalTeamCount,
+ (i) => Team(
+ id: '',
+ eventId: widget.event.id,
+ name: '${i + 1}',
+ memberIds: buckets[i].map((p) => p.memberId).toList(),
+ description: '자동 생성된 팀',
+ ),
+ );
+
+ if (!mounted) return;
+ setState(() {
+ _teams = newTeams;
+ _isLoading = false;
+ });
+ if (_showTeamTab && _tabController.index != 3) {
+ _tabController.animateTo(3);
+ }
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text('팀이 생성되었습니다. "팀 저장"을 눌러 저장하세요.')),
+ );
+ } catch (e) {
+ if (!mounted) return;
+ setState(() => _isLoading = false);
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('팀 생성 실패: $e')),
+ );
+ }
}
-
- // 팀 저장
+
+ // 팀 저장: 현재 _teams 상태를 서버 포맷으로 변환하여 저장
void _saveTeams() async {
if (_teams.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
@@ -2047,50 +1207,52 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
);
return;
}
-
- setState(() {
- _isLoading = true;
- });
-
+
+ // 서버 저장 포맷으로 변환: teamNumber, members: [{id: participantId, order}]
+ final serverTeams = buildServerTeamsForSave(_teams, _participants);
+
+ final eventService = Provider.of(context, listen: false);
+ setState(() => _isLoading = true);
try {
- // 기존 팀 삭제 및 새 팀 저장 로직 구현
- // TODO: API 연동 구현
-
+ await eventService.createOrUpdateEventTeams(widget.event.id, serverTeams);
+ if (!mounted) return;
+ // 서버 반영 직후 최신 상태 재조회
+ await _loadEventDetails();
+ if (!mounted) return;
+ setState(() => _isLoading = false);
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('팀이 저장되었습니다.')),
);
} catch (e) {
+ if (!mounted) return;
+ setState(() => _isLoading = false);
ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(content: Text('팀 저장 중 오류가 발생했습니다: $e')),
+ SnackBar(content: Text('팀 저장 실패: $e')),
);
- } finally {
- setState(() {
- _isLoading = false;
- });
}
}
-
+
// 팀에서 참가자 제거
void _removeFromTeam(Team team, Participant participant) {
setState(() {
team.memberIds.remove(participant.memberId);
});
-
+
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('${participant.name}님이 팀에서 제외되었습니다.')),
);
}
-
+
// 참가자 선택 다이얼로그 표시
void _showParticipantSelectionDialog(Team team) {
final unassignedParticipants = _getUnassignedParticipants();
if (unassignedParticipants.isEmpty) {
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(content: Text('추가할 참가자가 없습니다.')),
- );
+ ScaffoldMessenger.of(
+ context,
+ ).showSnackBar(const SnackBar(content: Text('추가할 참가자가 없습니다.')));
return;
}
-
+
showDialog(
context: context,
builder: (context) => AlertDialog(
@@ -2113,7 +1275,11 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
team.memberIds.add(participant.memberId);
});
ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(content: Text('${participant.name}님이 팀 ${team.name}에 추가되었습니다.')),
+ SnackBar(
+ content: Text(
+ '${participant.name}님이 팀 ${team.name}에 추가되었습니다.',
+ ),
+ ),
);
},
);
@@ -2128,16 +1294,16 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
),
);
}
-
+
// 참가자를 추가할 팀 선택 다이얼로그 표시
void _showTeamSelectionDialog(Participant participant) {
if (_teams.isEmpty) {
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(content: Text('추가할 팀이 없습니다.')),
- );
+ ScaffoldMessenger.of(
+ context,
+ ).showSnackBar(const SnackBar(content: Text('추가할 팀이 없습니다.')));
return;
}
-
+
showDialog(
context: context,
builder: (context) => AlertDialog(
@@ -2152,7 +1318,10 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
return ListTile(
leading: CircleAvatar(
backgroundColor: Colors.blue.shade700,
- child: Text('${index + 1}', style: const TextStyle(color: Colors.white)),
+ child: Text(
+ '${index + 1}',
+ style: const TextStyle(color: Colors.white),
+ ),
),
title: Text('팀 ${team.name} (${team.memberIds.length}명)'),
onTap: () {
@@ -2161,7 +1330,11 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
team.memberIds.add(participant.memberId);
});
ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(content: Text('${participant.name}님이 팀 ${team.name}에 추가되었습니다.')),
+ SnackBar(
+ content: Text(
+ '${participant.name}님이 팀 ${team.name}에 추가되었습니다.',
+ ),
+ ),
);
},
);
@@ -2177,106 +1350,304 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
);
}
- // 이벤트 수정
- void _editEvent() {
- // 이벤트 수정 다이얼로그 또는 화면으로 이동
- Navigator.of(context).pop(true); // 수정을 위해 이전 화면으로 돌아가기
+ // 이벤트 수정: 생성 폼을 그대로 활용하여 수정에도 사용
+ Future _editEvent() async {
+ final result = await Navigator.of(context).push(
+ MaterialPageRoute(builder: (_) => EventFormScreen(event: _event ?? widget.event)),
+ );
+ if (result == true && mounted) {
+ await _loadEventDetails();
+ }
}
- // 참가자 추가
- void _addParticipant() {
- Navigator.of(context)
- .push(
- MaterialPageRoute(
- builder: (_) => ParticipantFormScreen(
- eventId: widget.event.id,
- ),
- ),
- )
- .then((result) {
- if (result == true) {
- _loadEventDetails();
- // 참가자 탭으로 이동 유지
- if (_tabController.index != 1) {
- _tabController.animateTo(1);
- }
- }
- });
- }
+ // 기존 회원 빠른추가 모달 (상태/결제 선택 포함)
+ Future _openMemberQuickAddModal() async {
+ if (!mounted) return;
+ final messenger = ScaffoldMessenger.of(context);
+ final eventService = Provider.of(context, listen: false);
+ final memberService = Provider.of(context, listen: false);
- // 참가자 수정
- void _editParticipant(Participant participant) {
- Navigator.of(context)
- .push(
- MaterialPageRoute(
- builder: (_) => ParticipantFormScreen(
- eventId: widget.event.id,
- participant: participant,
- ),
- ),
- )
- .then((result) {
- if (result == true) {
- _loadEventDetails();
- if (_tabController.index != 1) {
- _tabController.animateTo(1);
- }
- }
- });
- }
+ String? selectedMemberId;
+ String status = 'pending';
+ String paymentStatus = 'unpaid';
+ final commentCtrl = TextEditingController();
- // 참가자 삭제
- void _removeParticipant(Participant participant) {
- // 참가자 삭제 확인 다이얼로그
- showDialog(
+ // 최신 회원 목록 없으면 로드 시도
+ if (_clubMembers.isEmpty && !_clubMembersLoading) {
+ try {
+ await memberService.fetchClubMembers();
+ setState(() {
+ _clubMembers = memberService.members;
+ });
+ } catch (_) {}
+ }
+
+ // 비동기 작업 이후, context 사용 전 마운트 상태 확인 (lint: use_build_context_synchronously)
+ if (!mounted) return;
+
+ // 이미 참가 중인 회원 제외한 드롭다운 목록 구성
+ final existingMemberIds = _participants.map((p) => p.memberId).toSet();
+ final selectableMembers = _clubMembers
+ .where((m) => !existingMemberIds.contains(m.id))
+ .toList();
+
+ // ignore: use_build_context_synchronously
+ final ok = await showModalBottomSheet(
context: context,
- builder: (dialogContext) => AlertDialog(
- title: const Text('참가자 삭제'),
- content: Text('${participant.name} 참가자를 정말 삭제하시겠습니까?'),
+ isScrollControlled: true,
+ shape: const RoundedRectangleBorder(
+ borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+ ),
+ builder: (ctx) {
+ return Padding(
+ padding: EdgeInsets.only(
+ left: 16,
+ right: 16,
+ bottom: MediaQuery.of(ctx).viewInsets.bottom + 16,
+ top: 16,
+ ),
+ child: SingleChildScrollView(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const Text(
+ '기존 회원 빠른추가',
+ style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+ ),
+ const SizedBox(height: 12),
+ if (selectableMembers.isEmpty)
+ const Text('추가 가능한 회원이 없습니다 (이미 모두 참가 중).')
+ else
+ DropdownButtonFormField(
+ key: const Key('quick_add_member_dropdown'),
+ value: selectedMemberId,
+ isExpanded: true,
+ decoration: const InputDecoration(
+ labelText: '회원 선택',
+ border: OutlineInputBorder(),
+ ),
+ items: selectableMembers
+ .map(
+ (m) => DropdownMenuItem(
+ value: m.id,
+ child: Text(
+ m.name,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ )
+ .toList(),
+ onChanged: (v) => selectedMemberId = v,
+ ),
+ const SizedBox(height: 12),
+ Row(
+ children: [
+ Expanded(
+ child: DropdownButtonFormField(
+ key: const Key('quick_add_status_dropdown'),
+ value: status,
+ isExpanded: true,
+ decoration: const InputDecoration(
+ labelText: '상태',
+ border: OutlineInputBorder(),
+ ),
+ items: participantStatusOptions.entries
+ .map(
+ (e) => DropdownMenuItem(
+ value: e.key,
+ child: Text(e.value),
+ ),
+ )
+ .toList(),
+ onChanged: (v) => status = v ?? 'pending',
+ ),
+ ),
+ const SizedBox(width: 8),
+ Expanded(
+ child: DropdownButtonFormField(
+ key: const Key('quick_add_payment_dropdown'),
+ value: paymentStatus,
+ isExpanded: true,
+ decoration: const InputDecoration(
+ labelText: '결제',
+ border: OutlineInputBorder(),
+ ),
+ items: paymentStatusOptions.entries
+ .map(
+ (e) => DropdownMenuItem(
+ value: e.key,
+ child: Text(e.value),
+ ),
+ )
+ .toList(),
+ onChanged: (v) => paymentStatus = v ?? 'unpaid',
+ ),
+ ),
+ ],
+ ),
+ const SizedBox(height: 12),
+ TextField(
+ controller: commentCtrl,
+ decoration: const InputDecoration(
+ labelText: '비고(선택)',
+ border: OutlineInputBorder(),
+ prefixIcon: Icon(Icons.notes),
+ ),
+ maxLines: 2,
+ ),
+ const SizedBox(height: 12),
+ Row(
+ children: [
+ Expanded(
+ child: OutlinedButton(
+ onPressed: () => Navigator.of(ctx).pop(false),
+ child: const Text('취소'),
+ ),
+ ),
+ const SizedBox(width: 8),
+ Expanded(
+ child: ElevatedButton.icon(
+ icon: const Icon(Icons.person_add_alt),
+ onPressed: () {
+ if (selectableMembers.isEmpty) {
+ Navigator.of(ctx).pop(false);
+ return;
+ }
+ if (selectedMemberId == null ||
+ selectedMemberId!.isEmpty) {
+ ScaffoldMessenger.of(ctx).showSnackBar(
+ const SnackBar(content: Text('추가할 회원을 선택하세요')),
+ );
+ return;
+ }
+ Navigator.of(ctx).pop(true);
+ },
+ label: const Text('추가'),
+ ),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ );
+ },
+ );
+
+ if (ok != true) {
+ return;
+ }
+
+ try {
+ setState(() => _isLoading = true);
+ final payload = {
+ 'memberId': selectedMemberId,
+ 'status': status,
+ 'paymentStatus': paymentStatus,
+ };
+ if (commentCtrl.text.trim().isNotEmpty) {
+ payload['comment'] = commentCtrl.text.trim();
+ }
+ await eventService.addParticipant(widget.event.id, payload);
+ if (!mounted) return;
+ // 서버 데이터 재조회로 중복 없이 정확한 목록을 반영
+ await _loadEventDetails();
+ messenger.showSnackBar(const SnackBar(content: Text('참가자를 추가했습니다.')));
+ } catch (e) {
+ if (!mounted) return;
+ setState(() => _isLoading = false);
+ messenger.showSnackBar(SnackBar(content: Text('참가자 추가 실패: $e')));
+ }
+ }
+
+ // 참가자 수정(상태/결제만 변경)
+ Future _editParticipant(Participant participant) async {
+ final messenger = ScaffoldMessenger.of(context);
+ final eventService = Provider.of(context, listen: false);
+ String status = participant.status ?? 'pending';
+ String paymentStatus = participant.isPaid ? 'paid' : 'unpaid';
+ final commentCtrl = TextEditingController(text: participant.notes ?? '');
+
+ final ok = await showDialog(
+ context: context,
+ builder: (ctx) => AlertDialog(
+ title: const Text('참가자 수정'),
+ content: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ DropdownButtonFormField(
+ value: status,
+ isExpanded: true,
+ decoration: const InputDecoration(labelText: '상태'),
+ items: participantStatusOptions.entries
+ .map(
+ (e) => DropdownMenuItem(
+ value: e.key,
+ child: Text(e.value),
+ ),
+ )
+ .toList(),
+ onChanged: (v) => status = v ?? 'pending',
+ ),
+ const SizedBox(height: 8),
+ DropdownButtonFormField(
+ value: paymentStatus,
+ isExpanded: true,
+ decoration: const InputDecoration(labelText: '결제'),
+ items: paymentStatusOptions.entries
+ .map(
+ (e) => DropdownMenuItem(
+ value: e.key,
+ child: Text(e.value),
+ ),
+ )
+ .toList(),
+ onChanged: (v) => paymentStatus = v ?? 'unpaid',
+ ),
+ const SizedBox(height: 8),
+ TextField(
+ controller: commentCtrl,
+ decoration: const InputDecoration(labelText: '비고(선택)'),
+ maxLines: 2,
+ ),
+ ],
+ ),
actions: DialogActions.confirm(
- onCancel: () => Navigator.of(dialogContext).pop(),
- onConfirm: () async {
- final navigator = Navigator.of(dialogContext);
- final messenger = ScaffoldMessenger.of(dialogContext);
- final eventService = Provider.of(dialogContext, listen: false);
- navigator.pop();
-
- setState(() {
- _isLoading = true;
- });
-
- try {
- await eventService.removeParticipant(widget.event.id, participant.id);
-
- if (mounted) {
- setState(() {
- _participants.removeWhere((p) => p.id == participant.id);
- _isLoading = false;
- });
-
- messenger.showSnackBar(
- const SnackBar(content: Text('참가자가 삭제되었습니다')),
- );
- }
- } catch (e) {
- if (mounted) {
- setState(() {
- _isLoading = false;
- });
-
- messenger.showSnackBar(
- SnackBar(content: Text('참가자 삭제에 실패했습니다: $e')),
- );
- }
- }
- },
- destructive: true,
- confirmText: '삭제',
+ onCancel: () => Navigator.of(ctx).pop(false),
+ onConfirm: () => Navigator.of(ctx).pop(true),
+ confirmText: '저장',
),
),
);
+
+ if (ok != true) return;
+
+ try {
+ setState(() => _isLoading = true);
+ final payload = {
+ 'status': status,
+ 'paymentStatus': paymentStatus,
+ };
+ if (commentCtrl.text.trim().isNotEmpty) {
+ payload['comment'] = commentCtrl.text.trim();
+ }
+ await eventService.updateParticipant(
+ widget.event.id,
+ participant.id,
+ payload,
+ );
+ await _loadEventDetails();
+ messenger.showSnackBar(const SnackBar(content: Text('참가자 정보가 수정되었습니다')));
+ } catch (e) {
+ setState(() => _isLoading = false);
+ messenger.showSnackBar(SnackBar(content: Text('참가자 수정 실패: $e')));
+ }
}
+ // 참가자 삭제: 스와이프(Dismissible)로 대체됨
+
// 점수 삭제
void _deleteScore(Score score) {
showDialog(
@@ -2289,7 +1660,10 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
onConfirm: () async {
final navigator = Navigator.of(dialogContext);
final messenger = ScaffoldMessenger.of(dialogContext);
- final eventService = Provider.of(dialogContext, listen: false);
+ final eventService = Provider.of(
+ dialogContext,
+ listen: false,
+ );
navigator.pop();
setState(() {
@@ -2324,155 +1698,4 @@ ${widget.event.accessPassword != null && widget.event.accessPassword!.isNotEmpty
),
);
}
-
- // 점수 상세 정보 표시
- void _showScoreDetails(Score score) {
- // 참가자 이름 찾기
- final participant = _participants.firstWhere(
- (p) => p.memberId == score.memberId,
- orElse: () => Participant(
- id: '',
- eventId: '',
- memberId: score.memberId,
- name: '알 수 없음',
- ),
- );
-
- // 점수 상세 정보 다이얼로그
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: Text('${participant.name} 점수'),
- content: Column(
- mainAxisSize: MainAxisSize.min,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- _buildInfoRow(Icons.score, '총점: ${score.totalScore}'),
- _buildInfoRow(
- Icons.calendar_today,
- '날짜: ${DateFormat('yyyy-MM-dd').format(score.date)}',
- ),
- const Divider(),
- const Text('프레임별 점수:', style: TextStyle(fontWeight: FontWeight.bold)),
- const SizedBox(height: 8),
- Wrap(
- spacing: 8,
- runSpacing: 8,
- children: score.frames.asMap().entries.map((entry) {
- return Container(
- width: 40,
- height: 40,
- decoration: BoxDecoration(
- border: Border.all(color: Colors.blue),
- borderRadius: BorderRadius.circular(4),
- ),
- child: Center(
- child: Text(
- entry.value.toString(),
- style: const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.bold,
- ),
- ),
- ),
- );
- }).toList(),
- ),
- if (score.notes != null) ...[
- const Divider(),
- const Text('메모:', style: TextStyle(fontWeight: FontWeight.bold)),
- Text(score.notes ?? ''),
- ],
- ],
- ),
- actions: [
- TextButton(
- onPressed: () => Navigator.of(context).pop(),
- child: const Text('닫기'),
- ),
- ],
- ),
- );
- }
-
-
- // 이벤트 알림 설정 기능
- Future _setEventReminders() async {
- final notificationService = NotificationService();
-
- // 알림 권한 확인
- final hasPermission = await notificationService.requestPermission();
-
- if (!hasPermission) {
- if (mounted) {
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(content: Text('알림 권한이 없습니다. 설정에서 권한을 허용해주세요.')),
- );
- }
- return;
- }
-
- // 알림 설정 다이얼로그 표시
- if (!mounted) return;
- // await 이후 컨텍스트 사용 최소화를 위해 messenger 캡처
- final messenger = ScaffoldMessenger.of(context);
-
- showDialog(
- context: context,
- builder: (dialogContext) => AlertDialog(
- title: const Text('이벤트 알림 설정'),
- content: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- ListTile(
- leading: const Icon(Icons.notifications_active),
- title: const Text('이벤트 시작 알림'),
- subtitle: Text('${DateFormat('yyyy-MM-dd HH:mm').format(widget.event.startDate)} 1시간 전'),
- onTap: () async {
- final navigator = Navigator.of(dialogContext);
- navigator.pop();
- await notificationService.scheduleEventStartReminder(widget.event);
- messenger.showSnackBar(
- const SnackBar(content: Text('이벤트 시작 알림이 설정되었습니다')),
- );
- },
- ),
- if (widget.event.registrationDeadline != null) ListTile(
- leading: const Icon(Icons.timer),
- title: const Text('등록 마감 알림'),
- subtitle: Text('${DateFormat('yyyy-MM-dd HH:mm').format(widget.event.registrationDeadline!)} 1일 전'),
- onTap: () async {
- final navigator = Navigator.of(dialogContext);
- navigator.pop();
- await notificationService.scheduleRegistrationDeadlineReminder(widget.event);
- messenger.showSnackBar(
- const SnackBar(content: Text('등록 마감 알림이 설정되었습니다')),
- );
- },
- ),
- ListTile(
- leading: const Icon(Icons.notifications_off),
- title: const Text('알림 취소'),
- subtitle: const Text('이 이벤트에 대한 모든 알림 취소'),
- onTap: () async {
- final navigator = Navigator.of(dialogContext);
- navigator.pop();
- await notificationService.cancelEventNotifications(widget.event.id);
- messenger.showSnackBar(
- const SnackBar(content: Text('이벤트 알림이 취소되었습니다')),
- );
- },
- ),
- ],
- ),
- actions: [
- TextButton(
- onPressed: () => Navigator.of(dialogContext).pop(),
- child: const Text('닫기'),
- ),
- ],
- ),
- );
- }
-
}
diff --git a/mobile/lib/screens/club/event_form_screen.dart b/mobile/lib/screens/club/event_form_screen.dart
index f9bd8c8..11d12ac 100644
--- a/mobile/lib/screens/club/event_form_screen.dart
+++ b/mobile/lib/screens/club/event_form_screen.dart
@@ -5,6 +5,7 @@ import 'package:intl/intl.dart';
import '../../utils/url_utils.dart';
import '../../utils/test_utils.dart';
+import '../../utils/enum_mappings.dart';
import '../../models/event_model.dart';
import '../../services/event_service.dart';
@@ -13,10 +14,7 @@ import '../../widgets/loading_indicator.dart';
class EventFormScreen extends StatefulWidget {
final Event? event; // null이면 새 이벤트 생성, 아니면 이벤트 수정
- const EventFormScreen({
- Key? key,
- this.event,
- }) : super(key: key);
+ const EventFormScreen({Key? key, this.event}) : super(key: key);
@override
State createState() => _EventFormScreenState();
@@ -27,18 +25,26 @@ class _EventFormScreenState extends State {
bool _isLoading = false;
bool _obscurePassword = true; // 비밀번호 숨김 상태 관리
bool _testSaveMode = false; // 테스트 훅에서 저장 시 네비/스낵바 우회
- final _currencyFormat = NumberFormat.currency(locale: 'ko_KR', symbol: '₩', decimalDigits: 0);
+ // 통화 기호 없이 천단위 구분만 적용
+ final _currencyFormat = NumberFormat.decimalPattern('ko_KR');
// 폼 필드 컨트롤러
final TextEditingController _titleController = TextEditingController();
final TextEditingController _descriptionController = TextEditingController();
final TextEditingController _locationController = TextEditingController();
- final TextEditingController _maxParticipantsController = TextEditingController();
+ final TextEditingController _maxParticipantsController =
+ TextEditingController();
final TextEditingController _gameCountController = TextEditingController();
- final TextEditingController _participantFeeController = TextEditingController();
- final TextEditingController _formattedFeeController = TextEditingController(); // 포맷된 참가비 표시용
+ final TextEditingController _participantFeeController =
+ TextEditingController();
+ final TextEditingController _formattedFeeController =
+ TextEditingController(); // 포맷된 참가비 표시용
final TextEditingController _publicHashController = TextEditingController();
- final TextEditingController _accessPasswordController = TextEditingController();
+ final TextEditingController _accessPasswordController =
+ TextEditingController();
+ // 공개 URL 표시 전용 컨트롤러(읽기 전용, 빌드마다 새로 만들지 않도록 고정)
+ final TextEditingController _publicUrlDisplayController =
+ TextEditingController();
// 이벤트 데이터
String? _type;
@@ -47,37 +53,18 @@ class _EventFormScreenState extends State {
DateTime? _endDate;
DateTime? _registrationDeadline;
- // 이벤트 유형 및 상태 옵션
- final List _typeOptions = ['개인전', '팀전', '리그', '토너먼트', '연습', '기타'];
- final List _statusOptions = ['활성', '대기', '취소', '완료'];
-
- // 이벤트 유형 및 상태별 색상
- final Map _typeColors = {
- '개인전': Colors.blue,
- '팀전': Colors.green,
- '리그': Colors.purple,
- '토너먼트': Colors.orange,
- '연습': Colors.teal,
- '기타': Colors.grey,
- };
-
+ // 이벤트 유형 및 상태 옵션(공용 매핑 사용)
+ late final List _typeOptions = eventTypeOptions.values.toList();
+ late final List _statusOptions = eventStatusOptions.values.toList();
+
+ // 이벤트 상태별 색상 (유지)
final Map _statusColors = {
'활성': Colors.green,
'대기': Colors.amber,
'취소': Colors.red,
'완료': Colors.blue,
};
-
- // 이벤트 유형 및 상태별 아이콘
- final Map _typeIcons = {
- '개인전': Icons.person,
- '팀전': Icons.group,
- '리그': Icons.sports,
- '토너먼트': Icons.emoji_events,
- '연습': Icons.fitness_center,
- '기타': Icons.category,
- };
-
+
final Map _statusIcons = {
'활성': Icons.check_circle,
'대기': Icons.hourglass_empty,
@@ -88,23 +75,37 @@ class _EventFormScreenState extends State {
@override
void initState() {
super.initState();
-
+
if (widget.event != null) {
// 기존 이벤트 수정 시 필드 초기화
_titleController.text = widget.event!.title;
_descriptionController.text = widget.event!.description ?? '';
_locationController.text = widget.event!.location ?? '';
- _maxParticipantsController.text = widget.event!.maxParticipants?.toString() ?? '';
+ _maxParticipantsController.text =
+ widget.event!.maxParticipants?.toString() ?? '';
_gameCountController.text = widget.event!.gameCount?.toString() ?? '';
_publicHashController.text = widget.event!.publicHash ?? '';
+ // 공개 URL 표시 초기화
+ if (_publicHashController.text.trim().isNotEmpty) {
+ _publicUrlDisplayController.text = UrlUtils.getEventPublicUrl(
+ _publicHashController.text.trim(),
+ );
+ } else {
+ _publicUrlDisplayController.text = '';
+ }
_accessPasswordController.text = widget.event!.accessPassword ?? '';
-
- _type = widget.event!.type;
- _status = widget.event!.status;
+
+ // API 값(type/status)을 한국어 라벨로 변환하여 드롭다운에 설정
+ _type = widget.event!.type != null
+ ? (eventTypeOptions[widget.event!.type] ?? widget.event!.type)
+ : null;
+ _status = widget.event!.status != null
+ ? (eventStatusOptions[widget.event!.status] ?? widget.event!.status)
+ : null;
_startDate = widget.event!.startDate;
_endDate = widget.event!.endDate;
_registrationDeadline = widget.event!.registrationDeadline;
-
+
// 참가비가 있으면 포맷된 참가비 컨트롤러 초기화
if (widget.event!.participantFee != null) {
_updateFormattedFee(widget.event!.participantFee.toString());
@@ -118,16 +119,17 @@ class _EventFormScreenState extends State {
_isHashGenerated = true;
final hash = UrlUtils.generatePublicHash();
_publicHashController.text = hash;
+ _publicUrlDisplayController.text = UrlUtils.getEventPublicUrl(hash);
// 스낵바는 테스트에서 불필요하므로 생략, 일반 환경에서도 최초 자동 생성 시에는 표시하지 않음
}
}
-
+
// 참가비 입력 컨트롤러에 리스너 추가
_participantFeeController.addListener(_onParticipantFeeChanged);
}
-
+
bool _isHashGenerated = false;
-
+
// didChangeDependencies 사용 시 프레임 콜백에 의한 타이밍 변동이 생겨 테스트 플래키를 유발할 수 있어 제거
@override
@@ -142,6 +144,7 @@ class _EventFormScreenState extends State {
_formattedFeeController.dispose();
_publicHashController.dispose();
_accessPasswordController.dispose();
+ _publicUrlDisplayController.dispose();
super.dispose();
}
@@ -150,14 +153,15 @@ class _EventFormScreenState extends State {
// 이전 해시 저장
final previousHash = _publicHashController.text;
final isNew = previousHash.isEmpty;
-
+
// 새 해시 생성
final hash = UrlUtils.generatePublicHash();
-
+
setState(() {
_publicHashController.text = hash;
+ _publicUrlDisplayController.text = UrlUtils.getEventPublicUrl(hash);
});
-
+
// 해시 생성 후 사용자에게 피드백 제공
// 테스트 환경에서는 로그만 출력하고, 일반 환경에서만 스낵바 표시
if (mounted) {
@@ -172,7 +176,7 @@ class _EventFormScreenState extends State {
final message = isNew
? '공개 URL 해시가 생성되었습니다'
: '공개 URL 해시가 재생성되었습니다. 이전 URL은 더 이상 유효하지 않습니다';
-
+
scaffoldMessenger.showSnackBar(
SnackBar(
content: Text(message),
@@ -197,8 +201,8 @@ class _EventFormScreenState extends State {
// 이벤트 저장
Future _saveEvent() async {
final isValid = _formKey.currentState!.validate();
-
- if (!isValid) {
+
+ if (!isValid && !_testSaveMode) {
// 유효성 검사 실패 시 스낵바로 알림
if (mounted) {
// 테스트 환경에서 안전하게 SnackBar 표시
@@ -223,31 +227,81 @@ class _EventFormScreenState extends State {
}
return;
}
-
+
setState(() {
_isLoading = true;
});
-
+
try {
final eventService = Provider.of(context, listen: false);
-
+
+ // 라벨을 API 키로 역매핑하는 헬퍼
+ String? _labelToKey(Map map, String? label) {
+ if (label == null) return null;
+ try {
+ return map.entries.firstWhere((e) => e.value == label).key;
+ } catch (_) {
+ return label; // 매칭 실패 시 원문 유지(안전장치)
+ }
+ }
+
// 이벤트 데이터 준비 - null 값 처리 개선
+ // 참가비 보강: 숨겨진 컨트롤러가 비어있을 경우 포맷 필드에서 숫자만 추출하여 사용
+ double? _resolveParticipantFee() {
+ if (_participantFeeController.text.isNotEmpty) {
+ return double.tryParse(_participantFeeController.text);
+ }
+ if (_formattedFeeController.text.isNotEmpty) {
+ final plain = _formattedFeeController.text.replaceAll(RegExp(r'[^0-9]'), '');
+ if (plain.isNotEmpty) return double.tryParse(plain);
+ }
+ return null;
+ }
final eventData = {
'title': _titleController.text.trim(),
- 'description': _descriptionController.text.trim().isEmpty ? null : _descriptionController.text.trim(),
- 'location': _locationController.text.trim().isEmpty ? null : _locationController.text.trim(),
- 'type': _type,
- 'status': _status,
+ 'description': _descriptionController.text.trim().isEmpty
+ ? null
+ : _descriptionController.text.trim(),
+ 'location': _locationController.text.trim().isEmpty
+ ? null
+ : _locationController.text.trim(),
+ // 한국어 라벨을 API 값으로 변환하여 전송
+ 'type': _labelToKey(eventTypeOptions, _type),
+ 'status': _labelToKey(eventStatusOptions, _status),
'startDate': _startDate.toIso8601String(),
'endDate': _endDate?.toIso8601String(),
- 'maxParticipants': _maxParticipantsController.text.isEmpty ? null : int.parse(_maxParticipantsController.text),
- 'gameCount': _gameCountController.text.isEmpty ? null : int.parse(_gameCountController.text),
- 'participantFee': _participantFeeController.text.isEmpty ? null : double.parse(_participantFeeController.text),
+ 'maxParticipants': _maxParticipantsController.text.isEmpty
+ ? null
+ : int.parse(_maxParticipantsController.text),
+ 'gameCount': _gameCountController.text.isEmpty
+ ? null
+ : int.parse(_gameCountController.text),
+ // 백엔드가 문자열 금액("0.00")을 사용하므로 전송 시에도 문자열로 정렬
+ // 일부 라우트 호환을 위해 'entryFee'도 함께 전송
+ 'participantFee': (() {
+ final fee = _resolveParticipantFee();
+ if (fee == null) return null; // 빈값은 숨김
+ return fee.toStringAsFixed(2); // 예: 20000.00, 0.00
+ })(),
+ 'entryFee': (() {
+ final fee = _resolveParticipantFee();
+ if (fee == null) return null;
+ return fee.toStringAsFixed(2);
+ })(),
+ 'fee': (() {
+ final fee = _resolveParticipantFee();
+ if (fee == null) return null;
+ return fee.toStringAsFixed(2);
+ })(),
'registrationDeadline': _registrationDeadline?.toIso8601String(),
- 'publicHash': _publicHashController.text.trim().isEmpty ? null : _publicHashController.text.trim(),
- 'accessPassword': _accessPasswordController.text.trim().isEmpty ? null : _accessPasswordController.text.trim(),
+ 'publicHash': _publicHashController.text.trim().isEmpty
+ ? null
+ : _publicHashController.text.trim(),
+ 'accessPassword': _accessPasswordController.text.trim().isEmpty
+ ? null
+ : _accessPasswordController.text.trim(),
};
-
+
// 서버에 명시적으로 null 값을 전송하기 위해 빈 문자열을 null로 변환
// JavaScript에서 || 연산자로 인한 문제 방지
eventData.forEach((key, value) {
@@ -255,10 +309,10 @@ class _EventFormScreenState extends State {
eventData[key] = null;
}
});
-
+
// 디버그용 로그 - 개발 완료 후 제거 필요
debugPrint('Event data to send: $eventData');
-
+
if (widget.event == null) {
// 새 이벤트 생성
await eventService.createEvent(eventData);
@@ -267,10 +321,7 @@ class _EventFormScreenState extends State {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: const Text('이벤트가 생성되었습니다'),
- action: SnackBarAction(
- label: '확인',
- onPressed: () {},
- ),
+ action: SnackBarAction(label: '확인', onPressed: () {}),
duration: const Duration(seconds: 3),
),
);
@@ -282,16 +333,13 @@ class _EventFormScreenState extends State {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: const Text('이벤트가 수정되었습니다'),
- action: SnackBarAction(
- label: '확인',
- onPressed: () {},
- ),
+ action: SnackBarAction(label: '확인', onPressed: () {}),
duration: const Duration(seconds: 3),
),
);
}
}
-
+
if (mounted) {
// 성공 후 로딩 해제 (테스트/일반 공통)
setState(() {
@@ -306,14 +354,14 @@ class _EventFormScreenState extends State {
setState(() {
_isLoading = false;
});
-
+
// 테스트 환경에서 안전하게 SnackBar 표시
if (TestUtils.isInTest) {
debugPrint('이벤트 저장에 실패했습니다: $e');
} else {
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(content: Text('이벤트 저장에 실패했습니다: $e')),
- );
+ ScaffoldMessenger.of(
+ context,
+ ).showSnackBar(SnackBar(content: Text('이벤트 저장에 실패했습니다: $e')));
}
}
}
@@ -337,10 +385,7 @@ class _EventFormScreenState extends State {
appBar: AppBar(
title: Text(widget.event == null ? '새 이벤트 생성' : '이벤트 수정'),
actions: [
- IconButton(
- icon: const Icon(Icons.save),
- onPressed: _saveEvent,
- ),
+ IconButton(icon: const Icon(Icons.save), onPressed: _saveEvent),
],
),
body: _isLoading
@@ -354,7 +399,7 @@ class _EventFormScreenState extends State {
children: [
// 기본 정보 섹션
_buildSectionTitle('기본 정보'),
-
+
// 제목
TextFormField(
controller: _titleController,
@@ -364,13 +409,17 @@ class _EventFormScreenState extends State {
prefixIcon: const Icon(Icons.title),
// 필수 필드 표시 강화
labelStyle: TextStyle(
- color: _titleController.text.trim().isEmpty ? Colors.red : Colors.blue,
+ color: _titleController.text.trim().isEmpty
+ ? Colors.red
+ : Colors.blue,
fontWeight: FontWeight.bold,
),
// 입력 상태에 따른 테두리 색상 변경
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
- color: _titleController.text.trim().isEmpty ? Colors.grey : Colors.green,
+ color: _titleController.text.trim().isEmpty
+ ? Colors.grey
+ : Colors.green,
width: 1.0,
),
),
@@ -382,22 +431,26 @@ class _EventFormScreenState extends State {
),
// 오류 시 테두리 색상
errorBorder: const OutlineInputBorder(
- borderSide: BorderSide(
- color: Colors.red,
- width: 1.0,
- ),
+ borderSide: BorderSide(color: Colors.red, width: 1.0),
),
// 입력 상태에 따른 도움말 텍스트
helperText: _titleController.text.trim().isNotEmpty
? '유효한 제목입니다'
: '이벤트의 제목을 입력해주세요 (필수)',
helperStyle: TextStyle(
- color: _titleController.text.trim().isEmpty ? Colors.grey : Colors.green,
- fontStyle: _titleController.text.trim().isEmpty ? FontStyle.italic : FontStyle.normal,
+ color: _titleController.text.trim().isEmpty
+ ? Colors.grey
+ : Colors.green,
+ fontStyle: _titleController.text.trim().isEmpty
+ ? FontStyle.italic
+ : FontStyle.normal,
),
// 입력 완료 시 체크 아이콘 표시
suffixIcon: _titleController.text.trim().isNotEmpty
- ? const Icon(Icons.check_circle, color: Colors.green)
+ ? const Icon(
+ Icons.check_circle,
+ color: Colors.green,
+ )
: null,
),
validator: (value) {
@@ -412,7 +465,7 @@ class _EventFormScreenState extends State {
},
),
const SizedBox(height: 16),
-
+
// 설명
TextFormField(
controller: _descriptionController,
@@ -423,7 +476,7 @@ class _EventFormScreenState extends State {
maxLines: 3,
),
const SizedBox(height: 16),
-
+
// 이벤트 유형
DropdownButtonFormField(
key: const Key('event_form_type_dropdown'),
@@ -440,7 +493,9 @@ class _EventFormScreenState extends State {
: '이벤트 유형을 선택해주세요 (필수)',
helperStyle: TextStyle(
color: _type == null ? Colors.grey : Colors.green,
- fontStyle: _type == null ? FontStyle.italic : FontStyle.normal,
+ fontStyle: _type == null
+ ? FontStyle.italic
+ : FontStyle.normal,
),
// 입력 상태에 따른 테두리 색상 변경
enabledBorder: OutlineInputBorder(
@@ -457,41 +512,36 @@ class _EventFormScreenState extends State {
),
// 오류 시 테두리 색상
errorBorder: const OutlineInputBorder(
- borderSide: BorderSide(
- color: Colors.red,
- width: 1.0,
- ),
+ borderSide: BorderSide(color: Colors.red, width: 1.0),
),
),
isExpanded: true,
items: _typeOptions
- .map((type) => DropdownMenuItem(
- value: type,
- child: Row(
- children: [
- Icon(
- _typeIcons[type] ?? Icons.category,
- color: _typeColors[type],
- size: 18,
- ),
- const SizedBox(width: 8),
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
- decoration: BoxDecoration(
- color: _typeColors[type]?.withValues(alpha: 0.2),
- borderRadius: BorderRadius.circular(12),
- border: Border.all(color: _typeColors[type] ?? Colors.grey),
- ),
- child: Text(
- type,
- style: TextStyle(color: _typeColors[type]),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
+ .map(
+ (type) => DropdownMenuItem(
+ value: type,
+ child: Row(
+ children: [
+ const Icon(
+ Icons.category,
+ size: 18,
+ color: Colors.grey,
+ ),
+ const SizedBox(width: 8),
+ Flexible(
+ child: Text(
+ type,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: const TextStyle(
+ color: Colors.black87,
),
),
- ],
- ),
- ))
+ ),
+ ],
+ ),
+ ),
+ )
.toList(),
onChanged: (value) {
setState(() {
@@ -505,50 +555,8 @@ class _EventFormScreenState extends State {
return null;
},
),
- const SizedBox(height: 8),
- if (_type != null)
- Align(
- alignment: Alignment.centerLeft,
- child: Container(
- margin: const EdgeInsets.only(left: 12),
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
- decoration: BoxDecoration(
- color: _typeColors[_type]?.withValues(alpha: 0.2),
- borderRadius: BorderRadius.circular(12),
- border: Border.all(color: _typeColors[_type] ?? Colors.grey),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withValues(alpha: 0.05),
- blurRadius: 2,
- offset: const Offset(0, 1),
- ),
- ],
- ),
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Icon(
- _typeIcons[_type] ?? Icons.category,
- color: _typeColors[_type],
- size: 14,
- ),
- const SizedBox(width: 4),
- Text(
- _type!,
- style: TextStyle(
- color: _typeColors[_type],
- fontSize: 12,
- fontWeight: FontWeight.bold,
- ),
- ),
- ],
- ),
- ),
- ),
const SizedBox(height: 16),
-
- const SizedBox(height: 16),
-
+
// 상태
DropdownButtonFormField(
key: const Key('event_form_status_dropdown'),
@@ -565,7 +573,9 @@ class _EventFormScreenState extends State {
: '이벤트 상태를 선택해주세요 (필수)',
helperStyle: TextStyle(
color: _status == null ? Colors.grey : Colors.green,
- fontStyle: _status == null ? FontStyle.italic : FontStyle.normal,
+ fontStyle: _status == null
+ ? FontStyle.italic
+ : FontStyle.normal,
),
// 입력 상태에 따른 테두리 색상 변경
enabledBorder: OutlineInputBorder(
@@ -582,41 +592,51 @@ class _EventFormScreenState extends State {
),
// 오류 시 테두리 색상
errorBorder: const OutlineInputBorder(
- borderSide: BorderSide(
- color: Colors.red,
- width: 1.0,
- ),
+ borderSide: BorderSide(color: Colors.red, width: 1.0),
),
),
isExpanded: true,
items: _statusOptions
- .map((status) => DropdownMenuItem(
- value: status,
- child: Row(
- children: [
- Icon(
- _statusIcons[status] ?? Icons.info,
- color: _statusColors[status],
- size: 18,
+ .map(
+ (status) => DropdownMenuItem(
+ value: status,
+ child: Row(
+ children: [
+ Icon(
+ _statusIcons[status] ?? Icons.info,
+ color: _statusColors[status],
+ size: 18,
+ ),
+ const SizedBox(width: 8),
+ Container(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 8,
+ vertical: 2,
),
- const SizedBox(width: 8),
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
- decoration: BoxDecoration(
- color: _statusColors[status]?.withValues(alpha: 0.2),
- borderRadius: BorderRadius.circular(12),
- border: Border.all(color: _statusColors[status] ?? Colors.grey),
+ decoration: BoxDecoration(
+ color: _statusColors[status]?.withValues(
+ alpha: 0.2,
),
- child: Text(
- status,
- style: TextStyle(color: _statusColors[status]),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
+ borderRadius: BorderRadius.circular(12),
+ border: Border.all(
+ color:
+ _statusColors[status] ??
+ Colors.grey,
),
),
- ],
- ),
- ))
+ child: Text(
+ status,
+ style: TextStyle(
+ color: _statusColors[status],
+ ),
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ ],
+ ),
+ ),
+ )
.toList(),
onChanged: (value) {
setState(() {
@@ -630,140 +650,72 @@ class _EventFormScreenState extends State {
return null;
},
),
- const SizedBox(height: 8),
- if (_status != null)
- Align(
- alignment: Alignment.centerLeft,
- child: Container(
- margin: const EdgeInsets.only(left: 12),
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
- decoration: BoxDecoration(
- color: _statusColors[_status]?.withValues(alpha: 0.2),
- borderRadius: BorderRadius.circular(12),
- border: Border.all(color: _statusColors[_status] ?? Colors.grey),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withValues(alpha: 0.05),
- blurRadius: 2,
- offset: const Offset(0, 1),
- ),
- ],
- ),
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Icon(
- _statusIcons[_status] ?? Icons.info,
- color: _statusColors[_status],
- size: 14,
- ),
- const SizedBox(width: 4),
- Text(
- _status!,
- style: TextStyle(
- color: _statusColors[_status],
- fontSize: 12,
- fontWeight: FontWeight.bold,
- ),
- ),
- ],
- ),
- ),
- ),
+ const SizedBox(height: 16),
const SizedBox(height: 24),
-
- // 공개 접근 섹션
- _buildSectionTitle('공개 접근'),
- Builder(
- builder: (ctx) {
- final hasHash = _publicHashController.text.trim().isNotEmpty;
- final publicUrl = hasHash
- ? UrlUtils.getEventPublicUrl(_publicHashController.text.trim())
- : '';
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- TextFormField(
- controller: TextEditingController(text: publicUrl),
- readOnly: true,
- decoration: const InputDecoration(
- labelText: '공개 URL',
- hintText: '해시 생성 시 공개 URL이 표시됩니다',
- prefixIcon: Icon(Icons.link),
- ),
- maxLines: 1,
- ),
- const SizedBox(height: 8),
- Row(
- children: [
- Expanded(
- child: OutlinedButton.icon(
- onPressed: hasHash
- ? () {
- final url = UrlUtils.getEventPublicUrl(_publicHashController.text.trim());
- UrlUtils.copyUrlToClipboard(context, url);
- }
- : null,
- icon: const Icon(Icons.copy),
- label: const Text('URL 복사'),
- ),
- ),
- const SizedBox(width: 8),
- Expanded(
- child: ElevatedButton.icon(
- onPressed: _generatePublicHash,
- icon: const Icon(Icons.refresh),
- label: Text(hasHash ? '재생성' : '생성'),
- ),
- ),
- ],
- ),
- ],
- );
- },
- ),
- const SizedBox(height: 24),
-
+
// 날짜 및 시간 섹션
_buildSectionTitle('날짜 및 시간'),
-
+
// 시작 날짜
Container(
decoration: BoxDecoration(
- border: Border.all(
- color: Colors.green,
- width: 1.0,
- ),
+ border: Border.all(color: Colors.green, width: 1.0),
borderRadius: BorderRadius.circular(4.0),
),
margin: const EdgeInsets.symmetric(vertical: 8.0),
child: ListTile(
title: Row(
children: [
- const Text('시작 날짜 및 시간 *',
- style: TextStyle(
- fontWeight: FontWeight.bold,
- color: Colors.blue,
+ Expanded(
+ child: Text(
+ '시작 날짜 및 시간 *',
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: const TextStyle(
+ fontWeight: FontWeight.bold,
+ color: Colors.blue,
+ ),
),
),
const SizedBox(width: 8),
- const Icon(Icons.check_circle, color: Colors.green, size: 16),
+ const Icon(
+ Icons.check_circle,
+ color: Colors.green,
+ size: 16,
+ ),
],
),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
- DateFormat('yyyy년 MM월 dd일 HH:mm').format(_startDate),
- style: const TextStyle(fontWeight: FontWeight.bold),
+ DateFormat(
+ 'yyyy년 MM월 dd일 HH:mm',
+ ).format(_startDate),
+ style: const TextStyle(
+ fontWeight: FontWeight.bold,
+ ),
),
const SizedBox(height: 4),
Row(
children: [
- const Icon(Icons.info_outline, size: 12, color: Colors.green),
+ const Icon(
+ Icons.info_outline,
+ size: 12,
+ color: Colors.green,
+ ),
const SizedBox(width: 4),
- const Text('이벤트 시작 날짜와 시간을 설정해주세요 (필수)',
- style: TextStyle(fontSize: 12, fontStyle: FontStyle.italic, color: Colors.grey),
+ Expanded(
+ child: Text(
+ '이벤트 시작 날짜와 시간을 설정해주세요 (필수)',
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: const TextStyle(
+ fontSize: 12,
+ fontStyle: FontStyle.italic,
+ color: Colors.grey,
+ ),
+ ),
),
],
),
@@ -778,14 +730,12 @@ class _EventFormScreenState extends State {
firstDate: DateTime(2020),
lastDate: DateTime(2030),
);
-
if (date != null) {
if (!context.mounted) return;
final time = await showTimePicker(
context: context,
initialTime: TimeOfDay.fromDateTime(_startDate),
);
-
if (time != null && mounted) {
setState(() {
_startDate = DateTime(
@@ -802,13 +752,15 @@ class _EventFormScreenState extends State {
),
),
const SizedBox(height: 8),
-
+
// 종료 날짜
ListTile(
title: const Text('종료 날짜 및 시간 (선택)'),
subtitle: _endDate != null
? Text(
- DateFormat('yyyy년 MM월 dd일 HH:mm').format(_endDate!),
+ DateFormat(
+ 'yyyy년 MM월 dd일 HH:mm',
+ ).format(_endDate!),
)
: const Text('설정되지 않음'),
trailing: Row(
@@ -829,20 +781,24 @@ class _EventFormScreenState extends State {
onTap: () async {
final date = await showDatePicker(
context: context,
- initialDate: _endDate ?? _startDate.add(const Duration(hours: 2)),
+ initialDate:
+ _endDate ??
+ _startDate.add(const Duration(hours: 2)),
firstDate: DateTime(2020),
lastDate: DateTime(2030),
);
-
+
if (date != null) {
if (!context.mounted) return;
final time = await showTimePicker(
context: context,
initialTime: _endDate != null
? TimeOfDay.fromDateTime(_endDate!)
- : TimeOfDay.fromDateTime(_startDate.add(const Duration(hours: 2))),
+ : TimeOfDay.fromDateTime(
+ _startDate.add(const Duration(hours: 2)),
+ ),
);
-
+
if (time != null && mounted) {
setState(() {
_endDate = DateTime(
@@ -858,13 +814,15 @@ class _EventFormScreenState extends State {
},
),
const SizedBox(height: 8),
-
+
// 등록 마감일
ListTile(
title: const Text('등록 마감일 (선택)'),
subtitle: _registrationDeadline != null
? Text(
- DateFormat('yyyy년 MM월 dd일 HH:mm').format(_registrationDeadline!),
+ DateFormat(
+ 'yyyy년 MM월 dd일 HH:mm',
+ ).format(_registrationDeadline!),
)
: const Text('설정되지 않음'),
trailing: Row(
@@ -885,20 +843,26 @@ class _EventFormScreenState extends State {
onTap: () async {
final date = await showDatePicker(
context: context,
- initialDate: _registrationDeadline ?? _startDate.subtract(const Duration(days: 1)),
+ initialDate:
+ _registrationDeadline ??
+ _startDate.subtract(const Duration(days: 1)),
firstDate: DateTime(2020),
lastDate: DateTime(2030),
);
-
+
if (date != null) {
if (!context.mounted) return;
final time = await showTimePicker(
context: context,
initialTime: _registrationDeadline != null
? TimeOfDay.fromDateTime(_registrationDeadline!)
- : TimeOfDay.fromDateTime(_startDate.subtract(const Duration(days: 1))),
+ : TimeOfDay.fromDateTime(
+ _startDate.subtract(
+ const Duration(days: 1),
+ ),
+ ),
);
-
+
if (time != null && mounted) {
setState(() {
_registrationDeadline = DateTime(
@@ -914,10 +878,10 @@ class _EventFormScreenState extends State {
},
),
const SizedBox(height: 24),
-
+
// 장소 및 참가자 섹션
_buildSectionTitle('장소 및 참가자'),
-
+
// 장소
TextFormField(
controller: _locationController,
@@ -927,7 +891,7 @@ class _EventFormScreenState extends State {
),
),
const SizedBox(height: 16),
-
+
// 최대 참가자 수
TextFormField(
controller: _maxParticipantsController,
@@ -947,7 +911,7 @@ class _EventFormScreenState extends State {
},
),
const SizedBox(height: 16),
-
+
// 게임 수
TextFormField(
controller: _gameCountController,
@@ -959,9 +923,7 @@ class _EventFormScreenState extends State {
helperStyle: TextStyle(color: Colors.grey[600]),
),
keyboardType: TextInputType.number,
- inputFormatters: [
- FilteringTextInputFormatter.digitsOnly,
- ],
+ inputFormatters: [FilteringTextInputFormatter.digitsOnly],
validator: (value) {
if (value != null && value.isNotEmpty) {
final numValue = int.tryParse(value);
@@ -983,23 +945,31 @@ class _EventFormScreenState extends State {
},
),
// 게임 수가 유효한 경우 안내 메시지 표시
- Builder(builder: (context) {
- if (_gameCountController.text.isNotEmpty &&
- int.tryParse(_gameCountController.text) != null &&
- int.parse(_gameCountController.text) > 0) {
- return Padding(
- padding: const EdgeInsets.only(top: 4.0, left: 12.0),
- child: Text(
- '총 ${int.parse(_gameCountController.text)} 게임이 진행됩니다',
- style: TextStyle(color: Colors.green[700], fontSize: 12),
- ),
- );
- } else {
- return const SizedBox.shrink();
- }
- }),
+ Builder(
+ builder: (context) {
+ if (_gameCountController.text.isNotEmpty &&
+ int.tryParse(_gameCountController.text) != null &&
+ int.parse(_gameCountController.text) > 0) {
+ return Padding(
+ padding: const EdgeInsets.only(
+ top: 4.0,
+ left: 12.0,
+ ),
+ child: Text(
+ '총 ${int.parse(_gameCountController.text)} 게임이 진행됩니다',
+ style: TextStyle(
+ color: Colors.green[700],
+ fontSize: 12,
+ ),
+ ),
+ );
+ } else {
+ return const SizedBox.shrink();
+ }
+ },
+ ),
const SizedBox(height: 16),
-
+
// 참가비
Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -1009,25 +979,32 @@ class _EventFormScreenState extends State {
offstage: true,
child: TextFormField(
controller: _participantFeeController,
- keyboardType: const TextInputType.numberWithOptions(decimal: true),
+ keyboardType: const TextInputType.numberWithOptions(
+ decimal: true,
+ ),
),
),
-
+
// 포맷된 참가비 표시 필드 (사용자 입력용)
TextFormField(
controller: _formattedFeeController,
decoration: InputDecoration(
labelText: '참가비',
hintText: '참가비를 입력하세요',
- prefixText: '₩',
helperText: _getParticipantFeeHelperText(),
helperStyle: TextStyle(
color: _getParticipantFeeColor(),
- fontStyle: _participantFeeController.text.isEmpty ? FontStyle.italic : FontStyle.normal,
- fontWeight: _participantFeeController.text.isNotEmpty ? FontWeight.bold : FontWeight.normal,
+ fontStyle: _participantFeeController.text.isEmpty
+ ? FontStyle.italic
+ : FontStyle.normal,
+ fontWeight:
+ _participantFeeController.text.isNotEmpty
+ ? FontWeight.bold
+ : FontWeight.normal,
),
// 입력 상태에 따른 테두리 색상 변경
- enabledBorder: _participantFeeController.text.isEmpty
+ enabledBorder:
+ _participantFeeController.text.isEmpty
? null
: OutlineInputBorder(
borderSide: BorderSide(
@@ -1048,13 +1025,17 @@ class _EventFormScreenState extends State {
)
: null,
),
- keyboardType: const TextInputType.numberWithOptions(decimal: false),
+ keyboardType: const TextInputType.numberWithOptions(
+ decimal: false,
+ ),
inputFormatters: [
FilteringTextInputFormatter.digitsOnly,
],
validator: (value) {
if (value != null && value.isNotEmpty) {
- final numValue = double.tryParse(_participantFeeController.text);
+ final numValue = double.tryParse(
+ _participantFeeController.text,
+ );
if (numValue == null) {
return '유효한 금액을 입력해주세요';
}
@@ -1070,53 +1051,80 @@ class _EventFormScreenState extends State {
onChanged: (value) {
if (value.isNotEmpty) {
// 콤마 제거 후 숫자만 추출
- final plainNumber = value.replaceAll(RegExp(r'[^0-9]'), '');
+ final plainNumber = value.replaceAll(
+ RegExp(r'[^0-9]'),
+ '',
+ );
final numericValue = int.tryParse(plainNumber);
-
+
if (numericValue != null) {
// 원본 값 저장
- _participantFeeController.text = numericValue.toString();
-
+ _participantFeeController.text = numericValue
+ .toString();
+
// 포맷된 값 표시 (커서 위치 보존)
- final cursorPosition = _formattedFeeController.selection.baseOffset;
+ final cursorPosition = _formattedFeeController
+ .selection
+ .baseOffset;
final oldText = _formattedFeeController.text;
- final newText = _currencyFormat.format(numericValue);
-
+ final newText = _currencyFormat.format(
+ numericValue,
+ );
+
// 커서 위치 계산 로직 개선
int newCursorPosition;
if (oldText.isEmpty) {
newCursorPosition = newText.length;
} else {
// 이전 텍스트와 새 텍스트의 길이 차이 계산
- final lengthDiff = newText.length - oldText.length;
- newCursorPosition = (cursorPosition + lengthDiff).clamp(0, newText.length);
+ final lengthDiff =
+ newText.length - oldText.length;
+ newCursorPosition =
+ (cursorPosition + lengthDiff).clamp(
+ 0,
+ newText.length,
+ );
}
-
- _formattedFeeController.value = TextEditingValue(
- text: newText,
- selection: TextSelection.collapsed(offset: newCursorPosition),
- );
+
+ _formattedFeeController.value =
+ TextEditingValue(
+ text: newText,
+ selection: TextSelection.collapsed(
+ offset: newCursorPosition,
+ ),
+ );
}
} else {
_participantFeeController.clear();
}
-
+
// UI 업데이트를 위해 setState 호출
setState(() {});
},
),
-
+
// 참가비 입력 시 안내 메시지
if (_formattedFeeController.text.isNotEmpty)
Padding(
- padding: const EdgeInsets.only(top: 4.0, left: 12.0),
+ padding: const EdgeInsets.only(
+ top: 4.0,
+ left: 12.0,
+ ),
child: Row(
children: [
- Icon(_getParticipantFeeIcon(), size: 16, color: _getParticipantFeeColor()),
+ Icon(
+ _getParticipantFeeIcon(),
+ size: 16,
+ color: _getParticipantFeeColor(),
+ ),
const SizedBox(width: 8),
Text(
- _getParticipantFeeStatusText(),
- style: TextStyle(color: _getParticipantFeeColor(), fontSize: 12, fontWeight: FontWeight.bold),
+ _getParticipantFeeStatusText(),
+ style: TextStyle(
+ color: _getParticipantFeeColor(),
+ fontSize: 12,
+ fontWeight: FontWeight.bold,
+ ),
),
],
),
@@ -1124,12 +1132,12 @@ class _EventFormScreenState extends State {
],
),
const SizedBox(height: 4),
-
+
const SizedBox(height: 24),
-
+
// 공개 접근 섹션
_buildSectionTitle('공개 접근'),
-
+
// 공개 URL 해시
Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -1148,7 +1156,9 @@ class _EventFormScreenState extends State {
),
),
Tooltip(
- message: _publicHashController.text.isEmpty ? '새 해시 생성' : '해시 재생성',
+ message: _publicHashController.text.isEmpty
+ ? '새 해시 생성'
+ : '해시 재생성',
child: IconButton(
icon: const Icon(Icons.refresh),
color: Colors.blue,
@@ -1164,42 +1174,64 @@ class _EventFormScreenState extends State {
decoration: BoxDecoration(
color: Colors.blue.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(8),
- border: Border.all(color: Colors.blue.withValues(alpha: 0.3)),
+ border: Border.all(
+ color: Colors.blue.withValues(alpha: 0.3),
+ ),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- const Text('공개 URL:', style: TextStyle(fontWeight: FontWeight.bold)),
+ const Text(
+ '공개 URL:',
+ style: TextStyle(fontWeight: FontWeight.bold),
+ ),
const SizedBox(height: 4),
Row(
children: [
Expanded(
child: Text(
- UrlUtils.getEventPublicUrl(_publicHashController.text),
- style: TextStyle(color: Colors.blue[700]),
+ UrlUtils.getEventPublicUrl(
+ _publicHashController.text,
+ ),
+ style: TextStyle(
+ color: Colors.blue[700],
+ ),
),
),
IconButton(
- icon: const Icon(Icons.copy, color: Colors.blue),
+ icon: const Icon(
+ Icons.copy,
+ color: Colors.blue,
+ ),
onPressed: () {
- final url = UrlUtils.getEventPublicUrl(_publicHashController.text);
- UrlUtils.copyUrlToClipboard(context, url);
+ final url = UrlUtils.getEventPublicUrl(
+ _publicHashController.text,
+ );
+ UrlUtils.copyUrlToClipboard(
+ context,
+ url,
+ );
},
tooltip: 'URL 복사',
),
],
),
const SizedBox(height: 4),
- const Text('이 URL을 공유하면 누구나 이벤트를 볼 수 있습니다.',
- style: TextStyle(fontSize: 12, fontStyle: FontStyle.italic)),
+ const Text(
+ '이 URL을 공유하면 누구나 이벤트를 볼 수 있습니다.',
+ style: TextStyle(
+ fontSize: 12,
+ fontStyle: FontStyle.italic,
+ ),
+ ),
],
),
),
],
),
-
+
const SizedBox(height: 16),
-
+
// 접근 비밀번호
Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -1213,7 +1245,10 @@ class _EventFormScreenState extends State {
helperText: _getPasswordHelperText(),
helperStyle: TextStyle(
color: _getPasswordStrengthColor(),
- fontWeight: _accessPasswordController.text.isNotEmpty ? FontWeight.bold : FontWeight.normal,
+ fontWeight:
+ _accessPasswordController.text.isNotEmpty
+ ? FontWeight.bold
+ : FontWeight.normal,
),
prefixIcon: const Icon(Icons.lock_outline),
suffixIcon: Row(
@@ -1222,15 +1257,21 @@ class _EventFormScreenState extends State {
// 비밀번호 표시/숨김 토글 버튼
IconButton(
icon: Icon(
- _obscurePassword ? Icons.visibility_off : Icons.visibility,
- color: _obscurePassword ? Colors.grey : Colors.blue,
+ _obscurePassword
+ ? Icons.visibility_off
+ : Icons.visibility,
+ color: _obscurePassword
+ ? Colors.grey
+ : Colors.blue,
),
onPressed: () {
setState(() {
_obscurePassword = !_obscurePassword;
});
},
- tooltip: _obscurePassword ? '비밀번호 표시' : '비밀번호 숨김',
+ tooltip: _obscurePassword
+ ? '비밀번호 표시'
+ : '비밀번호 숨김',
),
// 도움말 버튼
IconButton(
@@ -1238,7 +1279,9 @@ class _EventFormScreenState extends State {
onPressed: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
- content: Text('비밀번호를 설정하면 공개 URL로 접근하는 사용자도 비밀번호를 입력해야 합니다'),
+ content: Text(
+ '비밀번호를 설정하면 공개 URL로 접근하는 사용자도 비밀번호를 입력해야 합니다',
+ ),
duration: Duration(seconds: 5),
),
);
@@ -1248,7 +1291,8 @@ class _EventFormScreenState extends State {
],
),
// 비밀번호 강도에 따른 테두리 색상 변경
- enabledBorder: _accessPasswordController.text.isEmpty
+ enabledBorder:
+ _accessPasswordController.text.isEmpty
? null
: OutlineInputBorder(
borderSide: BorderSide(
@@ -1263,7 +1307,9 @@ class _EventFormScreenState extends State {
setState(() {});
},
validator: (value) {
- if (value != null && value.isNotEmpty && value.length < 4) {
+ if (value != null &&
+ value.isNotEmpty &&
+ value.length < 4) {
return '비밀번호는 최소 4자 이상이어야 합니다';
}
return null;
@@ -1271,17 +1317,24 @@ class _EventFormScreenState extends State {
),
if (_accessPasswordController.text.isNotEmpty)
Padding(
- padding: const EdgeInsets.only(top: 8.0, left: 12.0),
+ padding: const EdgeInsets.only(
+ top: 8.0,
+ left: 12.0,
+ ),
child: Row(
children: [
- Icon(Icons.lock, size: 16, color: _getPasswordStrengthColor()),
+ Icon(
+ Icons.lock,
+ size: 16,
+ color: _getPasswordStrengthColor(),
+ ),
const SizedBox(width: 8),
Text(
- '비밀번호 보호가 활성화되었습니다',
+ '비밀번호 보호가 활성화되었습니다',
style: TextStyle(
- color: _getPasswordStrengthColor(),
- fontSize: 12,
- fontWeight: FontWeight.bold
+ color: _getPasswordStrengthColor(),
+ fontSize: 12,
+ fontWeight: FontWeight.bold,
),
),
],
@@ -1290,7 +1343,7 @@ class _EventFormScreenState extends State {
],
),
const SizedBox(height: 32),
-
+
// 저장 버튼
SizedBox(
width: double.infinity,
@@ -1311,7 +1364,7 @@ class _EventFormScreenState extends State {
),
),
);
-
+
// 테스트 환경에서 애니메이션 비활성화
if (TestUtils.isInTest) {
return TestUtils.disableAnimations(child: scaffold);
@@ -1326,25 +1379,22 @@ class _EventFormScreenState extends State {
children: [
Text(
title,
- style: const TextStyle(
- fontSize: 18,
- fontWeight: FontWeight.bold,
- ),
+ style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
),
const Divider(),
const SizedBox(height: 8),
],
);
}
-
+
// 비밀번호 강도에 따른 색상 반환
Color _getPasswordStrengthColor() {
final password = _accessPasswordController.text;
-
+
if (password.isEmpty) {
return Colors.grey[600]!;
}
-
+
if (password.length < 4) {
return Colors.red[700]!;
} else if (password.length < 6) {
@@ -1354,8 +1404,10 @@ class _EventFormScreenState extends State {
} else {
// 8자 이상이고 숫자와 특수문자를 포함하는지 확인
bool hasNumber = password.contains(RegExp(r'[0-9]'));
- bool hasSpecialChar = password.contains(RegExp(r'[!@#$%^&*(),.?":{}|<>]'));
-
+ bool hasSpecialChar = password.contains(
+ RegExp(r'[!@#$%^&*(),.?":{}|<>]'),
+ );
+
if (hasNumber && hasSpecialChar) {
return Colors.green[700]!;
} else {
@@ -1363,15 +1415,15 @@ class _EventFormScreenState extends State {
}
}
}
-
+
// 비밀번호 강도에 따른 도움말 텍스트 반환
String _getPasswordHelperText() {
final password = _accessPasswordController.text;
-
+
if (password.isEmpty) {
return '설정 시 이벤트 접근에 비밀번호가 필요합니다';
}
-
+
if (password.length < 4) {
return '비밀번호가 너무 짧습니다 (최소 4자)';
} else if (password.length < 6) {
@@ -1381,8 +1433,10 @@ class _EventFormScreenState extends State {
} else {
// 8자 이상이고 숫자와 특수문자를 포함하는지 확인
bool hasNumber = password.contains(RegExp(r'[0-9]'));
- bool hasSpecialChar = password.contains(RegExp(r'[!@#$%^&*(),.?":{}|<>]'));
-
+ bool hasSpecialChar = password.contains(
+ RegExp(r'[!@#$%^&*(),.?":{}|<>]'),
+ );
+
if (hasNumber && hasSpecialChar) {
return '비밀번호 강도: 매우 강함';
} else {
@@ -1390,38 +1444,41 @@ class _EventFormScreenState extends State {
}
}
}
-
+
// 참가비 포맷팅 업데이트
void _updateFormattedFee(String value) {
if (value.isEmpty) {
_formattedFeeController.clear();
return;
}
-
+
final numericValue = double.tryParse(value);
if (numericValue != null) {
// 현재 커서 위치 저장
final currentCursor = _formattedFeeController.selection.baseOffset;
final oldText = _formattedFeeController.text;
final newText = _currencyFormat.format(numericValue);
-
+
// 커서 위치 계산 로직 개선
int newCursorPosition = currentCursor;
if (oldText.isNotEmpty && currentCursor > 0) {
// 이전 텍스트와 새 텍스트의 길이 차이 계산
final lengthDiff = newText.length - oldText.length;
- newCursorPosition = (currentCursor + lengthDiff).clamp(0, newText.length);
+ newCursorPosition = (currentCursor + lengthDiff).clamp(
+ 0,
+ newText.length,
+ );
} else {
newCursorPosition = newText.length;
}
-
+
_formattedFeeController.value = TextEditingValue(
text: newText,
selection: TextSelection.collapsed(offset: newCursorPosition),
);
}
}
-
+
// 참가비 변경 리스너
void _onParticipantFeeChanged() {
final value = _participantFeeController.text;
@@ -1436,41 +1493,41 @@ class _EventFormScreenState extends State {
_updateFormattedFee(value);
}
}
-
+
// 참가비 입력 상태에 따른 도움말 텍스트 반환
String _getParticipantFeeHelperText() {
if (_participantFeeController.text.isEmpty) {
- return '통화 형식으로 자동 변환됩니다';
+ return '통화 형식으로 자동 변환됩니다 (빈값이면 미표기)';
}
-
+
final fee = double.tryParse(_participantFeeController.text);
if (fee == null) {
return '유효한 금액을 입력해주세요';
}
-
- if (fee <= 0) {
+
+ if (fee < 0) {
return '참가비는 0원 이상이어야 합니다';
+ } else if (fee == 0) {
+ return '참가비: 0원 (무료)';
} else if (fee > 1000000) {
return '최대 금액은 1,000,000원입니다';
- } else if (fee >= 100000) {
- return '참가비: ${_currencyFormat.format(fee)}';
} else {
- return '참가비: ${_currencyFormat.format(fee)}';
+ return '참가비: ${_currencyFormat.format(fee)}원';
}
}
-
+
// 참가비 입력 상태에 따른 색상 반환
Color _getParticipantFeeColor() {
if (_participantFeeController.text.isEmpty) {
return Colors.grey[600]!;
}
-
+
final fee = double.tryParse(_participantFeeController.text);
if (fee == null) {
return Colors.red[700]!;
}
-
- if (fee <= 0) {
+
+ if (fee < 0) {
return Colors.red[700]!;
} else if (fee > 1000000) {
return Colors.orange[700]!;
@@ -1478,15 +1535,15 @@ class _EventFormScreenState extends State {
return Colors.green[700]!;
}
}
-
+
// 참가비 입력 상태에 따른 아이콘 반환
IconData _getParticipantFeeIcon() {
if (_participantFeeController.text.isEmpty) {
return Icons.info_outline;
}
-
+
final fee = double.tryParse(_participantFeeController.text);
- if (fee == null || fee <= 0) {
+ if (fee == null || fee < 0) {
return Icons.error_outline;
} else if (fee > 1000000) {
return Icons.warning;
@@ -1494,22 +1551,24 @@ class _EventFormScreenState extends State {
return Icons.check_circle;
}
}
-
+
// 참가비 입력 상태에 따른 상태 텍스트 반환
String _getParticipantFeeStatusText() {
if (_participantFeeController.text.isEmpty) {
return '참가비가 설정되지 않았습니다';
}
-
+
final fee = double.tryParse(_participantFeeController.text);
if (fee == null) {
return '유효하지 않은 금액입니다';
}
-
- if (fee <= 0) {
+
+ if (fee < 0) {
return '참가비는 0원 이상이어야 합니다';
} else if (fee > 1000000) {
return '최대 금액을 초과했습니다';
+ } else if (fee == 0) {
+ return '참가비: 0원 (무료)';
} else {
return '참가비가 설정되었습니다';
}
diff --git a/mobile/lib/screens/club/event_import_wizard.dart b/mobile/lib/screens/club/event_import_wizard.dart
new file mode 100644
index 0000000..130ca14
--- /dev/null
+++ b/mobile/lib/screens/club/event_import_wizard.dart
@@ -0,0 +1,898 @@
+import 'dart:io';
+
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+
+import '../../services/event_service.dart';
+import '../../services/member_service.dart';
+
+class EventImportWizard extends StatefulWidget {
+ const EventImportWizard({super.key});
+
+ @override
+ State createState() => _EventImportWizardState();
+}
+
+class _EventImportWizardState extends State {
+ int _currentStep = 0;
+
+ // Step1: upload
+ File? _pickedFile;
+ String? _uploadedFilename;
+ bool _uploading = false;
+
+ // Step2: preview
+ Map?
+ _previewData; // { participants: [], suggestions: {}, ... }
+ List> _participants = [];
+ bool _loadingPreview = false;
+ String? _sheetName;
+ bool _scoresIncludeHandicap = true; // 미리보기: 점수에 핸디 포함 여부
+
+ // Step3: event info
+ final _formKey = GlobalKey();
+ final _titleCtrl = TextEditingController();
+ final _locationCtrl = TextEditingController();
+ DateTime? _startDate;
+ DateTime? _endDate;
+ int _gameCount = 3;
+
+ // Helpers
+ Widget _buildMessageList(
+ dynamic messages, {
+ required String title,
+ required Color color,
+ }) {
+ final List list;
+ if (messages is List) {
+ list = messages.map((e) => e.toString()).toList();
+ } else if (messages is Map) {
+ list = messages.values.map((e) => e.toString()).toList();
+ } else if (messages != null) {
+ list = [messages.toString()];
+ } else {
+ list = const [];
+ }
+ if (list.isEmpty) return const SizedBox.shrink();
+ return Container(
+ width: double.infinity,
+ padding: const EdgeInsets.all(8),
+ decoration: BoxDecoration(
+ color: color.withOpacity(0.08),
+ border: Border.all(color: color.withOpacity(0.5)),
+ borderRadius: BorderRadius.circular(8),
+ ),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Row(
+ children: [
+ Icon(Icons.info_outline, color: color, size: 18),
+ const SizedBox(width: 6),
+ Text(
+ title,
+ style: TextStyle(color: color, fontWeight: FontWeight.bold),
+ ),
+ ],
+ ),
+ const SizedBox(height: 6),
+ ...list.map(
+ (m) => Padding(
+ padding: const EdgeInsets.symmetric(vertical: 2),
+ child: Text('- $m'),
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+
+ Future _openMemberPicker(Map p) async {
+ final memberService = Provider.of(context, listen: false);
+ await showModalBottomSheet(
+ context: context,
+ builder: (ctx) {
+ return SafeArea(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ ListTile(
+ leading: const Icon(Icons.person_off),
+ title: const Text('게스트'),
+ onTap: () {
+ setState(() {
+ p['memberId'] = null;
+ });
+ Navigator.of(ctx).pop();
+ },
+ ),
+ const Divider(height: 1),
+ Expanded(
+ child: ListView.builder(
+ itemCount: memberService.members.length,
+ itemBuilder: (_, i) {
+ final m = memberService.members[i];
+ return ListTile(
+ leading: const Icon(Icons.person),
+ title: Text(m.name, overflow: TextOverflow.ellipsis),
+ onTap: () {
+ setState(() {
+ p['memberId'] = m.id;
+ p['name'] = m.name.length > 5
+ ? m.name.substring(0, 5)
+ : m.name;
+ });
+ Navigator.of(ctx).pop();
+ },
+ );
+ },
+ ),
+ ),
+ ],
+ ),
+ );
+ },
+ );
+ }
+
+ void _normalizeScoresForAll() {
+ setState(() {
+ for (final p in _participants) {
+ final list = >[];
+ final cur = p['scores'];
+ if (cur is List) {
+ for (var i = 0; i < cur.length && i < _gameCount; i++) {
+ final s = cur[i];
+ if (s is num) {
+ list.add({'gameNumber': i + 1, 'score': s.toInt()});
+ } else if (s is Map) {
+ list.add({
+ 'gameNumber': (s['gameNumber'] ?? (i + 1)) is num
+ ? (s['gameNumber'] as num).toInt()
+ : (i + 1),
+ 'score': int.tryParse((s['score'] ?? 0).toString()) ?? 0,
+ });
+ }
+ }
+ }
+ // pad zeros to reach gameCount
+ for (var i = list.length; i < _gameCount; i++) {
+ list.add({'gameNumber': i + 1, 'score': 0});
+ }
+ p['scores'] = list;
+ }
+ });
+ }
+
+ List _rowWarnings(Map p) {
+ final w = [];
+ final name = (p['name']?.toString() ?? '').trim();
+ if (name.isEmpty) w.add('이름 누락');
+ final scores = p['scores'];
+ if (scores is List) {
+ final len = scores.length;
+ if (_gameCount > 0 && len != _gameCount) {
+ w.add('점수 개수($_gameCount 기대) 불일치: $len');
+ }
+ }
+ return w;
+ }
+
+ Future _confirmAndDeleteTempIfAny() async {
+ if (_uploadedFilename == null) return true;
+ final confirmed = await showDialog(
+ context: context,
+ builder: (_) => AlertDialog(
+ title: const Text('가져오기 취소'),
+ content: const Text('업로드된 임시 파일을 삭제하고 마법사를 종료할까요?'),
+ actions: [
+ TextButton(
+ onPressed: () => Navigator.of(context).pop(false),
+ child: const Text('유지'),
+ ),
+ TextButton(
+ onPressed: () => Navigator.of(context).pop(true),
+ child: const Text('삭제 후 종료'),
+ ),
+ ],
+ ),
+ );
+ if (confirmed == true) {
+ try {
+ final svc = Provider.of(context, listen: false);
+ await svc.deleteUploadedFile(_uploadedFilename!);
+ } catch (_) {
+ // ignore deletion failure
+ }
+ }
+ return confirmed ?? false;
+ }
+
+ Future _pickAndUpload() async {
+ final eventService = Provider.of(context, listen: false);
+ setState(() => _uploading = true);
+ try {
+ final result = await FilePicker.platform.pickFiles(
+ type: FileType.custom,
+ allowedExtensions: [
+ 'xlsx',
+ 'xls',
+ 'csv',
+ 'png',
+ 'jpg',
+ 'jpeg',
+ 'heic',
+ 'webp',
+ ],
+ );
+ if (result == null || result.files.isEmpty) {
+ setState(() => _uploading = false);
+ return;
+ }
+ final path = result.files.first.path;
+ if (path == null) {
+ setState(() => _uploading = false);
+ ScaffoldMessenger.of(
+ context,
+ ).showSnackBar(const SnackBar(content: Text('파일 경로를 확인할 수 없습니다.')));
+ return;
+ }
+ _pickedFile = File(path);
+ final resp = await eventService.uploadEventFile(_pickedFile!);
+ _uploadedFilename = resp['filename']?.toString();
+ if (_uploadedFilename == null) {
+ throw Exception('서버 응답에 filename이 없습니다');
+ }
+ setState(() {});
+ await _loadPreview();
+ setState(() => _currentStep = 1);
+ } catch (e) {
+ ScaffoldMessenger.of(
+ context,
+ ).showSnackBar(SnackBar(content: Text('업로드 실패: $e')));
+ } finally {
+ setState(() => _uploading = false);
+ }
+ }
+
+ Future _loadPreview() async {
+ final eventService = Provider.of(context, listen: false);
+ final memberService = Provider.of(context, listen: false);
+ if (_uploadedFilename == null) return;
+ setState(() => _loadingPreview = true);
+ try {
+ final data = await eventService.parseEventFile(
+ filename: _uploadedFilename!,
+ sheetName: _sheetName,
+ );
+ _previewData = data;
+ final list = (data['participants'] as List?) ?? [];
+ _participants = list
+ .map((e) => Map.from(e as Map))
+ .toList();
+ // ensure members loaded (no heavy await to keep UX; if already loaded, members is non-empty)
+ if (memberService.members.isEmpty) {
+ try {
+ await memberService.fetchClubMembers();
+ } catch (_) {}
+ }
+ // auto-match by exact trimmed name
+ final Map nameToId = {
+ for (final m in memberService.members) m.name.trim(): m.id,
+ };
+ for (final p in _participants) {
+ final nm = (p['name']?.toString() ?? '').trim();
+ if (nm.isNotEmpty && nameToId.containsKey(nm)) {
+ p['memberId'] = nameToId[nm];
+ }
+ }
+ // event suggestion
+ final event = Map.from((data['event'] as Map?) ?? {});
+ _titleCtrl.text = event['title']?.toString() ?? _titleCtrl.text;
+ _locationCtrl.text = event['location']?.toString() ?? _locationCtrl.text;
+ _gameCount =
+ int.tryParse(event['gameCount']?.toString() ?? '') ?? _gameCount;
+ final sd = event['startDate']?.toString();
+ final ed = event['endDate']?.toString();
+ if (sd != null) _startDate = DateTime.tryParse(sd);
+ if (ed != null) _endDate = DateTime.tryParse(ed);
+ } catch (e) {
+ ScaffoldMessenger.of(
+ context,
+ ).showSnackBar(SnackBar(content: Text('미리보기 로드 실패: $e')));
+ } finally {
+ setState(() => _loadingPreview = false);
+ }
+ }
+
+ Future _saveAll() async {
+ if (!_formKey.currentState!.validate()) {
+ return;
+ }
+ final eventService = Provider.of(context, listen: false);
+ try {
+ final eventData = {
+ 'title': _titleCtrl.text.trim(),
+ 'location': _locationCtrl.text.trim().isEmpty
+ ? null
+ : _locationCtrl.text.trim(),
+ 'startDate': _startDate ?? DateTime.now(),
+ 'endDate': _endDate,
+ 'gameCount': _gameCount,
+ 'status': 'draft',
+ 'eventType': 'regular',
+ // 서버에 미리보기에서 선택한 핸디 포함 여부 전달
+ 'scoresIncludeHandicap': _scoresIncludeHandicap,
+ };
+ // participants minimal fields: name, gender, teamNumber, scores, handicap
+ final payloadParticipants = _participants
+ .map(
+ (p) => {
+ 'name': p['name'],
+ if (p['memberId'] != null) 'memberId': p['memberId'],
+ if (p['teamNumber'] != null) 'teamNumber': p['teamNumber'],
+ if (p['handicap'] != null) 'handicap': p['handicap'],
+ if (p['scores'] != null) 'scores': p['scores'],
+ },
+ )
+ .toList();
+
+ final resp = await eventService.saveEventFileData(
+ eventData: eventData,
+ participants: payloadParticipants,
+ );
+ if (!mounted) return;
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text('이벤트가 저장되었습니다.')),
+ );
+ if (!mounted) return;
+ Navigator.of(context).pop(resp);
+ } catch (e) {
+ if (!mounted) return;
+ ScaffoldMessenger.of(
+ context,
+ ).showSnackBar(SnackBar(content: Text('저장 실패: $e')));
+ }
+ }
+
+ Future _pickDate({required bool isStart}) async {
+ final now = DateTime.now();
+ final picked = await showDatePicker(
+ context: context,
+ initialDate: (isStart ? _startDate : _endDate) ?? now,
+ firstDate: DateTime(now.year - 5),
+ lastDate: DateTime(now.year + 5),
+ );
+ if (picked == null) return;
+ setState(() {
+ if (isStart) {
+ _startDate = picked;
+ } else {
+ _endDate = picked;
+ }
+ });
+ }
+
+ @override
+ void dispose() {
+ _titleCtrl.dispose();
+ _locationCtrl.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final dateFmt = DateFormat('yyyy-MM-dd');
+ return Scaffold(
+ appBar: AppBar(title: const Text('이벤트 가져오기')),
+ body: Stepper(
+ currentStep: _currentStep,
+ onStepContinue: () async {
+ if (_currentStep == 0) {
+ await _pickAndUpload();
+ } else if (_currentStep == 1) {
+ // allow proceed; editing continues in next step
+ setState(() => _currentStep = 2);
+ } else if (_currentStep == 2) {
+ // block if any participant missing name
+ final missing = _participants.any(
+ (p) => (p['name']?.toString() ?? '').trim().isEmpty,
+ );
+ if (missing) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(
+ content: Text('이름이 비어있는 참가자가 있습니다. 미리보기에서 수정해 주세요.'),
+ ),
+ );
+ return;
+ }
+ if (_formKey.currentState!.validate()) {
+ setState(() => _currentStep = 3);
+ }
+ } else if (_currentStep == 3) {
+ await _saveAll();
+ }
+ },
+ onStepCancel: () async {
+ if (_currentStep > 0) {
+ setState(() => _currentStep -= 1);
+ } else {
+ final ok = await _confirmAndDeleteTempIfAny();
+ if (ok) {
+ if (!mounted) return;
+ Navigator.of(context).pop();
+ }
+ }
+ },
+ steps: [
+ Step(
+ title: const Text('파일 업로드'),
+ isActive: _currentStep >= 0,
+ content: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ _pickedFile != null
+ ? '선택됨: ${_pickedFile!.path.split('/').last}'
+ : '파일을 선택하세요.',
+ ),
+ const SizedBox(height: 12),
+ ElevatedButton.icon(
+ onPressed: _uploading ? null : _pickAndUpload,
+ icon: const Icon(Icons.file_upload),
+ label: Text(_uploading ? '업로드 중...' : '파일 선택 및 업로드'),
+ ),
+ if (_uploadedFilename != null)
+ Padding(
+ padding: const EdgeInsets.only(top: 8.0),
+ child: Text('업로드됨: $_uploadedFilename'),
+ ),
+ ],
+ ),
+ ),
+ Step(
+ title: const Text('미리보기/수정'),
+ isActive: _currentStep >= 1,
+ state: _currentStep > 1 ? StepState.complete : StepState.indexed,
+ content: _loadingPreview
+ ? const Center(child: CircularProgressIndicator())
+ : Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Row(
+ children: [
+ Expanded(
+ child: Text('참가자 ${_participants.length}명'),
+ ),
+ Flexible(
+ child: Wrap(
+ alignment: WrapAlignment.end,
+ crossAxisAlignment: WrapCrossAlignment.center,
+ spacing: 8,
+ runSpacing: 8,
+ children: [
+ Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Checkbox(
+ value: _scoresIncludeHandicap,
+ onChanged: (v) {
+ if (v == null) return;
+ setState(() => _scoresIncludeHandicap = v);
+ },
+ ),
+ const Text('점수에 핸디 포함'),
+ ],
+ ),
+ if ((_previewData?['sheets'] is List) &&
+ ((_previewData?['sheets'] as List).length > 1))
+ ConstrainedBox(
+ constraints: const BoxConstraints(maxWidth: 180),
+ child: DropdownButton(
+ isExpanded: true,
+ value: _sheetName ??
+ ((_previewData!['sheets'] as List).first?.toString()),
+ hint: const Text('시트 선택'),
+ items: (_previewData!['sheets'] as List)
+ .map>(
+ (s) => DropdownMenuItem(
+ value: s.toString(),
+ child: Text(s.toString(), overflow: TextOverflow.ellipsis),
+ ),
+ )
+ .toList(),
+ onChanged: (v) async {
+ setState(() => _sheetName = v);
+ await _loadPreview();
+ },
+ ),
+ ),
+ TextButton.icon(
+ onPressed: _participants.isEmpty
+ ? null
+ : _normalizeScoresForAll,
+ icon: const Icon(Icons.tune, size: 16),
+ label: const Text('점수 개수 맞추기'),
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ // Server-side warnings/errors if present
+ if ((_previewData?['warnings'] != null) ||
+ (_previewData?['errors'] != null))
+ Padding(
+ padding: const EdgeInsets.only(bottom: 6.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ if (_previewData?['warnings'] != null)
+ _buildMessageList(
+ _previewData!['warnings'],
+ title: '서버 경고',
+ color: Colors.orange,
+ ),
+ if (_previewData?['errors'] != null)
+ _buildMessageList(
+ _previewData!['errors'],
+ title: '서버 오류',
+ color: Colors.red,
+ ),
+ ],
+ ),
+ ),
+ Builder(
+ builder: (context) {
+ final totalWarnings = _participants
+ .map(_rowWarnings)
+ .fold(0, (a, b) => a + b.length);
+ if (totalWarnings == 0)
+ return const SizedBox.shrink();
+ return Padding(
+ padding: const EdgeInsets.only(
+ top: 4.0,
+ bottom: 4.0,
+ ),
+ child: Row(
+ children: [
+ const Icon(
+ Icons.warning_amber_rounded,
+ color: Colors.orange,
+ size: 18,
+ ),
+ const SizedBox(width: 6),
+ Text(
+ '경고 ${totalWarnings}건: 이름 누락 또는 점수 개수 불일치',
+ ),
+ ],
+ ),
+ );
+ },
+ ),
+ const SizedBox(height: 8),
+ ListView.separated(
+ shrinkWrap: true,
+ physics: const NeverScrollableScrollPhysics(),
+ itemBuilder: (_, i) {
+ final p = _participants[i];
+ final warns = _rowWarnings(p);
+ return Column(
+ children: [
+ Row(
+ children: [
+ Expanded(
+ flex: 4,
+ child: TextFormField(
+ initialValue: p['name']?.toString() ?? '',
+ decoration: InputDecoration(
+ isDense: true,
+ labelText: '이름',
+ counterText: '',
+ contentPadding:
+ const EdgeInsets.symmetric(
+ vertical: 8,
+ horizontal: 12,
+ ),
+ suffixIcon: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ if (p['memberId'] == null)
+ Padding(
+ padding: const EdgeInsets.only(
+ right: 4,
+ ),
+ child: DecoratedBox(
+ decoration: BoxDecoration(
+ color: Colors.orange
+ .withOpacity(0.15),
+ borderRadius:
+ BorderRadius.circular(
+ 4,
+ ),
+ ),
+ child: Padding(
+ padding:
+ const EdgeInsets.symmetric(
+ horizontal: 4,
+ vertical: 2,
+ ),
+ child: Text(
+ '게',
+ style: Theme.of(
+ context,
+ ).textTheme.labelSmall,
+ ),
+ ),
+ ),
+ ),
+ IconButton(
+ icon: const Icon(
+ Icons.person_search,
+ ),
+ tooltip: '회원 선택',
+ onPressed: () =>
+ _openMemberPicker(p),
+ ),
+ ],
+ ),
+ ),
+ maxLength: 5,
+ maxLines: 1,
+ textAlignVertical:
+ TextAlignVertical.center,
+ onChanged: (v) {
+ final t = v
+ .replaceAll('(게스트)', '')
+ .trim();
+ p['name'] = t;
+ p['memberId'] = null;
+ },
+ textInputAction: TextInputAction.next,
+ ),
+ ),
+ const SizedBox(width: 8),
+ SizedBox(
+ width: 64,
+ child: TextFormField(
+ initialValue:
+ (p['teamNumber']?.toString() ?? ''),
+ decoration: const InputDecoration(
+ isDense: true,
+ labelText: '팀',
+ ),
+ keyboardType: TextInputType.number,
+ onChanged: (v) =>
+ p['teamNumber'] = int.tryParse(v),
+ textInputAction: TextInputAction.next,
+ ),
+ ),
+ const SizedBox(width: 8),
+ SizedBox(
+ width: 92,
+ child: TextFormField(
+ initialValue:
+ (p['handicap']?.toString() ?? ''),
+ decoration: const InputDecoration(
+ isDense: true,
+ labelText: '핸디캡',
+ ),
+ keyboardType: TextInputType.number,
+ onChanged: (v) =>
+ p['handicap'] = int.tryParse(v) ?? 0,
+ textInputAction: TextInputAction.next,
+ ),
+ ),
+ ],
+ ),
+ const SizedBox(height: 6),
+ Builder(
+ builder: (_) {
+ final scoresMap = {};
+ final s = p['scores'];
+ if (s is List) {
+ for (final e in s) {
+ if (e is num) {
+ final idx = scoresMap.length + 1;
+ scoresMap[idx] = e.toInt();
+ } else if (e is Map) {
+ final gn =
+ int.tryParse(
+ (e['gameNumber'] ?? 0).toString(),
+ ) ??
+ 0;
+ final sc =
+ int.tryParse(
+ (e['score'] ?? 0).toString(),
+ ) ??
+ 0;
+ if (gn > 0) scoresMap[gn] = sc;
+ }
+ }
+ }
+ final fields = [];
+ for (var i = 1; i <= _gameCount; i++) {
+ final initial =
+ scoresMap[i]?.toString() ?? '';
+ fields.add(
+ SizedBox(
+ width: 64,
+ child: TextFormField(
+ initialValue: initial,
+ decoration: InputDecoration(
+ isDense: true,
+ labelText: '${i}G',
+ counterText: '',
+ ),
+ maxLength: 3,
+ keyboardType: TextInputType.number,
+ onChanged: (v) {
+ final cur =
+ >[];
+ for (
+ var j = 1;
+ j <= _gameCount;
+ j++
+ ) {
+ if (j == i) {
+ final n = int.tryParse(v) ?? 0;
+ cur.add({
+ 'gameNumber': j,
+ 'score': n,
+ });
+ } else {
+ final prev = scoresMap[j] ?? 0;
+ cur.add({
+ 'gameNumber': j,
+ 'score': prev,
+ });
+ }
+ }
+ p['scores'] = cur;
+ },
+ ),
+ ),
+ );
+ }
+ return Wrap(
+ spacing: 6,
+ runSpacing: 6,
+ children: fields,
+ );
+ },
+ ),
+ if (warns.isNotEmpty) ...[
+ const SizedBox(height: 4),
+ Align(
+ alignment: Alignment.centerLeft,
+ child: Wrap(
+ spacing: 6,
+ children: warns
+ .map(
+ (t) => Chip(
+ label: Text(t),
+ visualDensity:
+ VisualDensity.compact,
+ padding: const EdgeInsets.symmetric(
+ horizontal: 4,
+ ),
+ backgroundColor:
+ Colors.orange.shade100,
+ ),
+ )
+ .toList(),
+ ),
+ ),
+ ],
+ ],
+ );
+ },
+ separatorBuilder: (_, __) => const Divider(height: 12),
+ itemCount: _participants.length,
+ ),
+ ],
+ ),
+ ),
+ Step(
+ title: const Text('이벤트 정보'),
+ isActive: _currentStep >= 2,
+ state: _currentStep > 2 ? StepState.complete : StepState.indexed,
+ content: Form(
+ key: _formKey,
+ child: Column(
+ children: [
+ TextFormField(
+ controller: _titleCtrl,
+ decoration: const InputDecoration(labelText: '이벤트 제목'),
+ validator: (v) =>
+ (v == null || v.trim().isEmpty) ? '제목을 입력하세요' : null,
+ ),
+ const SizedBox(height: 8),
+ TextFormField(
+ controller: _locationCtrl,
+ decoration: const InputDecoration(labelText: '장소 (선택)'),
+ ),
+ const SizedBox(height: 8),
+ Row(
+ children: [
+ Expanded(
+ child: InkWell(
+ onTap: () => _pickDate(isStart: true),
+ child: InputDecorator(
+ decoration: const InputDecoration(labelText: '시작일'),
+ child: Text(
+ _startDate != null
+ ? dateFmt.format(_startDate!)
+ : '선택',
+ ),
+ ),
+ ),
+ ),
+ const SizedBox(width: 8),
+ Expanded(
+ child: InkWell(
+ onTap: () => _pickDate(isStart: false),
+ child: InputDecorator(
+ decoration: const InputDecoration(
+ labelText: '종료일 (선택)',
+ ),
+ child: Text(
+ _endDate != null
+ ? dateFmt.format(_endDate!)
+ : '선택',
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ const SizedBox(height: 8),
+ Row(
+ children: [
+ const Text('게임 수'),
+ const SizedBox(width: 12),
+ DropdownButton(
+ value: _gameCount,
+ items: const [1, 2, 3, 4, 5, 6]
+ .map(
+ (e) =>
+ DropdownMenuItem(value: e, child: Text('$e')),
+ )
+ .toList(),
+ onChanged: (v) =>
+ setState(() => _gameCount = v ?? _gameCount),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ ),
+ Step(
+ title: const Text('확인 및 저장'),
+ isActive: _currentStep >= 3,
+ state: _currentStep == 3 ? StepState.editing : StepState.indexed,
+ content: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text('이벤트: ${_titleCtrl.text} (${_gameCount}게임)'),
+ if (_startDate != null)
+ Text('시작일: ${dateFmt.format(_startDate!)}'),
+ if (_endDate != null) Text('종료일: ${dateFmt.format(_endDate!)}'),
+ Text('참가자: ${_participants.length}명'),
+ const SizedBox(height: 12),
+ ElevatedButton.icon(
+ onPressed: _saveAll,
+ icon: const Icon(Icons.save),
+ label: const Text('저장'),
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/mobile/lib/screens/club/events_screen.dart b/mobile/lib/screens/club/events_screen.dart
index dd22178..0233a51 100644
--- a/mobile/lib/screens/club/events_screen.dart
+++ b/mobile/lib/screens/club/events_screen.dart
@@ -1,10 +1,8 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
-import 'package:share_plus/share_plus.dart';
import 'package:flutter/services.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:intl/intl.dart';
-import 'package:file_picker/file_picker.dart';
import '../../utils/event_excel_parser.dart';
import '../../utils/event_csv_parser.dart';
@@ -17,6 +15,7 @@ import '../../widgets/loading_indicator.dart';
import 'event_details_screen.dart';
import 'event_form_screen.dart';
import 'event_calendar_screen.dart';
+import 'event_import_wizard.dart';
import '../../widgets/dialog_actions.dart';
import '../../widgets/import_result_dialog.dart';
import '../../theme/badges.dart';
@@ -37,6 +36,23 @@ class _EventsScreenState extends State {
String _filterStatus = '모든 상태'; // '모든 상태', '활성', '대기', '취소', '완료'
String _sortBy = '날짜순'; // '날짜순', '이름순'
+ // 이벤트 상태 정규화: DB 원시값(영문) -> 한국어 라벨
+ String? _normalizeEventStatus(String? status) {
+ if (status == null) return null;
+ final s = status.toLowerCase().trim();
+ if (s == 'active' || s == 'enabled' || s == '활성') return '활성';
+ if (s == 'pending' ||
+ s == 'draft' ||
+ s == 'scheduled' ||
+ s == 'waiting' ||
+ s == '대기')
+ return '대기';
+ if (s == 'canceled' || s == 'cancelled' || s == '취소') return '취소';
+ if (s == 'completed' || s == 'done' || s == 'finished' || s == '완료')
+ return '완료';
+ return status; // 알 수 없는 값은 원문 유지
+ }
+
@override
void dispose() {
_searchController.dispose();
@@ -83,29 +99,32 @@ class _EventsScreenState extends State {
navigator.pop();
messenger.showSnackBar(
SnackBar(
- content: Text('파일 파싱 중 오류가 발생했습니다: ${e.toString()}\n가능하면 CSV 또는 XLSX 형식을 사용해 주세요.'),
+ content: Text(
+ '파일 파싱 중 오류가 발생했습니다: ${e.toString()}\n가능하면 CSV 또는 XLSX 형식을 사용해 주세요.',
+ ),
duration: Duration(seconds: 5),
),
);
return;
}
final processedRows = parseResult['processedRows'] as int;
- final events = (parseResult['validEvents'] as List).cast>();
+ final events = (parseResult['validEvents'] as List)
+ .cast>();
final invalidRows = parseResult['invalidRows'] as int;
- final invalidRowIndices = (parseResult['invalidRowIndices'] as List? ?? const [])
- .map((e) => e.toString())
- .toList();
- final Map invalidRowReasons = ((parseResult['invalidRowReasons'] as Map?) ?? const {})
- .map((key, value) => MapEntry(key.toString(), value?.toString() ?? ''));
+ final invalidRowIndices =
+ (parseResult['invalidRowIndices'] as List? ?? const [])
+ .map((e) => e.toString())
+ .toList();
+ final Map invalidRowReasons =
+ ((parseResult['invalidRowReasons'] as Map?) ?? const {}).map(
+ (key, value) => MapEntry(key.toString(), value?.toString() ?? ''),
+ );
final error = parseResult['error'] as String?;
if (error != null) {
navigator.pop();
messenger.showSnackBar(
- SnackBar(
- content: Text(error),
- duration: Duration(seconds: 4),
- ),
+ SnackBar(content: Text(error), duration: Duration(seconds: 4)),
);
return;
}
@@ -205,15 +224,11 @@ class _EventsScreenState extends State {
eventService.setClubId(event.clubId);
await eventService.cloneEvent(event.id);
if (!mounted) return;
- messenger.showSnackBar(
- const SnackBar(content: Text('이벤트가 복제되었습니다')),
- );
+ messenger.showSnackBar(const SnackBar(content: Text('이벤트가 복제되었습니다')));
// 목록 새로고침
await _loadEvents();
} catch (e) {
- messenger.showSnackBar(
- SnackBar(content: Text('이벤트 복제에 실패했습니다: $e')),
- );
+ messenger.showSnackBar(SnackBar(content: Text('이벤트 복제에 실패했습니다: $e')));
}
}
@@ -227,6 +242,18 @@ class _EventsScreenState extends State {
}
Future _loadEvents() async {
+ // 인증 가드: 로그인 상태가 아니면 목록 로딩을 시도하지 않음
+ final authService = Provider.of(context, listen: false);
+ if (!authService.isAuthenticated) {
+ // 필요 시 간단 안내만 표시하고 리턴
+ if (mounted) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text('로그인이 필요합니다. 로그인 후 이벤트를 불러옵니다.')),
+ );
+ }
+ return;
+ }
+
setState(() {
_isLoading = true;
});
@@ -234,7 +261,6 @@ class _EventsScreenState extends State