Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								47673e3473
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
							
							
							
							
							
							
							
							# Conflicts:
#	lib/modules/cm_module/views/components/action_button/footer_action_button.dart
#	lib/modules/cm_module/views/components/service_request_detail_view.dart
#	lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
#	lib/modules/tm_module/tasks_wo/update_task_request_view.dart
#	lib/views/pages/user/gas_refill/update_gas_refill_request.dart
#	lib/views/widgets/images/multi_image_picker.dart 
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								6d39b20e0b
								
							
								
							
						 | 
						
							
							
								
								dark mode implementation
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ca1ff5892e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
							
							
							
							
							
							
							
							# Conflicts:
#	lib/modules/cm_module/service_request_detail_provider.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart 
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								eba3154f32
								
							
								
							
						 | 
						
							
							
								
								splash session expired handled.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3181e666be
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0a38bdd9e1
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c92aae9048
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								64a2d39cb1
								
							
								
							
						 | 
						
							
							
								
								timer picker added and improvements
							
							
							
							
							
						 | 
						
							5 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e26db46108
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e3b63c76ba
								
							
								
							
						 | 
						
							
							
								
								itg form status added.
							
							
							
							
							
						 | 
						
							6 months 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 
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b75c0b321d
								
							
								
							
						 | 
						
							
							
								
								multiple asset picker added.
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								4d45dcf0b9
								
							
								
							
						 | 
						
							
							
								
								maintenance request complete ui issue fixes
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								045c890a27
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								ab91baf216
								
							
								
							
						 | 
						
							
							
								
								bug fixes mentioned on excel sheet and tested with backend
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f99ea0dacd
								
							
								
							
						 | 
						
							
							
								
								remove camel case text, confirmation dialog added, on back press.
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								d181c81029
								
							
								
							
						 | 
						
							
							
								
								save and complete api integrated for recurrent task
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								99bcae1dc2
								
							
								
							
						 | 
						
							
							
								
								recurrent task api integrated
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								81d4fa6a89
								
							
								
							
						 | 
						
							
							
								
								ppm calibration tools, pm kits and checklist ui changed
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								ae3b9297d5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'design_3.0_non_hmg_emp_flow' into design_3.0_ppm_new_flow
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								8a5478f37f
								
							
								
							
						 | 
						
							
							
								
								initial commit
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								27097956cb
								
							
								
							
						 | 
						
							
							
								
								gas quantity field change to dropdown
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d89ec1d317
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								ba50ed5809
								
							
								
							
						 | 
						
							
							
								
								add swipe and forget password apis
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								904f1919d4
								
							
								
							
						 | 
						
							
							
								
								all changes implemented
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								38ce0bd9a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'design_3.0_fixes' into design_3.0_latest
							
							
							
							
							
							
							
							# Conflicts:
#	lib/dashboard_latest/dashboard_provider.dart
#	lib/dashboard_latest/widgets/request_category_fragment.dart
#	lib/dashboard_latest/widgets/requests_fragment.dart
#	lib/extensions/enum_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/models/new_models/arrival_verification_type_model.dart
#	lib/new_views/pages/land_page/requests/service_request_item_view.dart
#	lib/service_request_latest/service_request_detail_provider.dart
#	lib/service_request_latest/utilities/service_request_utils.dart
#	lib/service_request_latest/views/components/action_button/footer_action_button.dart
#	lib/service_request_latest/views/components/activities_list_view.dart
#	lib/service_request_latest/views/components/service_request_detail_view.dart
#	lib/service_request_latest/views/components/verify_arrival_view.dart
#	lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart
#	lib/service_request_latest/views/service_request_detail_main_view.dart 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								3a27b9d6ca
								
							
								
							
						 | 
						
							
							
								
								implement scan qr code and ask requester to verify flow
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 muhammad.abbasi
							
						 | 
						
							
							
							
							
								
							
								fbdbdf67a0
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								690b3822f5
								
							
								
							
						 | 
						
							
							
								
								code and logic improvements.
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								40a96bad7c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
							
							
							
							
							
							
							
							# Conflicts:
#	lib/extensions/widget_extensions.dart 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c0afad329b
								
							
								
							
						 | 
						
							
							
								
								improvement.
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 muhammad.abbasi
							
						 | 
						
							
							
							
							
								
							
								0095facdf5
								
							
								
							
						 | 
						
							
							
								
								maintenance request flow in progress
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 muhammad.abbasi
							
						 | 
						
							
							
							
							
								
							
								c2b3288423
								
							
								
							
						 | 
						
							
							
								
								in progress
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 muhammad.abbasi
							
						 | 
						
							
							
							
							
								
							
								e8dc052d02
								
							
								
							
						 | 
						
							
							
								
								integrating api in new flow
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 muhammad.abbasi
							
						 | 
						
							
							
							
							
								
							
								53c5240377
								
							
								
							
						 | 
						
							
							
								
								ui fixes
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 muhammad.abbasi
							
						 | 
						
							
							
							
							
								
							
								68a8dc250f
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f694252828
								
							
								
							
						 | 
						
							
							
								
								null safety conversion after merge.
							
							
							
							
							
						 | 
						
							1 year 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 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 muhammad.abbasi
							
						 | 
						
							
							
							
							
								
							
								d13f3e3551
								
							
								
							
						 | 
						
							
							
								
								Ui updated
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e6e35ab1d0
								
							
								
							
						 | 
						
							
							
								
								null safety conversion complete.
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								fe8ac14e46
								
							
								
							
						 | 
						
							
							
								
								sdk upgrade changes-1.
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								7d0a2eb65c
								
							
								
							
						 | 
						
							
							
								
								sdk upgrade changes.
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 muhammad.abbasi
							
						 | 
						
							
							
							
							
								
							
								667e12a548
								
							
								
							
						 | 
						
							
							
								
								service detail new flow ui
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Muhammad Abbasi
							
						 | 
						
							
							
							
							
								
							
								246bb1fb55
								
							
								
							
						 | 
						
							
							
								
								pagination added
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Muhammad Abbasi
							
						 | 
						
							
							
							
							
								
							
								ad1a01b7c6
								
							
								
							
						 | 
						
							
							
								
								initial commit
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e212cf75b1
								
							
								
							
						 | 
						
							
							
								
								ppm multi timer added.
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								494087ef18
								
							
								
							
						 | 
						
							
							
								
								update service request & work order attachment issue fix.
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								adab2e36ea
								
							
								
							
						 | 
						
							
							
								
								first action time added, comment fixed,
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								162ebd38be
								
							
								
							
						 | 
						
							
							
								
								gas & transfer request status on open improvement.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6bb2b81ac3
								
							
								
							
						 | 
						
							
							
								
								improvements & fixes
							
							
							
							
							
						 | 
						
							2 years ago |