vusakhoza/velocity-pay-flutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completed migrating data scope from user to workspace

Browse Source
This commit is contained in:
Vusa
2026-06-22 22:10:38 +02:00
parent 62c7f53de0
commit ae2705363a
37 changed files with 918 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/screens/history/history_controller.dart
View File

@@ -66,7 +66,7 @@ class HistoryController extends ChangeNotifier {
}
_safeNotify();
params['partyType'] = 'INDIVIDUAL';
params['partyType'] = 'INDIVIDUAL,GROUP';
try {
Map<String, dynamic> response = await http.get(
@@ -107,7 +107,7 @@ class HistoryController extends ChangeNotifier {
}
Future<void> searchTransactions(
String userId, {
String workspaceId, {
String? search,
String? status,
String? type,
@@ -116,7 +116,7 @@ class HistoryController extends ChangeNotifier {
model.statusFilter = status;
model.typeFilter = type;
final params = <String, String>{
'userId': userId,
'workspaceId': workspaceId,
'page': '0',
'size': '20',
'sort': 'createdAt,desc',
@@ -138,12 +138,12 @@ class HistoryController extends ChangeNotifier {
await getTransactions(params);
}
Future<void> loadNextPage(String userId) async {
Future<void> loadNextPage(String workspaceId) async {
if (model.isLoadingMore || model.currentPage + 1 >= model.totalPages) {
return;
}
final params = <String, String>{
'userId': userId,
'workspaceId': workspaceId,
'page': (model.currentPage + 1).toString(),
'size': '20',
'sort': 'createdAt,desc',

32
lib/screens/history/history_screen.dart
View File

@@ -64,16 +64,16 @@ class _HistoryScreenState extends State<HistoryScreen>
Future<void> setupData() async {
prefs = await SharedPreferences.getInstance();
final userId = prefs.getString("userId") ?? '';
await controller.searchTransactions(userId);
final workspaceId = prefs.getString("workspaceId") ?? '';
await controller.searchTransactions(workspaceId);
}
void _onScroll() {
if (_scrollController.position.pixels >=
_scrollController.position.maxScrollExtent - 200) {
final userId = prefs.getString("userId") ?? '';
if (userId.isNotEmpty) {
controller.loadNextPage(userId);
final workspaceId = prefs.getString("workspaceId") ?? '';
if (workspaceId.isNotEmpty) {
controller.loadNextPage(workspaceId);
}
}
}
@@ -227,9 +227,10 @@ class _HistoryScreenState extends State<HistoryScreen>
child: ElevatedButton(
onPressed: () {
Navigator.of(ctx).pop();
final userId = prefs.getString("userId") ?? '';
final workspaceId =
prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
userId,
workspaceId,
search: _searchController.text.isNotEmpty
? _searchController.text
: null,
@@ -327,9 +328,10 @@ class _HistoryScreenState extends State<HistoryScreen>
icon: const Icon(Icons.clear),
onPressed: () {
_searchController.clear();
final userId = prefs.getString("userId") ?? '';
final workspaceId =
prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
userId,
workspaceId,
status: controller.model.statusFilter,
type: controller.model.typeFilter,
);
@@ -351,9 +353,9 @@ class _HistoryScreenState extends State<HistoryScreen>
),
textInputAction: TextInputAction.search,
onFieldSubmitted: (value) {
final userId = prefs.getString("userId") ?? '';
final workspaceId = prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
userId,
workspaceId,
search: value.isNotEmpty ? value : null,
status: controller.model.statusFilter,
type: controller.model.typeFilter,
@@ -496,9 +498,9 @@ class _HistoryScreenState extends State<HistoryScreen>
'Status: ${controller.model.statusFilter}',
() {
controller.model.statusFilter = null;
final userId = prefs.getString("userId") ?? '';
final workspaceId = prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
userId,
workspaceId,
search: _searchController.text.isNotEmpty
? _searchController.text
: null,
@@ -509,9 +511,9 @@ class _HistoryScreenState extends State<HistoryScreen>
if (controller.model.typeFilter != null)
_activeFilterChip('Type: ${controller.model.typeFilter}', () {
controller.model.typeFilter = null;
final userId = prefs.getString("userId") ?? '';
final workspaceId = prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
userId,
workspaceId,
search: _searchController.text.isNotEmpty
? _searchController.text
: null,