diff --git a/lib/functions/get_api.dart b/lib/functions/get_api.dart index 139d47e..025b349 100644 --- a/lib/functions/get_api.dart +++ b/lib/functions/get_api.dart @@ -1,4 +1,5 @@ import 'dart:convert'; +import 'dart:developer'; import 'package:dio/dio.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:dio_smart_retry/dio_smart_retry.dart'; diff --git a/lib/main.dart b/lib/main.dart index 645369c..ca91559 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:go_router/go_router.dart'; -import 'package:ocbo_esign_mobile/blocs/qr/qr_bloc.dart'; import 'package:ocbo_esign_mobile/blocs/user/user_bloc.dart'; import 'package:ocbo_esign_mobile/pages/approval_page.dart'; import 'package:ocbo_esign_mobile/pages/index_page.dart'; @@ -76,10 +75,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MultiBlocProvider( - providers: [ - BlocProvider(create: (context) => UserBloc()), - BlocProvider(create: (context) => QrBloc()), - ], + providers: [BlocProvider(create: (context) => UserBloc())], child: MaterialApp.router( debugShowCheckedModeBanner: false, theme: ThemeData(useMaterial3: true), diff --git a/lib/pages/validate_detail_page.dart b/lib/pages/validate_detail_page.dart index c69b0dd..feffb12 100644 --- a/lib/pages/validate_detail_page.dart +++ b/lib/pages/validate_detail_page.dart @@ -7,7 +7,6 @@ import 'package:ocbo_esign_mobile/functions/get_api.dart'; import 'package:ocbo_esign_mobile/widgets/box_widget.dart'; import 'package:ocbo_esign_mobile/widgets/input_widget.dart'; import 'package:ocbo_esign_mobile/widgets/text_widget.dart'; -import 'package:intl/intl.dart'; class ValidateDetailPage extends StatefulWidget { const ValidateDetailPage({super.key}); @@ -18,21 +17,18 @@ class ValidateDetailPage extends StatefulWidget { class _ValidateDetailPageState extends State { final _searchController = TextEditingController(); - late int _total = 0; - final NumberFormat formatter = NumberFormat('#,###.##'); + late double _total = 0; void _getTotalSigned() async { final name = await blocGetQr(context); - final responseCount = await getApi('get-transactions-count', name, null); - final total = responseCount['result']; + final response = await getApi('get-transactions-count', name, null); + log(name.toString()); + log(response.toString()); + final total = response['result']; setState(() { - _total = double.parse(total).toInt(); + _total = double.parse(total); }); - - final response = await getApi('get-transactions', name, null); - final applicationNoList = response['result']; - final dateList = response['result2']; } @override @@ -76,7 +72,7 @@ class _ValidateDetailPageState extends State { children: [ Column( children: [ - TextWidget(text: formatter.format(_total), size: 64, bold: true), + TextWidget(text: _total.toString(), size: 64, bold: true), TextWidget(text: 'Total Signed Applications', size: 16), ], ), diff --git a/lib/pages/validate_page.dart b/lib/pages/validate_page.dart index a704202..d0ac073 100644 --- a/lib/pages/validate_page.dart +++ b/lib/pages/validate_page.dart @@ -69,6 +69,7 @@ class _BarcodeScannerScreenState extends State { final qr = value.substring(35); final response = await getApi('check-qr', qr, null); final result = response["result"]?.toString(); + log('result: $result'); if (result != null) { setState(() { @@ -102,7 +103,8 @@ class _BarcodeScannerScreenState extends State { await blocSetQr(context, qrResult); } - void gotoDetails() { + void gotoDetails() async { + log('qr $qrResult'); updateBlockQr(); context.push('/details'); } diff --git a/pubspec.lock b/pubspec.lock index 3523d5a..2994471 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: bloc - sha256: a48653a82055a900b88cd35f92429f068c5a8057ae9b136d197b3d56c57efb81 + sha256: a2cebb899f91d36eeeaa55c7b20b5915db5a9df1b8fd4a3c9c825e22e474537d url: "https://pub.dev" source: hosted - version: "9.2.0" + version: "9.1.0" boolean_selector: dependency: transitive description: @@ -304,14 +304,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" - intl: - dependency: "direct main" - description: - name: intl - sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" - url: "https://pub.dev" - source: hosted - version: "0.20.2" json_annotation: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 85df586..293276b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -22,7 +22,6 @@ dependencies: hashlib: ^2.2.0 flutter_bloc: ^9.1.1 vibration: ^3.1.4 - intl: ^0.20.2 dev_dependencies: flutter_test: