Commit Graph

160 Commits (0e1d8ab1bbaea61cbbc0fa5867d3e8b80a471f59)

Author SHA1 Message Date
Sikander Saleem 630c1533e7 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/pages/user/requests/create_service_request_page.dart
#	lib/views/widgets/images/multi_image_picker.dart
12 months ago
Sikander Saleem 642d1a908c auto login improvement. 12 months ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 1 year ago
Sikander Saleem 93caf55354 edd and wo frame fields added. 1 year ago
Sikander Saleem 64a2d39cb1 timer picker added and improvements 1 year ago
Sikander Saleem e26db46108 improvements 1 year ago
Sikander Saleem b4587a6347 hide task module & recurrent WO for nurse 1 year ago
Sikander Saleem 84bf5ac399 undo certificate check. 1 year ago
Sikander Saleem 2e4e567f1d certificate issue fixed. 1 year ago
Sikander Saleem 5169894dc4 code restructured and improvements. 1 year ago
Sikander Saleem 36657cd5ca cost added & refactor. 1 year ago
WaseemAbbasi22 02ccdd1f6a ATOMS-856 fixed 1 year ago
WaseemAbbasi22 a42466b578 ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues fixed 1 year ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 1 year ago
Sikander Saleem e0902eddf7 Merge branch 'refs/heads/demo_branch' into design_3.0_tm_module_task_flow
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/extensions/widget_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/views/pages/user/gas_refill/request_gas_refill.dart
#	lib/views/widgets/equipment/asset_picker.dart
1 year ago
WaseemAbbasi22 9edaca4326 task request module flow completed and tested with backend 1 year ago
WaseemAbbasi22 14e55c63e7 create task flow completed 1 year ago
WaseemAbbasi22 54db7c97fc Task Request nurse side ui completed 1 year ago
WaseemAbbasi22 289d06ff68 Asset transfer nurse side ui completed 1 year ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 1 year ago
Sikander Saleem 0a8b3314ce unsafe device added, swipe only added, force update added, 2 years ago
WaseemAbbasi22 a5876ec1d3 swipe module added 2 years ago
WaseemAbbasi22 904f1919d4 all changes implemented 2 years ago
WaseemAbbasi22 78ebf9e60d improvements 2 years ago
WaseemAbbasi22 310ec59917 history log time duration added 2 years ago
muhammad.abbasi e582072a83 improvements 2 years ago
muhammad.abbasi f6b3c82fb3 activity status on sparepart activity and last situation in maintenance request added 2 years ago
muhammad.abbasi 34e54df40d intial testing fixes 2 years ago
muhammad.abbasi c2b3288423 in progress 2 years ago
muhammad.abbasi e8dc052d02 integrating api in new flow 2 years ago
Sikander Saleem 0d876a41fc Merge remote-tracking branch 'refs/remotes/origin/design_3.0_waseem' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/controllers/providers/api/service_requests_provider.dart
#	lib/dashboard_latest/dashboard_view.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/extensions/text_extensions.dart
#	lib/models/lookup.dart
#	lib/new_views/app_style/app_themes.dart
#	lib/new_views/common_widgets/app_bottom_nav_bar.dart
#	lib/new_views/common_widgets/app_dashed_button.dart
#	lib/new_views/common_widgets/app_filled_button.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/new_views/pages/land_page/requests_list_page.dart
#	lib/providers/work_order/reason_provider.dart
#	lib/service_request_latest/views/components/bottom_sheets/action_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/activity_type_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/initial_visit_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/reject_request_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
#	lib/service_request_latest/views/components/request_detail_view.dart
#	lib/service_request_latest/views/components/verify_arrival_view.dart
#	lib/service_request_latest/views/forms/spare_part/spare_part_request.dart
#	lib/utilities/general_utils.dart
#	lib/views/widgets/date_and_time/date_picker.dart
#	lib/views/widgets/date_and_time/time_picker.dart
#	lib/views/widgets/e_signature/e_signature.dart
#	lib/views/widgets/images/multi_image_picker.dart
#	pubspec.yaml
2 years ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 2 years ago
Sikander Saleem be4c8d7653 null safety conversation complete 2 years ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 2 years ago
muhammad.abbasi f257fbadfa new Api models and provider added 2 years ago
nextwo 7ef71849dd comment unused files 2 years ago
Sikander Saleem 8273537b00 create supplier engineer functionality added. 2 years ago
Sikander Saleem 2a53ab8b8e electrical safety, asset availability, task status and ppm service added. 2 years ago
Sikander Saleem 828ae74e48 bug 309, 297, 293 fixed. 3 years ago
Sikander Saleem bddc7ded1f loan availability 3 years ago
Sikander Saleem 58f5fbab5e push notifications added. 3 years ago
Sikander Saleem cbafa20df8 when session ended, show dialog to login. 3 years ago
Sikander Saleem a6dd802321 receiver name added on new transfer request & improvements 3 years ago
Sikander Saleem 88108686d0 sender & receiver transfer fix. 3 years ago
nextwo d3bee4f39a gas refill comments 3 years ago
zaid_daoud 23700d0adf Enhancements on Asset Details Screen (SHOW MODEL NAME & FIX DATES FORMAT) 3 years ago
zaid_daoud 3e3bdf2ce6 Remove loan availability 3 years ago
zaid_daoud 7200efcbca ppm issues fixed & code formatting 3 years ago
Sikander Saleem 593cecbe55 improvements 3 years ago
zaid.daoud 5bf73172f6 Previous Business Logic in Work order & sub work order 3 years ago
zaid_daoud 884471009a Sub work order screen under testing 3 years ago
zaid_daoud dbb26d8cd4 Filter Requests DONE 3 years ago
Sikander Saleem 67a7fcfe54 improvements. 3 years ago
zaid_daoud 37a9cd3cc9 service request comment done 3 years ago
zaid_daoud 1ccb8cdcb4 Help Center Screen 3 years ago
zaid_daoud 675572be40 Profile Screen DONE 3 years ago
zaid_daoud 8226cd3702 Settings Screen DONE 3 years ago
zaid_daoud 932841cbef PPM Done 3 years ago
zaid_daoud 8541fce08f PPM in progress 3 years ago
zaid_daoud 3464666485 PPM TBS DONE 3 years ago
zaid_daoud 18d0bdbd60 Fix Service Details Design 3 years ago
zaid_daoud c281fba1ac Enhancements 3 years ago
zaid_daoud e407b00630 New Work Order [In Progress] 3 years ago
zaid_daoud 402f7513bd First Action Bottom Sheet Done 3 years ago
zaid_daoud ee16e35485 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 3 years ago
zaid_daoud fb3f442ed5 asset search done & filter assets need to be discussed 3 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
3 years ago
nextwo 4cc12691ac gas refill 3 years ago
zaid_daoud 957e3d9e6f Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
3 years ago
zaid_daoud 3959068858 Asset Transfer Done + Multiple Image Picker + Enhancements 3 years ago
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 3 years ago
zaid_daoud e419b17bd1 Service request design done 3 years ago
Sikander Saleem 2d553b56e0 service request detail ui changed. 3 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
3 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 3 years ago
zaid_daoud c7d6b68fd2 Change Asset & Asset Transfer models 3 years ago
Sikander Saleem df4a9a4887 revert code for existing functionality 3 years ago
zaid_daoud b77a36ac50 Gas refill screen 3 years ago
zaid_daoud b1e93abf4d Gas refill design without submit button 3 years ago
zaid_daoud ed759f5dcf Still working on gas refill request 3 years ago
zaid_daoud bb1a516f0a add the old route 3 years ago
zaid_daoud 1db543710e Working on gas request screen 3 years ago
zaid_daoud 3bdae42769 1- change text form field code
2- app bar design
3- working on request gas refill screen
3 years ago
zaid_daoud 8e315d54d0 Default App Bar 3 years ago
zaid_daoud 42deeeb104 new service request page 3 years ago
zaid_daoud 0513fe1bc0 Fix Home App Bar 3 years ago
zaid_daoud dd524bcbd1 Merged with Majd 3 years ago
nextwo e20f3b5433 app bar
nav bar
3 years ago
zaid_daoud 05398a9f76 Enhancement 3 years ago
zaid_daoud a8a7b5a613 Activate light and dark theme 3 years ago
zaid_daoud ca673787f1 1 -> New Way of Localizations
2 -> Implementing Login Page
3 -> New way to achieve responsive design
3 years ago
zaid_daoud 3b3de831f0 Preparing new style (theme & colors) 3 years ago
Sikander Saleem 1eaf9a21fa asset transfer status fixed. 3 years ago
zaid_daoud 5aedb12004 Vendor Fields Have Been Added 3 years ago
zaid_daoud ffaa340d9d Enhancements 3 years ago
zaid_daoud d13bfa5f60 Wo Details Bottom Sheet & Spare Parts Bottom Sheet Design Done
[without activating update buttons]
3 years ago
zaid_daoud 27d3a74d3b Search Sub Work Order Screen DONE 3 years ago
Sikander Saleem 13c5b3891a equipment status added. 3 years ago
zaid_daoud 655f96049c Fault Description Became a Dropdown Menu 3 years ago
zaid_daoud 5945756e60 New Work Order Done (Unable to upload Engineer Signature) 3 years ago