Commit Graph

419 Commits (2ebf36ca2f5dd5687ed3739bdf0aa0530922e336)

Author SHA1 Message Date
nextwo 8f11ef577e gas refill 2 years ago
nextwo 64b249a0cd gas refill 2 years ago
Sikander Saleem ec4d4a9193 merge conflict resolved. 2 years ago
Sikander Saleem eaa9bb62ee Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	assets/translations/ar.json
#	lib/views/widgets/equipment/pick_asset.dart
2 years ago
Sikander Saleem 1ee58eeed9 merge conflict resolved. 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
zaid_daoud 937c30736e test 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
Sikander Saleem c8e3f2df48 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 392182e234 track service request cont. 2 years ago
zaid_daoud 4bffab9c9b Request Gas refill screen Done 2 years ago
Sikander Saleem 150ad60de6 track service request 2 years ago
Sikander Saleem df4a9a4887 revert code for existing functionality 2 years ago
zaid_daoud b673cd8a2b Gas refill screen 2 years ago
zaid_daoud c66acbd1ee Gas refill screen 2 years ago
zaid_daoud b77a36ac50 Gas refill screen 2 years ago
zaid_daoud b1e93abf4d Gas refill design without submit button 2 years ago
zaid_daoud ed759f5dcf Still working on gas refill request 2 years ago
zaid_daoud 085674ee18 adding radio buttons for theme 2 years ago
zaid_daoud bb1a516f0a add the old route 2 years ago
zaid_daoud a8e7d26355 Back to the old dashboard 2 years ago
zaid_daoud 651477ec0d Improvements 2 years ago
zaid_daoud decd48cdd2 Improvements 2 years ago
Sikander Saleem 3df1bf70ca improvements 2 years ago
zaid_daoud 683ff899c2 Improvements on login_page.dart 2 years ago
zaid_daoud e49399de45 Improvements on login_page.dart 2 years ago
zaid_daoud 1db543710e Working on gas request screen 2 years ago
zaid_daoud 3bdae42769 1- change text form field code
2- app bar design
3- working on request gas refill screen
2 years ago
zaid_daoud 5ded8e4386 Enhancements 2 years ago
zaid_daoud 9c25b6d2e0 Add Submit Button To the new requests screens 2 years ago
zaid_daoud 8e315d54d0 Default App Bar 2 years ago
zaid_daoud 42deeeb104 new service request page 2 years ago
zaid_daoud 1f4fbee83b floating button animation 2 years ago
zaid_daoud 5bfd6924e1 text form field alignment 2 years ago
zaid_daoud 83980f9b0c Add Language Switch to the drawer 2 years ago
zaid_daoud 22e3067d05 Floating button theme 2 years ago
zaid_daoud 95eac4b196 Call Us bottomsheet 2 years ago
zaid_daoud ebb7c114a2 Dashboard Name 2 years ago
zaid_daoud a0373de566 Fix Home App Bar 2 years ago
zaid_daoud 0513fe1bc0 Fix Home App Bar 2 years ago
zaid_daoud 905e430549 Enhancements 2 years ago
zaid_daoud 06152bee2f Fix Bottom Nav Bar Style 2 years ago
zaid_daoud c10cb10fe0 Merged with Majd 2 years ago
nextwo b0992da201 app bar
nav bar
2 years ago
zaid_daoud dd524bcbd1 Merged with Majd 2 years ago
nextwo e20f3b5433 app bar
nav bar
2 years ago
zaid_daoud 05398a9f76 Enhancement 2 years ago
zaid_daoud a8a7b5a613 Activate light and dark theme 2 years ago
zaid_daoud 5a645f13c0 class renaming 2 years ago
zaid_daoud ca673787f1 1 -> New Way of Localizations
2 -> Implementing Login Page
3 -> New way to achieve responsive design
2 years ago
zaid_daoud 3b3de831f0 Preparing new style (theme & colors) 2 years ago
zaid_daoud 6ef281d604 Add New Views Folder 2 years ago
Sikander Saleem f0c605b07d improvements 2 years ago
Sikander Saleem 71ccd100b5 Merge branch 'zaid_development_new' into sikander-development
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 years ago
zaid_daoud 630a4e1b9d Add (mr number) field to the WO details bottom sheet 2 years ago
zaid_daoud 2d0c72b138 1- prevent the user from creating a new gas refill request if the department isn't selected.
2- working on host: https://atomsmdev.hmg.com
2 years ago
Sikander Saleem 088e980b18 Merge branch 'zaid_development_new' into sikander-development 2 years ago
zaid_daoud d1d83bb614 Fixing sub work order issue 2 years ago
Sikander Saleem 00ba893bf2 fixes. 2 years ago
Sikander Saleem 5fc2aceecf ppm disable edit on closed, gaz refill site fix, & print statements remove. 2 years ago
Sikander Saleem 09f2ae32eb improvements 2 years ago
zaid_daoud 253ce67deb Fixing sub work order issue 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
zaid_daoud 5c14375d6f Fixing PPM issues 2 years ago
zaid_daoud 50c551705f Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new 2 years ago
nextwo 91be46db22 confirm the call last situation has a part in some cases
add time in date picker, when first action is need a visit
disable update, edit workorder & create work order if status is a complete or closed
2 years ago
zaid_daoud 1c9101d8ab Fix pm entry empty values when scroll 2 years ago
zaid_daoud 3e314447c6 Fix building, floor, room issue when edit sender or receiver 2 years ago
nextwo a85ea2d799 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo 7d37d66e62 fix bugs 2 years ago
zaid_daoud a26684de11 Device Status in PM Entry 2 years ago
Sikander Saleem 300bc0a1a6 improvements 2 years ago
Sikander Saleem dc983f0db4 Merge branch 'zaid_development_new' into sikander-development 2 years ago
zaid_daoud ea5738f705 Gas refill update reflected on the details screen 2 years ago
zaid_daoud fe1885b367 Fix asset destination issue 2 years ago
zaid_daoud f1bb4117e2 Add asset floor and room to create asset transfer screen 2 years ago
zaid_daoud 05d3b7dd5d department name shown in the gas refill details screen & the delivered quantity is reflected on the details screen 2 years ago
zaid_daoud 0dd9400c91 Sorting gaz refill using mostRecent key 2 years ago
Sikander Saleem 6e0ff34499 improvements 2 years ago
zaid_daoud 58c5b434e2 Fault Desc Issue Fixed 2 years ago
nextwo 8df2900254 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo 350ea3f9e7 fix bugs 2 years ago
zaid_daoud 2384bab11f Fault Desc Issue Fixed 2 years ago
Sikander Saleem d63a18226a ppm attachments fix 2 years ago
zaid_daoud a9d4d2a373 Enhancements 2 years ago
zaid_daoud a41944e78a Enhancements 2 years ago
zaid_daoud dc2dab5869 Multiple Images Everywhere 2 years ago
zaid_daoud 0950639c22 Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new 2 years ago
zaid_daoud fe9ca387ed Multiple Images Everywhere 2 years ago
Sikander Saleem 830bf6e5e6 first action improvement. 2 years ago
Sikander Saleem bf30e1d763 update service request attachment fixed. 2 years ago
Sikander Saleem da339c68f4 Merge branch 'zaid_development_new' into sikander-development 2 years ago
Sikander Saleem c9705e0b74 attachments improvements. 2 years ago
zaid_daoud 6d6fc30806 Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new 2 years ago
zaid_daoud 7d68d1db51 Fix 2 years ago
zaid_daoud f5820a93c7 Enhancement 2 years ago
zaid_daoud 8c018158ae Vendors Will Be Visible If Previous Data API contains data 2 years ago
Sikander Saleem 8624515433 local & network files opener added. 2 years ago