Commit Graph

88 Commits (affb486fbd441d671c25f6db99c8d207614a29e7)

Author SHA1 Message Date
zaid_daoud affb486fbd Calendar API done 2 years ago
Sikander Saleem 29d83101af statuses & date added. 2 years ago
Sikander Saleem 66034a6424 improvements 2 years ago
Sikander Saleem 2c8af84814 dashboard progress view improvements 2 years ago
Sikander Saleem 89bcb20314 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart
2 years ago
Sikander Saleem 17e62a1671 dashboard progress view added. 2 years ago
zaid_daoud 7fcf49df5c Improvements 2 years ago
Sikander Saleem ff80897a3c dashboard apis added. 2 years ago
Sikander Saleem 8a097a1ed6 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo 7666364083 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
2 years ago
nextwo 4ec0b27afa loclization 2 years ago
Sikander Saleem 67a7fcfe54 improvements. 2 years ago
zaid_daoud d908fe1c9d Weekly Calendar Design 2 years ago
zaid_daoud 3af18cb884 Working On Calendar 2 years ago
Sikander Saleem c93e249519 improvement. 2 years ago
Sikander Saleem ba1b0ded40 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
#	lib/new_views/common_widgets/app_bottom_nav_bar.dart
#	lib/new_views/pages/land_page/land_page.dart
#	pubspec.yaml
2 years ago
zaid_daoud 9f0de18ea6 Working On Calendar 2 years ago
zaid_daoud 1091af7f23 Working On Calendar 2 years ago
Sikander Saleem 49377d2418 calender cont. 2 years ago
zaid_daoud 456dc4bd77 Testing Dashboard Chart 2 years ago
Sikander Saleem 63cbbe48d1 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem e3fbcae6d3 recent activities added. 2 years ago
Sikander Saleem fe624596a1 request fragment added on dashboard. 2 years ago
zaid_daoud ce143947d1 Survey Screen Needs APIs to be DONE 2 years ago
zaid_daoud 1ccb8cdcb4 Help Center Screen 2 years ago
zaid_daoud 675572be40 Profile Screen DONE 2 years ago
zaid_daoud 8226cd3702 Settings Screen DONE 2 years ago
Sikander Saleem 2c9f2dce08 notifications api added. 2 years ago
Sikander Saleem 258fb2c333 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/views/widgets/pentry/pentry_ppm_check_list_form.dart
2 years ago
zaid_daoud 932841cbef PPM Done 2 years ago
Sikander Saleem fd18e5d39c dashboard cont 2 years ago
zaid_daoud 402f7513bd First Action Bottom Sheet Done 2 years ago
zaid_daoud 6258035a88 add room field to asset transfer 2 years ago
nextwo 985ab01bf0 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 5cf84e6988 Change device class name to asset 2 years ago
nextwo e21bde0153 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
2 years ago
nextwo 4cc12691ac gas refill 2 years ago
zaid_daoud 957e3d9e6f Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
2 years ago
zaid_daoud 3959068858 Asset Transfer Done + Multiple Image Picker + Enhancements 2 years ago
nextwo d6de203ba0 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 487b04514a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/views/widgets/equipment/single_device_picker.dart
2 years ago
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 2 years ago
nextwo 2604d8b253 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	pubspec.yaml
2 years ago
zaid_daoud 5b1e067a93 Pick asset screen design 2 years ago
zaid_daoud e419b17bd1 Service request design done 2 years ago
Sikander Saleem 2d553b56e0 service request detail ui changed. 2 years ago
nextwo 8f11ef577e gas refill 2 years ago
nextwo 64b249a0cd gas refill 2 years ago
Sikander Saleem 47b863c479 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/main.dart
#	lib/new_views/common_widgets/app_floating_action_button.dart
#	lib/new_views/common_widgets/app_text_form_field.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/new_views/pages/new_service_request_page.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
#	lib/views/pages/user/requests/create_request.dart
#	lib/views/pages/user/requests/request_details.dart
#	lib/views/widgets/device_trancfer/device_transfer_info_section.dart
#	lib/views/widgets/device_trancfer/device_transfer_item.dart
#	lib/views/widgets/device_trancfer/device_transfer_list.dart
#	lib/views/widgets/equipment/auto_complete_devices_field.dart
#	lib/views/widgets/equipment/auto_complete_models_field.dart
#	lib/views/widgets/equipment/device_button.dart
#	lib/views/widgets/equipment/device_item.dart
#	lib/views/widgets/equipment/single_device_picker.dart
#	lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
#	lib/views/widgets/requests/service_request_item.dart
#	lib/views/widgets/search/asset_transfer_search_dialog.dart
2 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 2 years ago