Sikander Saleem
|
98234dc2c7
|
Merge branch 'refs/heads/design_3.0_task_flow' into design_3.0_tm_module_task_flow_merged
|
6 months ago |
 WaseemAbbasi22
|
b836170ae8
|
task detail page improvement
|
6 months ago |
|
Sikander Saleem
|
2abe98726e
|
code improvements.
|
6 months ago |
|
Sikander Saleem
|
33dea07449
|
merge conflict resolved and file format.
|
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 |
|
WaseemAbbasi22
|
9edaca4326
|
task request module flow completed and tested with backend
|
6 months ago |
|
WaseemAbbasi22
|
042760e1c9
|
Merge remote-tracking branch 'origin/design_3.0_task_flow' into design_3.0_task_flow
# Conflicts:
# lib/views/pages/user/tasks_request/create_task_view.dart
|
7 months ago |
|
WaseemAbbasi22
|
14e55c63e7
|
create task flow completed
|
7 months ago |
|
Sikander Saleem
|
b75c0b321d
|
multiple asset picker added.
|
7 months ago |
|
WaseemAbbasi22
|
0fdbe8722e
|
task request item view api integrated
|
7 months ago |
|
Sikander Saleem
|
353ff337f7
|
file format
|
7 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 |
|
Sikander Saleem
|
e66ae78c83
|
files format
|
7 months ago |
|
Sikander Saleem
|
015b73b634
|
ponit 87 fixed.
|
7 months ago |
|
WaseemAbbasi22
|
5963a27213
|
Merge remote-tracking branch 'origin/demo_branch' into demo_branch
|
7 months ago |
|
WaseemAbbasi22
|
43820f01d3
|
asset transfer attachment issue fixed
|
7 months ago |
|
Sikander Saleem
|
b0d5e03d5c
|
Merge remote-tracking branch 'origin/demo_branch' into demo_branch
|
7 months ago |
|
Sikander Saleem
|
c4c68fbe8b
|
asset fixes
|
7 months ago |
|
WaseemAbbasi22
|
b592e114bc
|
gas refill attachment issue fixed
|
7 months ago |
|
WaseemAbbasi22
|
2291350d6f
|
added request type for task requests
|
7 months ago |
|
WaseemAbbasi22
|
be276f327d
|
view activities for closed request issue fixed
|
7 months ago |
|
Sikander Saleem
|
ac0cf47a8d
|
point 49 fixed,
|
7 months ago |
|
Sikander Saleem
|
f043c6ff6c
|
point 8 fixed,
|
7 months ago |
|
WaseemAbbasi22
|
b506616f48
|
bug fixes for recurrent task and service request added missing details mentioned in bugs sheet
|
7 months ago |
|
WaseemAbbasi22
|
4d45dcf0b9
|
maintenance request complete ui issue fixes
|
7 months ago |
|
WaseemAbbasi22
|
e74f506be0
|
part avalibility ui implemented
|
7 months ago |
|
WaseemAbbasi22
|
6795ba7f72
|
device transfer gas refill merged in ppm_newflow
|
7 months ago |
|
WaseemAbbasi22
|
ef6c14ba55
|
Merge branch 'design_3.0_transfer_request_new_flow' into demo_branch
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
# lib/models/new_models/gas_refill_model.dart
# lib/new_views/common_widgets/default_app_bar.dart
# lib/views/pages/user/gas_refill/gas_refill_details.dart
# lib/views/pages/user/ppm/update_ppm/ppm_pm_kits_form.dart
|
7 months ago |
|
WaseemAbbasi22
|
5031c3cbb8
|
gas refill 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 |
|
WaseemAbbasi22
|
4954549594
|
bug fixes for workorder detail view
|
7 months ago |
|
WaseemAbbasi22
|
e4dd92c4a9
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
# Conflicts:
# lib/views/pages/user/ppm/update_ppm/wo_info_form.dart
|
7 months ago |
|
WaseemAbbasi22
|
a66215ef8b
|
bug fixes
|
7 months ago |
|
Sikander Saleem
|
68c4df0c14
|
validateAssetSituation check removed handled from backend
|
7 months ago |
|
Sikander Saleem
|
e13a7c9634
|
rename text
|
7 months ago |
|
Sikander Saleem
|
5825464ed5
|
ppm wo inspection back button added.
|
7 months ago |
|
Sikander Saleem
|
bbc584800a
|
CM contact info added.
|
7 months ago |
|
Sikander Saleem
|
c4847f172c
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
|
7 months ago |
|
Sikander Saleem
|
99ef704913
|
rename points done
|
7 months ago |
|
WaseemAbbasi22
|
6b93479170
|
work order attachment added
|
7 months ago |
|
Sikander Saleem
|
544dffc03f
|
chart updated overview screen.
|
7 months ago |
|
Sikander Saleem
|
5302858097
|
confirmation dialog added on ppm & recurrent
|
7 months ago |
|
Sikander Saleem
|
f99ea0dacd
|
remove camel case text, confirmation dialog added, on back press.
|
7 months ago |
|
WaseemAbbasi22
|
15e62bb004
|
Task Request Design complete
|
8 months ago |
|
Sikander Saleem
|
6b51805827
|
improvement
|
8 months ago |
|
Sikander Saleem
|
ec63446802
|
Merge branch 'refs/heads/design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
# Conflicts:
# lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart
|
8 months ago |
|
WaseemAbbasi22
|
be8c83cc8f
|
Asset tranfer api integrated ready to test
|
8 months ago |