julian/superport_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

계정 정보 다이얼로그 추가 및 전체 목록 페치 개선

Browse Source
This commit is contained in:
JiWoong Sul
2025-10-22 01:05:47 +09:00
parent 6b58effc83
commit f4dc83d441
44 changed files with 1636 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/features/approvals/history/presentation/controllers/approval_history_controller.dart
View File

@@ -43,6 +43,17 @@ class ApprovalHistoryController extends ChangeNotifier {
_errorMessage = null;
notifyListeners();
try {
final previous = _result;
final int resolvedPage;
if (page < 1) {
resolvedPage = 1;
} else if (previous != null && previous.pageSize > 0) {
final calculated = (previous.total / previous.pageSize).ceil();
final maxPage = calculated < 1 ? 1 : calculated;
resolvedPage = page > maxPage ? maxPage : page;
} else {
resolvedPage = page;
}
final action = switch (_actionFilter) {
ApprovalHistoryActionFilter.all => null,
ApprovalHistoryActionFilter.approve => 'approve',
@@ -51,7 +62,7 @@ class ApprovalHistoryController extends ChangeNotifier {
};
final response = await _repository.list(
page: page,
page: resolvedPage,
pageSize: _pageSize,
query: _query.trim().isEmpty ? null : _query.trim(),
action: action,

9
lib/features/approvals/history/presentation/pages/approval_history_page.dart
View File

@@ -87,9 +87,10 @@ class _ApprovalHistoryEnabledPageState
final error = _controller.errorMessage;
if (error != null && error != _lastError && mounted) {
_lastError = error;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(error)));
final messenger = ScaffoldMessenger.maybeOf(context);
if (messenger != null) {
messenger.showSnackBar(SnackBar(content: Text(error)));
}
_controller.clearError();
}
}
@@ -115,7 +116,7 @@ class _ApprovalHistoryEnabledPageState
final currentPage = result?.page ?? 1;
final totalPages = result == null || result.pageSize == 0
? 1
: (result.total / result.pageSize).ceil().clamp(1, 9999);
: (result.total / result.pageSize).ceil().clamp(1, 9999) as int;
final sortedHistories = _applySorting(histories);
return AppLayout(

29
lib/features/approvals/presentation/controllers/approval_controller.dart
View File

@@ -1,6 +1,7 @@
import 'package:flutter/foundation.dart';
import 'package:superport_v2/core/common/models/paginated_result.dart';
import 'package:superport_v2/core/network/failure.dart';
import 'package:superport_v2/core/common/models/paginated_result.dart';
import 'package:superport_v2/core/common/utils/pagination_utils.dart';
import '../../../inventory/lookups/domain/entities/lookup_item.dart';
import '../../../inventory/lookups/domain/repositories/inventory_lookup_repository.dart';
@@ -150,9 +151,20 @@ class ApprovalController extends ChangeNotifier {
_errorMessage = null;
notifyListeners();
try {
final previous = _result;
final int resolvedPage;
if (page < 1) {
resolvedPage = 1;
} else if (previous != null && previous.pageSize > 0) {
final calculated = (previous.total / previous.pageSize).ceil();
final maxPage = calculated < 1 ? 1 : calculated;
resolvedPage = page > maxPage ? maxPage : page;
} else {
resolvedPage = page;
}
final statusId = _statusIdFor(_statusFilter);
final response = await _repository.list(
page: page,
page: resolvedPage,
pageSize: _result?.pageSize ?? 20,
transactionId: _transactionIdFilter,
approvalStatusId: statusId,
@@ -294,12 +306,15 @@ class ApprovalController extends ChangeNotifier {
_errorMessage = null;
notifyListeners();
try {
final result = await _templateRepository.list(
page: 1,
pageSize: 100,
isActive: true,
final templates = await fetchAllPaginatedItems<ApprovalTemplate>(
pageSize: 200,
request: (page, pageSize) => _templateRepository.list(
page: page,
pageSize: pageSize,
isActive: true,
),
);
_templates = result.items;
_templates = templates;
} catch (error) {
final failure = Failure.from(error);
_errorMessage = failure.describe();

46
lib/features/approvals/presentation/pages/approval_page.dart
View File

@@ -135,7 +135,7 @@ class _ApprovalEnabledPageState extends State<_ApprovalEnabledPage> {
final currentPage = result?.page ?? 1;
final totalPages = result == null || result.pageSize == 0
? 1
: (result.total / result.pageSize).ceil().clamp(1, 9999);
: (result.total / result.pageSize).ceil().clamp(1, 9999) as int;
final hasNext = result == null
? false
: (result.page * result.pageSize) < result.total;
@@ -275,6 +275,15 @@ class _ApprovalEnabledPageState extends State<_ApprovalEnabledPage> {
),
Row(
children: [
ShadButton.outline(
size: ShadButtonSize.sm,
onPressed:
_controller.isLoadingList || currentPage <= 1
? null
: () => _controller.fetch(page: 1),
child: const Text('처음'),
),
const SizedBox(width: 8),
ShadButton.outline(
size: ShadButtonSize.sm,
onPressed:
@@ -291,6 +300,15 @@ class _ApprovalEnabledPageState extends State<_ApprovalEnabledPage> {
: () => _controller.fetch(page: currentPage + 1),
child: const Text('다음'),
),
const SizedBox(width: 8),
ShadButton.outline(
size: ShadButtonSize.sm,
onPressed:
_controller.isLoadingList || currentPage >= totalPages
? null
: () => _controller.fetch(page: totalPages),
child: const Text('마지막'),
),
],
),
],
@@ -393,7 +411,10 @@ class _ApprovalEnabledPageState extends State<_ApprovalEnabledPage> {
ShadButton.ghost(
onPressed: isSubmitting
? null
: () => Navigator.of(context).pop(false),
: () => Navigator.of(
context,
rootNavigator: true,
).pop(false),
child: const Text('취소'),
),
ShadButton(
@@ -449,7 +470,10 @@ class _ApprovalEnabledPageState extends State<_ApprovalEnabledPage> {
return;
}
if (result != null) {
Navigator.of(context).pop(true);
Navigator.of(
context,
rootNavigator: true,
).pop(true);
}
},
child: isSubmitting
@@ -788,7 +812,10 @@ class _ApprovalEnabledPageState extends State<_ApprovalEnabledPage> {
constraints: const BoxConstraints(maxWidth: 420),
actions: [
ShadButton.ghost(
onPressed: () => Navigator.of(dialogContext).pop(),
onPressed: () => Navigator.of(
dialogContext,
rootNavigator: true,
).pop(),
child: const Text('취소'),
),
ShadButton(
@@ -798,7 +825,10 @@ class _ApprovalEnabledPageState extends State<_ApprovalEnabledPage> {
setState(() => errorText = '비고를 입력하세요.');
return;
}
Navigator.of(dialogContext).pop(
Navigator.of(
dialogContext,
rootNavigator: true,
).pop(
_StepActionDialogResult(note: note.isEmpty ? null : note),
);
},
@@ -877,11 +907,13 @@ class _ApprovalEnabledPageState extends State<_ApprovalEnabledPage> {
title: '템플릿 적용 확인',
actions: [
ShadButton.ghost(
onPressed: () => Navigator.of(context).pop(false),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(false),
child: const Text('취소'),
),
ShadButton(
onPressed: () => Navigator.of(context).pop(true),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(true),
child: const Text('적용'),
),
],

13
lib/features/approvals/step/presentation/controllers/approval_step_controller.dart
View File

@@ -41,9 +41,20 @@ class ApprovalStepController extends ChangeNotifier {
_errorMessage = null;
notifyListeners();
try {
final previous = _result;
final int resolvedPage;
if (page < 1) {
resolvedPage = 1;
} else if (previous != null && previous.pageSize > 0) {
final calculated = (previous.total / previous.pageSize).ceil();
final maxPage = calculated < 1 ? 1 : calculated;
resolvedPage = page > maxPage ? maxPage : page;
} else {
resolvedPage = page;
}
final sanitizedQuery = _query.trim();
final response = await _repository.list(
page: page,
page: resolvedPage,
pageSize: _result?.pageSize ?? 20,
query: sanitizedQuery.isEmpty ? null : sanitizedQuery,
statusId: _statusId,

85
lib/features/approvals/step/presentation/pages/approval_step_page.dart
View File

@@ -87,9 +87,10 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
final error = _controller.errorMessage;
if (error != null && error != _lastError && mounted) {
_lastError = error;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(error)));
final messenger = ScaffoldMessenger.maybeOf(context);
if (messenger != null) {
messenger.showSnackBar(SnackBar(content: Text(error)));
}
_controller.clearError();
}
}
@@ -117,7 +118,7 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
final pageSize = result?.pageSize ?? records.length;
final totalPages = pageSize == 0
? 1
: (totalCount / pageSize).ceil().clamp(1, 9999);
: (totalCount / pageSize).ceil().clamp(1, 9999) as int;
final hasNext = result == null
? false
: (result.page * result.pageSize) < result.total;
@@ -410,6 +411,17 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
Text('총 $totalCount건', style: theme.textTheme.small),
Row(
children: [
ShadButton.outline(
size: ShadButtonSize.sm,
onPressed:
_controller.isLoading ||
isSaving ||
currentPage <= 1
? null
: () => _controller.fetch(page: 1),
child: const Text('처음'),
),
const SizedBox(width: 8),
ShadButton.outline(
size: ShadButtonSize.sm,
onPressed:
@@ -435,6 +447,19 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
),
child: const Text('다음'),
),
const SizedBox(width: 8),
ShadButton.outline(
size: ShadButtonSize.sm,
onPressed:
_controller.isLoading ||
isSaving ||
currentPage >= totalPages
? null
: () => _controller.fetch(
page: totalPages,
),
child: const Text('마지막'),
),
const SizedBox(width: 12),
Text(
'페이지 $currentPage / $totalPages',
@@ -507,7 +532,8 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
return;
}
ScaffoldMessenger.of(context).showSnackBar(
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
SnackBar(content: Text('결재번호 ${created.approvalNo} 단계가 추가되었습니다.')),
);
}
@@ -515,9 +541,10 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
Future<void> _openEditStepForm(ApprovalStepRecord record) async {
final stepId = record.step.id;
if (stepId == null) {
ScaffoldMessenger.of(
context,
).showSnackBar(const SnackBar(content: Text('저장되지 않은 단계는 수정할 수 없습니다.')));
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
const SnackBar(content: Text('저장되지 않은 단계는 수정할 수 없습니다.')),
);
return;
}
@@ -542,7 +569,8 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
return;
}
ScaffoldMessenger.of(context).showSnackBar(
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
SnackBar(content: Text('결재번호 ${updated.approvalNo} 단계 정보를 수정했습니다.')),
);
}
@@ -550,7 +578,8 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
Future<void> _openDetail(ApprovalStepRecord record) async {
final stepId = record.step.id;
if (stepId == null) {
ScaffoldMessenger.of(context).showSnackBar(
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
const SnackBar(content: Text('단계 식별자가 없어 상세 정보를 볼 수 없습니다.')),
);
return;
@@ -614,9 +643,10 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
Future<void> _confirmDeleteStep(ApprovalStepRecord record) async {
final stepId = record.step.id;
if (stepId == null) {
ScaffoldMessenger.of(
context,
).showSnackBar(const SnackBar(content: Text('저장되지 않은 단계는 삭제할 수 없습니다.')));
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
const SnackBar(content: Text('저장되지 않은 단계는 삭제할 수 없습니다.')),
);
return;
}
@@ -628,11 +658,13 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
'결재번호 ${record.approvalNo}의 ${record.step.stepOrder}단계를 삭제하시겠습니까? 삭제 후 복구할 수 있습니다.',
actions: [
ShadButton.ghost(
onPressed: () => Navigator.of(context).pop(false),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(false),
child: const Text('취소'),
),
ShadButton.destructive(
onPressed: () => Navigator.of(context).pop(true),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(true),
child: const Text('삭제'),
),
],
@@ -648,7 +680,8 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
return;
}
if (success) {
ScaffoldMessenger.of(context).showSnackBar(
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
SnackBar(content: Text('결재번호 ${record.approvalNo} 단계가 삭제되었습니다.')),
);
}
@@ -657,9 +690,10 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
Future<void> _confirmRestoreStep(ApprovalStepRecord record) async {
final stepId = record.step.id;
if (stepId == null) {
ScaffoldMessenger.of(
context,
).showSnackBar(const SnackBar(content: Text('단계 식별자가 없어 복구할 수 없습니다.')));
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
const SnackBar(content: Text('단계 식별자가 없어 복구할 수 없습니다.')),
);
return;
}
@@ -671,11 +705,13 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
'결재번호 ${record.approvalNo}의 ${record.step.stepOrder}단계를 복구하시겠습니까?',
actions: [
ShadButton.ghost(
onPressed: () => Navigator.of(context).pop(false),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(false),
child: const Text('취소'),
),
ShadButton(
onPressed: () => Navigator.of(context).pop(true),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(true),
child: const Text('복구'),
),
],
@@ -691,7 +727,8 @@ class _ApprovalStepEnabledPageState extends State<_ApprovalStepEnabledPage> {
return;
}
if (restored != null) {
ScaffoldMessenger.of(context).showSnackBar(
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
SnackBar(content: Text('결재번호 ${restored.approvalNo} 단계가 복구되었습니다.')),
);
}
@@ -832,7 +869,7 @@ class _StepFormDialogState extends State<_StepFormDialog> {
child: Text(widget.submitLabel),
),
secondaryAction: ShadButton.ghost(
onPressed: () => Navigator.of(context).pop(),
onPressed: () => Navigator.of(context, rootNavigator: true).pop(),
child: const Text('취소'),
),
contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
@@ -951,7 +988,7 @@ class _StepFormDialogState extends State<_StepFormDialog> {
statusId: widget.initialRecord?.step.status.id,
);
Navigator.of(context).pop(input);
Navigator.of(context, rootNavigator: true).pop(input);
}
void _clearError(String field) {

13
lib/features/approvals/template/presentation/controllers/approval_template_controller.dart
View File

@@ -41,6 +41,17 @@ class ApprovalTemplateController extends ChangeNotifier {
_errorMessage = null;
notifyListeners();
try {
final previous = _result;
final int resolvedPage;
if (page < 1) {
resolvedPage = 1;
} else if (previous != null && previous.pageSize > 0) {
final calculated = (previous.total / previous.pageSize).ceil();
final maxPage = calculated < 1 ? 1 : calculated;
resolvedPage = page > maxPage ? maxPage : page;
} else {
resolvedPage = page;
}
final sanitizedQuery = _query.trim();
final isActive = switch (_statusFilter) {
ApprovalTemplateStatusFilter.all => null,
@@ -48,7 +59,7 @@ class ApprovalTemplateController extends ChangeNotifier {
ApprovalTemplateStatusFilter.inactiveOnly => false,
};
final response = await _repository.list(
page: page,
page: resolvedPage,
pageSize: _pageSize,
query: sanitizedQuery.isEmpty ? null : sanitizedQuery,
isActive: isActive,

45
lib/features/approvals/template/presentation/pages/approval_template_page.dart
View File

@@ -86,9 +86,10 @@ class _ApprovalTemplateEnabledPageState
final error = _controller.errorMessage;
if (error != null && error != _lastError && mounted) {
_lastError = error;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(error)));
final messenger = ScaffoldMessenger.maybeOf(context);
if (messenger != null) {
messenger.showSnackBar(SnackBar(content: Text(error)));
}
_controller.clearError();
}
}
@@ -115,7 +116,7 @@ class _ApprovalTemplateEnabledPageState
final currentPage = result?.page ?? 1;
final totalPages = result == null || result.pageSize == 0
? 1
: (result.total / result.pageSize).ceil().clamp(1, 9999);
: (result.total / result.pageSize).ceil().clamp(1, 9999) as int;
final showReset =
_searchController.text.trim().isNotEmpty ||
_controller.statusFilter != ApprovalTemplateStatusFilter.all;
@@ -340,9 +341,10 @@ class _ApprovalTemplateEnabledPageState
}
final success = await _openTemplateForm(template: detail);
if (!mounted || success != true) return;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text('템플릿 "${detail.name}"을(를) 수정했습니다.')));
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
SnackBar(content: Text('템플릿 "${detail.name}"을(를) 수정했습니다.')),
);
}
Future<void> _confirmDelete(ApprovalTemplate template) async {
@@ -354,11 +356,13 @@ class _ApprovalTemplateEnabledPageState
'"${template.name}" 템플릿을 삭제하시겠습니까?\n삭제 시 템플릿은 미사용 상태로 전환됩니다.',
actions: [
ShadButton.ghost(
onPressed: () => Navigator.of(context).pop(false),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(false),
child: const Text('취소'),
),
ShadButton(
onPressed: () => Navigator.of(context).pop(true),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(true),
child: const Text('삭제'),
),
],
@@ -367,7 +371,8 @@ class _ApprovalTemplateEnabledPageState
if (confirmed != true) return;
final ok = await _controller.delete(template.id);
if (!mounted || !ok) return;
ScaffoldMessenger.of(context).showSnackBar(
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
SnackBar(content: Text('템플릿 "${template.name}"을(를) 삭제했습니다.')),
);
}
@@ -380,11 +385,13 @@ class _ApprovalTemplateEnabledPageState
description: '"${template.name}" 템플릿을 복구하시겠습니까?',
actions: [
ShadButton.ghost(
onPressed: () => Navigator.of(context).pop(false),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(false),
child: const Text('취소'),
),
ShadButton(
onPressed: () => Navigator.of(context).pop(true),
onPressed: () =>
Navigator.of(context, rootNavigator: true).pop(true),
child: const Text('복구'),
),
],
@@ -393,7 +400,8 @@ class _ApprovalTemplateEnabledPageState
if (confirmed != true) return;
final restored = await _controller.restore(template.id);
if (!mounted || restored == null) return;
ScaffoldMessenger.of(context).showSnackBar(
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
SnackBar(content: Text('템플릿 "${restored.name}"을(를) 복구했습니다.')),
);
}
@@ -466,7 +474,7 @@ class _ApprovalTemplateEnabledPageState
? await _controller.update(existingTemplate.id, input, stepInputs)
: await _controller.create(input, stepInputs);
if (success != null && mounted) {
Navigator.of(context).pop(true);
Navigator.of(context, rootNavigator: true).pop(true);
} else {
modalSetState?.call(() => isSaving = false);
}
@@ -609,7 +617,7 @@ class _ApprovalTemplateEnabledPageState
ShadButton.ghost(
onPressed: () {
if (isSaving) return;
Navigator.of(context).pop(false);
Navigator.of(context, rootNavigator: true).pop(false);
},
child: const Text('취소'),
),
@@ -632,9 +640,10 @@ class _ApprovalTemplateEnabledPageState
statusNotifier.dispose();
if (result == true && mounted && template == null) {
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text('템플릿 "$createdName"을 생성했습니다.')));
final messenger = ScaffoldMessenger.maybeOf(context);
messenger?.showSnackBar(
SnackBar(content: Text('템플릿 "$createdName"을 생성했습니다.')),
);
}
return result;
}