choi
/
TIF_NGANJUK_E41212036
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feat: fix bug for features upload file

This commit is contained in:
orangdeso 2025-05-06 22:06:08 +07:00
parent 6bf43369c4
commit 0a38f3f788
4 changed files with 122 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/presentation/screens/boarding_pass/pages/detail_ticket_screen.dart
View File

@ -235,10 +235,14 @@ class _DetailTicketScreenState extends State<DetailTicketScreen> {
text: 'Upload Bukti Pembayaran',
textColor: Colors.white,
onTap: () {
Get.toNamed(Routes.UPLOADFILE, arguments: {
'ticketId': transaction.ticketId,
'transactionId': transaction.id,
});
Get.toNamed(
Routes.UPLOADFILE,
arguments: {
'ticketId': transaction.ticketId,
'transactionId': transaction.id,
'mode': 'history'
},
);
},
),
);
@ -265,12 +269,6 @@ class _DetailTicketScreenState extends State<DetailTicketScreen> {
onTap: () async {
await Permission.camera.status;
// final argument = {
// 'ticketId': transaction.ticketId,
// 'transactionId': transaction.id,
// };
// Get.toNamed(Routes.SCANQR, arguments: argument);
final result = await Get.toNamed(
Routes.SCANQR,
arguments: {
@ -279,7 +277,6 @@ class _DetailTicketScreenState extends State<DetailTicketScreen> {
},
);
// 2. Jika porter sibuk, tampilkan Snackbar dan hentikan di sini
if (result == 'PORTER_BUSY') {
SnackbarHelper.showError(
'Porter Tidak Tersedia',
@ -353,8 +350,11 @@ class _DetailTicketScreenState extends State<DetailTicketScreen> {
typeId: passenger['typeId'] ?? '',
noId: maskedId,
onTap: () {
Get.toNamed(Routes.PRINTBOARDINGPASS,
arguments: {'transaction': transaction, 'passengerIndex': index});
Get.toNamed(Routes.PRINTBOARDINGPASS, arguments: {
'transactionId': transaction.id,
'ticketId': transaction.ticketId,
'passengerIndex': index,
});
},
),
);

31
lib/presentation/screens/home/pages/ticket_booking_step4_screen.dart
View File

@ -1,4 +1,5 @@
import 'dart:developer';
import 'dart:developer' show log;
import 'dart:math' show Random;
import 'package:e_porter/_core/component/card/custome_shadow_cotainner.dart';
import 'package:e_porter/_core/constants/colors.dart';
@ -108,6 +109,14 @@ class _TicketBookingStep4ScreenState extends State<TicketBookingStep4Screen> {
}
}
String _generateBarcodeId() {
const prefix = 'P-';
const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
final rand = Random.secure();
final code = List.generate(10, (index) => chars[rand.nextInt(chars.length)]).join();
return '$prefix$code';
}
String getPorterInfo(String type) {
final porter = selectedPorterServices[type];
if (porter != null) {
@ -316,7 +325,6 @@ class _TicketBookingStep4ScreenState extends State<TicketBookingStep4Screen> {
});
}
// Persiapkan data user
final userDetailData = {
'uid': userData.uid,
'name': userData.name,
@ -326,14 +334,17 @@ class _TicketBookingStep4ScreenState extends State<TicketBookingStep4Screen> {
final List<Map<String, dynamic>> passengerDetailsList = [];
for (var passenger in selectedPassengers) {
if (passenger != null) {
passengerDetailsList.add({
'name': passenger.name,
'typeId': passenger.typeId,
'noId': passenger.noId,
'gender': passenger.gender,
});
}
if (passenger == null) continue;
final barcodeId = _generateBarcodeId();
passengerDetailsList.add({
'name': passenger.name,
'typeId': passenger.typeId,
'noId': passenger.noId,
'gender': passenger.gender,
'idBarcode': barcodeId,
});
}
// Buat transaksi

149
lib/presentation/screens/home/pages/upload_file_screen.dart
View File

@ -4,6 +4,7 @@ import 'package:e_porter/_core/component/button/button_outline.dart';
import 'package:e_porter/_core/constants/colors.dart';
import 'package:e_porter/_core/constants/typography.dart';
import 'package:e_porter/_core/service/permission_service.dart';
import 'package:e_porter/presentation/screens/navigation/main_navigation.dart';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -29,11 +30,12 @@ class UploadFileScreen extends StatefulWidget {
class _UploadFileScreenState extends State<UploadFileScreen> {
final List<UploadFileModel> uploadedFiles = [];
final TransactionController _transactionController = Get.find<TransactionController>();
bool isUploading = false;
final isUploading = false.obs;
late String ticketId;
late String transactionId;
late String userId = '';
late final bool isHistoryMode;
@override
void initState() {
@ -41,8 +43,11 @@ class _UploadFileScreenState extends State<UploadFileScreen> {
final args = Get.arguments as Map<String, dynamic>;
ticketId = args['ticketId'] ?? '';
transactionId = args['transactionId'] ?? '';
isHistoryMode = (args['mode'] == 'history');
_loadUserData();
WidgetsBinding.instance.addPostFrameCallback((_) {
_loadUserData();
});
}
Future<void> _loadUserData() async {
@ -55,31 +60,29 @@ class _UploadFileScreenState extends State<UploadFileScreen> {
}
void _uploadToServer() async {
if (ticketId.isEmpty || transactionId.isEmpty || userId.isEmpty) {
Get.snackbar(
'Error',
'Data transaksi tidak lengkap',
backgroundColor: Colors.red,
colorText: Colors.white,
);
return;
}
if (uploadedFiles.isEmpty || uploadedFiles.first.status != FileUploadStatus.completed) {
Get.snackbar(
'Error',
'Silakan pilih dan selesaikan proses file terlebih dahulu',
backgroundColor: Colors.red,
colorText: Colors.white,
);
return;
}
isUploading.value = true;
try {
if (ticketId.isEmpty || transactionId.isEmpty || userId.isEmpty) {
Get.snackbar(
'Error',
'Data transaksi tidak lengkap',
backgroundColor: Colors.red,
colorText: Colors.white,
);
return;
}
if (uploadedFiles.isEmpty || uploadedFiles.first.status != FileUploadStatus.completed) {
Get.snackbar(
'Error',
'Silakan pilih dan selesaikan proses file terlebih dahulu',
backgroundColor: Colors.red,
colorText: Colors.white,
);
return;
}
setState(() {
isUploading = true;
});
Get.snackbar(
'Info',
'Mengupload bukti pembayaran...',
@ -104,7 +107,14 @@ class _UploadFileScreenState extends State<UploadFileScreen> {
colorText: Colors.white,
);
Get.offAllNamed(Routes.NAVBAR);
if (isHistoryMode) {
Get.offAll(
() => MainNavigation(initialTabIndex: 1),
arguments: 'penumpang',
);
} else {
Get.offAllNamed(Routes.NAVBAR);
}
} catch (e) {
Get.snackbar(
'Error',
@ -113,11 +123,7 @@ class _UploadFileScreenState extends State<UploadFileScreen> {
colorText: Colors.white,
);
} finally {
if (mounted) {
setState(() {
isUploading = false;
});
}
isUploading.value = false;
}
}
@ -189,37 +195,54 @@ class _UploadFileScreenState extends State<UploadFileScreen> {
),
),
),
bottomNavigationBar: CustomeShadowCotainner(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ButtonOutline(
text: 'Nanti',
textColor: PrimaryColors.primary800,
onTap: () {
Get.offAllNamed(Routes.NAVBAR);
},
bottomNavigationBar: Obx(() {
if (isUploading.value) {
return CustomeShadowCotainner(
child: SizedBox(
height: 40.h,
child: Center(
child: CircularProgressIndicator(
color: PrimaryColors.primary800,
),
),
),
SizedBox(height: 10.h),
ButtonFill(
text: 'Upload',
textColor: Colors.white,
onTap: () {
if (uploadedFiles.isNotEmpty) {
_submitFiles();
} else {
Get.snackbar(
'Peringatan',
'Silahkan pilih file terlebih dahulu',
backgroundColor: Colors.red,
colorText: Colors.white,
);
}
},
),
],
),
),
);
}
return CustomeShadowCotainner(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
if (!isHistoryMode) ...[
ButtonOutline(
text: 'Nanti',
textColor: PrimaryColors.primary800,
onTap: () {
Get.offAllNamed(Routes.NAVBAR);
},
),
],
SizedBox(height: 10.h),
ButtonFill(
text: 'Upload',
textColor: Colors.white,
onTap: isUploading.value
? null
: () {
if (uploadedFiles.isNotEmpty) {
_submitFiles();
} else {
Get.snackbar(
'Peringatan',
'Silahkan pilih file terlebih dahulu',
backgroundColor: Colors.red,
colorText: Colors.white,
);
}
}),
],
),
);
}),
);
}
@ -349,7 +372,7 @@ class _UploadFileScreenState extends State<UploadFileScreen> {
try {
FilePickerResult? result = await FilePicker.platform.pickFiles(
type: FileType.custom,
allowedExtensions: ['jpg', 'jpeg', 'png', 'pdf'],
allowedExtensions: ['jpg', 'jpeg', 'png'],
);
if (result != null) {

2
lib/presentation/screens/routes/app_rountes.dart
View File

@ -142,6 +142,7 @@ class AppRoutes {
GetPage(
name: Routes.UPLOADFILE,
page: () => UploadFileScreen(),
binding: TransactionBinding(),
),
GetPage(
name: Routes.TRANSACTIONHISTORY,
@ -150,6 +151,7 @@ class AppRoutes {
GetPage(
name: Routes.DETAILTICKET,
page: () => DetailTicketScreen(),
binding: HistoryBinding(),
),
GetPage(
name: Routes.PRINTBOARDINGPASS,