Sikander Saleem
|
f50ede8321
|
Merge remote-tracking branch 'origin/demo_branch' into demo_branch
# Conflicts:
# lib/views/pages/user/gas_refill/gas_refill_form.dart
|
11 months ago |
WaseemAbbasi22
|
71ee34c658
|
gas refill attachment and device transfer assistant employee issue fixes
|
11 months ago |
Sikander Saleem
|
e66ae78c83
|
files format
|
11 months ago |
Sikander Saleem
|
015b73b634
|
ponit 87 fixed.
|
11 months ago |
WaseemAbbasi22
|
b592e114bc
|
gas refill attachment issue fixed
|
11 months ago |
WaseemAbbasi22
|
b506616f48
|
bug fixes for recurrent task and service request added missing details mentioned in bugs sheet
|
11 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
|
11 months ago |
WaseemAbbasi22
|
5031c3cbb8
|
gas refill fixes
|
11 months ago |
WaseemAbbasi22
|
045c890a27
|
bug fixes
|
11 months ago |
WaseemAbbasi22
|
ab91baf216
|
bug fixes mentioned on excel sheet and tested with backend
|
11 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
|
11 months ago |
WaseemAbbasi22
|
a66215ef8b
|
bug fixes
|
11 months ago |
Sikander Saleem
|
e13a7c9634
|
rename text
|
11 months ago |
Sikander Saleem
|
5825464ed5
|
ppm wo inspection back button added.
|
11 months ago |
Sikander Saleem
|
99ef704913
|
rename points done
|
11 months ago |
Sikander Saleem
|
5302858097
|
confirmation dialog added on ppm & recurrent
|
11 months ago |
Sikander Saleem
|
6b51805827
|
improvement
|
12 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
|
12 months ago |
WaseemAbbasi22
|
be8c83cc8f
|
Asset tranfer api integrated ready to test
|
12 months ago |
Sikander Saleem
|
c1295ac7b0
|
bug 726 fixed.
|
12 months ago |
Sikander Saleem
|
f6b4b77aed
|
bug 734 fixed.
|
1 year ago |
Sikander Saleem
|
15023ea99d
|
bug 726 fixed.
|
1 year ago |
WaseemAbbasi22
|
289d06ff68
|
Asset transfer nurse side ui completed
|
1 year ago |
WaseemAbbasi22
|
48591de22a
|
Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
|
1 year ago |
Sikander Saleem
|
bd362cb0f6
|
bug 706 fixed.
|
1 year ago |
Sikander Saleem
|
ab6608f5a6
|
bug 703 fixed.
|
1 year ago |
WaseemAbbasi22
|
6bd888e06a
|
Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
|
1 year ago |
WaseemAbbasi22
|
152a0795c6
|
add and update gas refill ui and api integrated
|
1 year ago |
Sikander Saleem
|
4a7f1eb037
|
ppm improvement, recurrent task improvement
|
1 year ago |
WaseemAbbasi22
|
f06426091b
|
room null value issue fixed in recurrent task
|
1 year ago |
WaseemAbbasi22
|
3f90630db9
|
gas refill and asset transfer ui completed waiting for api
|
1 year ago |
Sikander Saleem
|
edd22bf4af
|
stop working hide for nurse.
|
1 year ago |
Sikander Saleem
|
8fe01adcb0
|
ppm pm kits improvement
|
1 year ago |
Sikander Saleem
|
5a211a295f
|
ppm dynamic tabs added.
|
1 year ago |
Sikander Saleem
|
1893b45dc9
|
ppm timer fix.
|
1 year ago |
Sikander Saleem
|
58c0f176a6
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
|
1 year ago |
WaseemAbbasi22
|
7df18179a1
|
ppm task supplier ui completed and save and update api implemented
|
1 year ago |
Sikander Saleem
|
4c328b2cba
|
recurrent task timer improvements.
|
1 year ago |
Sikander Saleem
|
86aeddc6c2
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
|
1 year ago |
WaseemAbbasi22
|
b67e6dea11
|
Recurrent Work Order Complete ready to test
|
1 year ago |
Sikander Saleem
|
58fb4b3829
|
cm feedback points,
|
1 year ago |
Sikander Saleem
|
28b30d9fa8
|
ppm data model upgraded.
|
1 year ago |
WaseemAbbasi22
|
c5d3eead2d
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
|
1 year ago |
WaseemAbbasi22
|
8c9b1b3c46
|
missing attributes added for recurrent task
|
1 year ago |
Sikander Saleem
|
84dd801ed1
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
# Conflicts:
# lib/views/pages/user/ppm/ppm_details_page.dart
# lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart
|
1 year ago |
Sikander Saleem
|
2cd5777f55
|
ppm model improvement.
|
1 year ago |
WaseemAbbasi22
|
ce1044f201
|
timer and working hours issue fixes
|
1 year ago |
WaseemAbbasi22
|
ecaf58fcdc
|
Merge branch 'refs/heads/design_3.0_non_hmg_emp_flow' into design_3.0_ppm_new_flow
# Conflicts:
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
# lib/new_views/pages/land_page/widgets/request_item_view_list.dart
|
1 year ago |
WaseemAbbasi22
|
d181c81029
|
save and complete api integrated for recurrent task
|
1 year ago |
WaseemAbbasi22
|
99bcae1dc2
|
recurrent task api integrated
|
1 year ago |