Haroon6138
/
hmg-mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates & fixes

Browse Source
faiz_marathon_signalR_critical
haroon amjad 2 years ago
parent e0088a515b
commit 1119fa1640
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
lib/ui/attendance/monthly_attendance_screen.dart
Unescape Escape View File

@ -16,7 +16,7 @@ import 'package:mohem_flutter_app/models/get_schedule_shifts_details_list_model.
import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart'; import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:mohem_flutter_app/widgets/circular_step_progress_bar.dart'; import 'package:mohem_flutter_app/widgets/circular_step_progress_bar.dart';
import 'package:month_picker_dialog/month_picker_dialog.dart'; import 'package:month_picker_dialog_2/month_picker_dialog_2.dart';
import 'package:pie_chart/pie_chart.dart'; import 'package:pie_chart/pie_chart.dart';
import 'package:syncfusion_flutter_calendar/calendar.dart'; import 'package:syncfusion_flutter_calendar/calendar.dart';

2
lib/ui/my_team/view_attendance.dart
Unescape Escape View File

@ -12,7 +12,7 @@ import 'package:mohem_flutter_app/models/get_day_hours_type_details_list_model.d
import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart'; import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart';
import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart'; import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:month_picker_dialog/month_picker_dialog.dart'; import 'package:month_picker_dialog_2/month_picker_dialog_2.dart';
import 'package:pie_chart/pie_chart.dart'; import 'package:pie_chart/pie_chart.dart';
import 'package:syncfusion_flutter_calendar/calendar.dart'; import 'package:syncfusion_flutter_calendar/calendar.dart';

3
lib/ui/work_list/sheets/delegate_sheet.dart
Unescape Escape View File

@ -200,7 +200,8 @@ class _DelegateSheetState extends State<DelegateSheet> {
), ),
), ),
if (isNeedEnableTextField) if (isNeedEnableTextField)
FlatButton( //Todo: Button to be fixed
TextButton(
onPressed: () { onPressed: () {
fetchUserByInput(); fetchUserByInput();
}, },

15
lib/widgets/nfc/nfc_reader_sheet.dart
Unescape Escape View File

@ -88,18 +88,20 @@ class _NfcLayoutState extends State<NfcLayout> {
"assets/icons/nfc/ic_nfc.png", "assets/icons/nfc/ic_nfc.png",
height: MediaQuery.of(context).size.width / 3, height: MediaQuery.of(context).size.width / 3,
), ),
SizedBox( const SizedBox(
height: 30, height: 30,
), ),
Text( const Text(
"Approach an NFC Tag", "Approach an NFC Tag",
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
), ),
), ),
SizedBox( const SizedBox(
height: 30, height: 30,
), ),
//Todo: Button to be fixed
ButtonTheme( ButtonTheme(
minWidth: MediaQuery.of(context).size.width / 1.2, minWidth: MediaQuery.of(context).size.width / 1.2,
height: 45.0, height: 45.0,
@ -107,12 +109,11 @@ class _NfcLayoutState extends State<NfcLayout> {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
), ),
child: RaisedButton( child: TextButton(
onPressed: () { onPressed: () {
NfcManager.instance.stopSession(); NfcManager.instance.stopSession();
Navigator.pop(context); Navigator.pop(context);
}, },
elevation: 0,
child: Text("CANCEL"), child: Text("CANCEL"),
), ),
), ),
@ -159,6 +160,7 @@ class _NfcLayoutState extends State<NfcLayout> {
SizedBox( SizedBox(
height: 30, height: 30,
), ),
//Todo: Button to be fixed
ButtonTheme( ButtonTheme(
minWidth: MediaQuery.of(context).size.width / 1.2, minWidth: MediaQuery.of(context).size.width / 1.2,
height: 45.0, height: 45.0,
@ -166,14 +168,13 @@ class _NfcLayoutState extends State<NfcLayout> {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
), ),
child: RaisedButton( child: TextButton(
// onPressed: () { // onPressed: () {
// _stream?.cancel(); // _stream?.cancel();
// widget.onNcfScan(nfcId); // widget.onNcfScan(nfcId);
// Navigator.pop(context); // Navigator.pop(context);
// }, // },
onPressed: null, onPressed: null,
elevation: 0,
child: Text("DONE"), child: Text("DONE"),
), ),
), ),

5
pubspec.yaml
Unescape Escape View File

@ -52,7 +52,7 @@ dependencies:
shimmer: ^2.0.0 shimmer: ^2.0.0
logger: ^1.1.0 logger: ^1.1.0
flutter_countdown_timer: ^4.1.0 flutter_countdown_timer: ^4.1.0
nfc_manager: ^3.1.1 nfc_manager: ^3.2.0
uuid: ^3.0.6 uuid: ^3.0.6
image_picker: ^0.8.5+3 image_picker: ^0.8.5+3
file_picker: ^4.6.1 file_picker: ^4.6.1
@ -64,7 +64,8 @@ dependencies:
# flutter_compass: ^0.6.1 # flutter_compass: ^0.6.1
google_maps_flutter_web: ^0.3.2 google_maps_flutter_web: ^0.3.2
month_year_picker: ^0.2.0+1 month_year_picker: ^0.2.0+1
month_picker_dialog: ^0.4.0 # month_picker_dialog: ^0.4.0
month_picker_dialog_2: 0.5.5
open_file: ^3.2.1 open_file: ^3.2.1
wifi_iot: ^0.3.16 wifi_iot: ^0.3.16
flutter_html: ^2.2.1 flutter_html: ^2.2.1

Write Preview
Loading…
Cancel
Save