Commit Graph

445 Commits (bbbd63d150aac8bd970a70db1f74cf0c83e72d41)

Author SHA1 Message Date
nextwo fe4b071efb Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/new_views/pages/land_page/requests/asset_item_view.dart
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
Sikander Saleem a602dbe2eb Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 29e414a703 user profile change added & improvements. 2 years ago
zaid_daoud cd3d9e1455 Working on create sub work order screen 2 years ago
zaid_daoud f07a70462a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 15c98e873e Enhancement 2 years ago
Sikander Saleem 708e7c80d1 improvements. 2 years ago
nextwo ee7665930e dark / ligth dark & localization 2 years ago
Sikander Saleem ecacd2ec8f request list added on my requests. 2 years ago
Sikander Saleem ab83963c65 improvements 2 years ago
Sikander Saleem f8ba08a44b ppm flow added. 2 years ago
Sikander Saleem 7ecd90a556 gas refill flow added. 2 years ago
Sikander Saleem c96f611051 service request flow added & improvements 2 years ago
zaid_daoud e29946e280 Search All Requests Done 2 years ago
Sikander Saleem 18e4bf8503 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 34bae463b6 improvements. 2 years ago
zaid_daoud 19ba1f9ad0 Enhancement 2 years ago
Sikander Saleem f519841c04 improvements. 2 years ago
Sikander Saleem b51555c2f4 improvements. 2 years ago
nextwo 4be031e8f8 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart
#	lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart
#	lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart
2 years ago
nextwo 4757c73737 dark / ligth dark 2 years ago
Sikander Saleem 29d83101af statuses & date added. 2 years ago
nextwo 204305f705 dark / ligth dark 2 years ago
zaid_daoud a024185229 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 753d9577d5 Improvements 2 years ago
Sikander Saleem 66034a6424 improvements 2 years ago
zaid_daoud 9ce5ca2f09 Improvements 2 years ago
zaid_daoud 7fcf49df5c Improvements 2 years ago
zaid_daoud eb8a9cc971 Improvements 2 years ago
Sikander Saleem ff80897a3c dashboard apis added. 2 years ago
nextwo 4ec0b27afa loclization 2 years ago
Sikander Saleem 63cbbe48d1 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem fe624596a1 request fragment added on dashboard. 2 years ago
zaid_daoud fc4bfca61b Fix preventive maintenance status colors 2 years ago
zaid_daoud 649ddf6c01 Fix preventive maintenance status colors 2 years ago
zaid_daoud a5393b5a85 Fix loading issue in comments bottom sheet 2 years ago
zaid_daoud 37a9cd3cc9 service request comment done 2 years ago
zaid_daoud 675572be40 Profile Screen DONE 2 years ago
zaid_daoud 5e1d6517de Change Notifications Screen Design DONE 2 years ago
Sikander Saleem b03f350a2c Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 2c9f2dce08 notifications api added. 2 years ago
zaid_daoud a2e2d9ac12 Timer For Working Hours 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
zaid_daoud 8541fce08f PPM in progress 2 years ago
zaid_daoud 2ebf36ca2f Calibration Tool & PM Kit Design DONE 2 years ago
Sikander Saleem fd18e5d39c dashboard cont 2 years ago
zaid_daoud 3464666485 PPM TBS DONE 2 years ago
zaid_daoud 3299c0c7a4 Working on ppm 2 years ago
Sikander Saleem f4afe5ca5a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 3c91abf47d Enhancement on Signature 2 years ago
nextwo 9c43eab5db device transfer 2 years ago
nextwo a85d8f4880 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 57abce1b75 device transfer 2 years ago
zaid_daoud 8b63cee7c5 Update Work Order Screen DONE 2 years ago
zaid_daoud daa427bac2 Update Work Order Screen DONE 2 years ago
zaid_daoud c3d6643ead Enhancements 2 years ago
zaid_daoud 8b7aa8235d Update Service Request DONE 2 years ago
Sikander Saleem 8347afec6d Merge branch 'main_latest_merged' into main_design2.0
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart
#	lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
#	lib/views/widgets/status/report/service_report_assistant_employee_menu.dart
2 years ago
Sikander Saleem 98c68bfbf0 search work order by assigned employee fixed. 2 years ago
zaid_daoud 18d0bdbd60 Fix Service Details Design 2 years ago
Sikander Saleem c9f903fac8 urgent improvements. 2 years ago
zaid_daoud 477e6751aa Enhancements 2 years ago
zaid_daoud 19845bd9d8 Enhancements 2 years ago
zaid_daoud c281fba1ac Enhancements 2 years ago
zaid_daoud 73d090cb9e Edit wo only for eng 2 years ago
zaid_daoud 7a06f251be Create New Work Order Done 2 years ago
zaid_daoud 743bb28b1d Create New Work Order Done 2 years ago
nextwo 1daf9b4437 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo 62f6f135bb device transfer 2 years ago
zaid_daoud 43b2f18a1a New Work Order [In Progress] 2 years ago
zaid_daoud e407b00630 New Work Order [In Progress] 2 years ago
zaid_daoud 402f7513bd First Action Bottom Sheet Done 2 years ago
zaid_daoud 32e54d6853 add [pm date range] & [equipment status] to asset filter 2 years ago
zaid_daoud 6258035a88 add room field to asset transfer 2 years ago
zaid_daoud ee16e35485 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud fb3f442ed5 asset search done & filter assets need to be discussed 2 years ago
nextwo 985ab01bf0 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo cef6b1a77c gas refill 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
zaid_daoud 35b67d2cb5 _ 2 years ago
zaid_daoud 0c6f4d5156 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/views/widgets/sound/sound_player.dart
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
Sikander Saleem c49b66a401 sound player color fix. 2 years ago
zaid_daoud 7d2afa23cc add record player to the recorder 2 years ago
zaid_daoud 84c9efda5a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
2 years ago
zaid_daoud e419b17bd1 Service request design done 2 years ago
Sikander Saleem 0e30fef10c work order list ui changed. 2 years ago
Sikander Saleem 0170c6f5cb service request status color improvement. 2 years ago
Sikander Saleem 2d553b56e0 service request detail ui changed. 2 years ago
nextwo 8f11ef577e gas refill 2 years ago