Commit Graph

64 Commits (4c88dce72c0e9f08d2c459bca3c1ae9ecc2bacfb)

Author SHA1 Message Date
WaseemAbbasi22 8ae51480f9 added nurse signature for device transfer request and tested on uat 5 months ago
WaseemAbbasi22 56c70671d8 add contact and created by information for asset transfer and gasrefill request 6 months ago
WaseemAbbasi22 06acdb184f Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
#	lib/views/pages/device_transfer/update_device_transfer.dart
6 months ago
Sikander Saleem 5169894dc4 code restructured and improvements. 6 months ago
WaseemAbbasi22 0b97ffe296 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
Sikander Saleem 36657cd5ca cost added & refactor. 6 months ago
WaseemAbbasi22 4698a3325e add validation for assistant employee start and end date 6 months ago
WaseemAbbasi22 6004ed1a27 ATOMS-820 fixed 6 months ago
WaseemAbbasi22 b577343353 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
WaseemAbbasi22 824f46b0e3 ATOMS-823, ATOMS-825, ATOMS-782, ATOMS-784, ATOMS-807, issues fixed 6 months ago
Sikander Saleem 50fb07b504 on back confirmation dialog added on gas refill, task and asset transfer 6 months 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 6 months ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 6 months ago
Sikander Saleem f50ede8321 Merge remote-tracking branch 'origin/demo_branch' into demo_branch
# Conflicts:
#	lib/views/pages/user/gas_refill/gas_refill_form.dart
7 months ago
WaseemAbbasi22 71ee34c658 gas refill attachment and device transfer assistant employee issue fixes 7 months ago
Sikander Saleem b34014e24f sender and receiver comment fixed 7 months ago
WaseemAbbasi22 b592e114bc gas refill attachment issue fixed 7 months ago
WaseemAbbasi22 be8c83cc8f Asset tranfer api integrated ready to test 8 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 8 months ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 1 year ago
Sikander Saleem be4c8d7653 null safety conversation complete 1 year ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 1 year ago
nextwo b792585810 add timer list in asset transfer for sender and receiver 1 year ago
nextwo 67854d2e8c add timer list in asset transfer for sender and receiver 1 year ago
Sikander Saleem caa1f975ab ppm timer & receiver name fixed. 2 years ago
Sikander Saleem 668333dd15 timer issue fix on receiver engineer. 2 years ago
Sikander Saleem 26b82fbda0 attachment added on transfer request. 2 years ago
Sikander Saleem cda5b5cbe5 ppm request no & report status changed 2 years ago
Sikander Saleem 162ebd38be gas & transfer request status on open improvement. 2 years ago
Sikander Saleem 88108686d0 sender & receiver transfer fix. 2 years ago
Sikander Saleem 8079646728 timer on device transfer, 2 years ago
zaid_daoud a403fb0028 Device Transfer Issued Fixed For Sender & Receiver 2 years ago
Sikander Saleem 09f24edb35 eSignature fixed, 2 years ago
nextwo 0a699fe33b Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 884471009a Sub work order screen under testing 2 years ago
nextwo b295256d66 When log out, it keeps loading ,
On asset transfer, on complete & close , dont show edit button,
Signature issue on update asset.
On calendar weekly swipe data calling issue.
Also on monthly
2 years ago
nextwo 4757c73737 dark / ligth dark 2 years ago
zaid_daoud a2e2d9ac12 Timer For Working Hours 2 years ago
nextwo 9c43eab5db device transfer 2 years ago
nextwo 57abce1b75 device transfer 2 years ago
nextwo 62f6f135bb device transfer 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
zaid_daoud 1e1ac215ea Rename asset to be device as it was before 2 years ago
zaid_daoud c7d6b68fd2 Change Asset & Asset Transfer models 2 years ago
zaid_daoud 9dca070121 add asset id to spare parts API
add attachments and signature to the sender & receiver info
2 years ago
Sikander Saleem 1eaf9a21fa asset transfer status fixed. 2 years ago
Sikander Saleem 07c8acf3a3 improvement 2 years ago
zaid_daoud 6caab58171 Merge With Majd [part #2] 2 years ago
nextwo be636bb18b some changes 2 years ago