 Sikander Saleem
|
630c1533e7
|
Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/views/pages/user/requests/create_service_request_page.dart
# lib/views/widgets/images/multi_image_picker.dart
|
2 months ago |
|
Sikander Saleem
|
b2d3d60152
|
logout api added.
|
2 months ago |
 WaseemAbbasi22
|
2fab61b144
|
task module disabled
|
3 months ago |
|
Sikander Saleem
|
e0ad359295
|
system bottom navigation bar theme improvement.
|
3 months ago |
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
|
aa1d75de07
|
merge conflict resolved.
|
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
|
6adea49150
|
image full screen loading improvement
|
3 months ago |
|
Sikander Saleem
|
daa4a12893
|
improvement
|
3 months ago |
|
Sikander Saleem
|
97adfa1def
|
Merge remote-tracking branch 'origin/design_3.0_task_module_new' into design_3.0_task_module_new
|
4 months ago |
|
Sikander Saleem
|
d5059758ac
|
Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new
|
4 months ago |
|
WaseemAbbasi22
|
8b76629448
|
requestlist changes to model for status fixes
|
4 months ago |
|
Sikander Saleem
|
a2e5a8a588
|
otp verification improved, serial no added
|
4 months ago |
|
Sikander Saleem
|
6539848f31
|
method name fix.
|
4 months ago |
|
Sikander Saleem
|
e9efca620d
|
enable task module.
|
4 months ago |
|
Sikander Saleem
|
5fd2bb1e5b
|
vendor list issue when already have a supplier.
|
4 months ago |
|
Sikander Saleem
|
65064bc0a2
|
low priority removed from gas refill, transfer, ppm and sparepart cost.
|
5 months ago |
|
Sikander Saleem
|
b4587a6347
|
hide task module & recurrent WO for nurse
|
6 months ago |
|
WaseemAbbasi22
|
7b57ca54c3
|
renaming done as per pdf shared
|
6 months ago |
|
Sikander Saleem
|
5169894dc4
|
code restructured and improvements.
|
6 months ago |
|
Sikander Saleem
|
36657cd5ca
|
cost added & refactor.
|
6 months ago |
|
Sikander Saleem
|
8dc35a20af
|
FMS- engineer can create CM request, hide priority for nurse.
|
6 months ago |
|
WaseemAbbasi22
|
ef7722ab2a
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
# lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
|
6 months ago |
|
WaseemAbbasi22
|
02ccdd1f6a
|
ATOMS-856 fixed
|
6 months ago |
|
Sikander Saleem
|
50ca2bb8a3
|
create request method improvement.
|
6 months ago |
|
Sikander Saleem
|
5b3d746b14
|
ui improvements & task details added on details screen
|
6 months ago |
|
WaseemAbbasi22
|
a42466b578
|
ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues fixed
|
6 months ago |
|
WaseemAbbasi22
|
72823e37f8
|
bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed
|
6 months ago |
|
WaseemAbbasi22
|
93c7fb553d
|
task detail page improvement
|
6 months ago |
|
Sikander Saleem
|
3ee2b66fbf
|
code clean, unused files removed.
|
6 months ago |
|
Sikander Saleem
|
b8f6473378
|
UAt apk provided To QA.
|
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
|
14e55c63e7
|
create task flow completed
|
7 months ago |
|
WaseemAbbasi22
|
0fdbe8722e
|
task request item view api integrated
|
7 months ago |
|
WaseemAbbasi22
|
2291350d6f
|
added request type for task requests
|
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
|
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
|
ab91baf216
|
bug fixes mentioned on excel sheet and tested with backend
|
7 months ago |
|
Sikander Saleem
|
99ef704913
|
rename points done
|
7 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
|
54db7c97fc
|
Task Request nurse side ui completed
|
8 months ago |
|
WaseemAbbasi22
|
289d06ff68
|
Asset transfer nurse side ui completed
|
8 months ago |
|
Sikander Saleem
|
5ab0ba4c2c
|
bug 710 & 711 fixed.
|
8 months ago |
|
Sikander Saleem
|
4a7f1eb037
|
ppm improvement, recurrent task improvement
|
8 months ago |
|
Sikander Saleem
|
4c328b2cba
|
recurrent task timer improvements.
|
9 months ago |