Sikander Saleem
|
754ec458a4
|
Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new
# Conflicts:
# lib/views/widgets/images/multi_image_picker.dart
|
4 months ago |
|
Sikander Saleem
|
4c92525589
|
1.3.3+22 uploaded
|
4 months ago |
|
Sikander Saleem
|
12752535b8
|
improvements
|
4 months ago |
|
Sikander Saleem
|
3181e666be
|
improvements
|
4 months ago |
|
Sikander Saleem
|
0a38bdd9e1
|
improvements
|
4 months ago |
|
Sikander Saleem
|
eead9bed02
|
improvements
|
4 months ago |
|
Sikander Saleem
|
a626934b78
|
merge improvement
|
4 months ago |
|
Sikander Saleem
|
469cffd0c8
|
Merge remote-tracking branch 'origin/design_3.0_task_module_new' into design_3.0_task_module_new
# Conflicts:
# lib/modules/tm_module/tasks_wo/task_request_detail_view.dart
# lib/modules/tm_module/tasks_wo/update_task_request_view.dart
|
4 months ago |
|
Sikander Saleem
|
c92aae9048
|
improvements
|
4 months ago |
 WaseemAbbasi22
|
ac45e20711
|
Bug 931, 934 fixed
|
4 months ago |
|
WaseemAbbasi22
|
116855878b
|
task timer issue fixed
|
4 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
|
9b9ce8c4b2
|
1.3.2+21 uploaded on stores.
|
4 months ago |
|
Sikander Saleem
|
bf44e5cbec
|
verification method issue fixed, if requester not confirms arrival.
|
4 months ago |
|
Sikander Saleem
|
a2e5a8a588
|
otp verification improved, serial no added
|
4 months ago |
|
Sikander Saleem
|
616ce9b630
|
timer picker end date selection fixed.
|
4 months ago |
|
Sikander Saleem
|
8101521791
|
eng can create Task request.
|
4 months ago |
|
Sikander Saleem
|
6539848f31
|
method name fix.
|
4 months ago |
|
Sikander Saleem
|
e9efca620d
|
enable task module.
|
4 months ago |
|
Sikander Saleem
|
be2fd8a2d5
|
1.3.1+20 uploaded on stores
|
4 months ago |
|
Sikander Saleem
|
5fd2bb1e5b
|
vendor list issue when already have a supplier.
|
4 months ago |
|
Sikander Saleem
|
f3f09d1eb2
|
timer improvements
|
4 months ago |
|
Sikander Saleem
|
407c913002
|
timer issue fixed.
|
4 months ago |
|
WaseemAbbasi22
|
60979b7f95
|
Date picker end time fixes
|
4 months ago |
|
Sikander Saleem
|
8129cdb768
|
gas refill details, contact info employee id fixed.
|
4 months ago |
|
WaseemAbbasi22
|
547b815b61
|
End date picker last date changed to current date
|
4 months ago |
|
Sikander Saleem
|
0dade3cedb
|
unused code marked.
|
4 months ago |
|
Sikander Saleem
|
0b0f2ba25c
|
improvements.
|
4 months ago |
|
Sikander Saleem
|
20b5ddb92b
|
improvements.
|
4 months ago |
|
Sikander Saleem
|
293dc809b7
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
4 months ago |
|
Sikander Saleem
|
40c37f5373
|
profile contact detail update added.
|
4 months ago |
|
WaseemAbbasi22
|
9d4d678668
|
Service request attachment fixes
|
4 months ago |
|
Sikander Saleem
|
50eb16ce32
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
4 months ago |
|
Sikander Saleem
|
46dd66b165
|
selection replaced to full screen.
|
4 months ago |
|
WaseemAbbasi22
|
aa11d93409
|
update user contact info bottomsheet design and statedate time initial value added
|
4 months ago |
|
Sikander Saleem
|
fb6641f880
|
number keyboard replaced with decimal
|
4 months ago |
|
Sikander Saleem
|
afe0d45d86
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
4 months ago |
|
Sikander Saleem
|
4d13105b91
|
cancel a selection from bottom sheet dropdown added.
|
4 months ago |
|
WaseemAbbasi22
|
9561b29822
|
update user info bottomsheet design and service request external date check added
|
4 months ago |
|
Sikander Saleem
|
62dd395a73
|
timer picker added, and code improvements
|
4 months ago |
|
WaseemAbbasi22
|
bcb54f6279
|
enabledEngineerTimer parameter added
|
5 months ago |
|
WaseemAbbasi22
|
cfdf41233c
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
5 months ago |
|
WaseemAbbasi22
|
a241b4a24e
|
return to service datepicker issue fixed
|
5 months ago |
|
Sikander Saleem
|
2d39a6453c
|
improvement.
|
5 months ago |
|
Sikander Saleem
|
6050e47d26
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
5 months ago |
|
Sikander Saleem
|
bed3a9821e
|
decimal keyboard on traveling hours, email keyboard for email for external engineer
|
5 months ago |
|
Sikander Saleem
|
13be4e960a
|
notification issue, otp issue fixed.
|
5 months ago |
|
WaseemAbbasi22
|
4d15dc9dab
|
mark as complete confirmation dialog and new timer added for all type of requests
|
5 months ago |
|
Sikander Saleem
|
4c88dce72c
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
5 months ago |
|
Sikander Saleem
|
64a2d39cb1
|
timer picker added and improvements
|
5 months ago |
|
WaseemAbbasi22
|
319a5acfa5
|
cost and attachment visibility check added
|
5 months ago |
|
WaseemAbbasi22
|
1e5c43d02e
|
cost parameters and activity assign user check added.
|
5 months ago |
|
Sikander Saleem
|
7f594fbb41
|
timer tab switch issue fixed.
|
5 months ago |
 SikanderSaleem
|
b29284f59f
|
changes for ios release
|
5 months ago |
|
Sikander Saleem
|
6bf9f22af4
|
improvements
|
6 months ago |
|
Sikander Saleem
|
2acfa82a6f
|
production config.
|
6 months ago |
|
Sikander Saleem
|
06d8fc4329
|
improvement
|
6 months ago |
|
Sikander Saleem
|
10dd969d71
|
signature null values fix.
|
6 months ago |
|
WaseemAbbasi22
|
69d10c50de
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
6 months ago |
|
WaseemAbbasi22
|
8ae51480f9
|
added nurse signature for device transfer request and tested on uat
|
6 months ago |
|
Sikander Saleem
|
6d4b57db01
|
rename
|
6 months ago |
|
Sikander Saleem
|
65064bc0a2
|
low priority removed from gas refill, transfer, ppm and sparepart cost.
|
6 months ago |
|
Sikander Saleem
|
e26db46108
|
improvements
|
6 months ago |
|
WaseemAbbasi22
|
56c70671d8
|
add contact and created by information for asset transfer and gasrefill request
|
6 months ago |
|
WaseemAbbasi22
|
330efd90be
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
Sikander Saleem
|
e3b63c76ba
|
itg form status added.
|
6 months ago |
|
Sikander Saleem
|
b4587a6347
|
hide task module & recurrent WO for nurse
|
6 months ago |
|
Sikander Saleem
|
84bf5ac399
|
undo certificate check.
|
6 months ago |
|
Sikander Saleem
|
2e4e567f1d
|
certificate issue fixed.
|
6 months ago |
|
WaseemAbbasi22
|
06e8831d02
|
add label for destination site details
|
6 months ago |
|
WaseemAbbasi22
|
7b57ca54c3
|
renaming done as per pdf shared
|
6 months ago |
|
Sikander Saleem
|
1900715559
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
Sikander Saleem
|
71b392fe1f
|
1.2.8 released on playstore.
|
6 months ago |
|
WaseemAbbasi22
|
0996801f66
|
notification testing done for all type of request on dev env.
|
6 months ago |
|
WaseemAbbasi22
|
06acdb184f
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
# lib/views/pages/device_transfer/update_device_transfer.dart
|
6 months ago |
|
WaseemAbbasi22
|
b320e3751a
|
add code for nurse edit gas refill request
|
6 months ago |
|
Sikander Saleem
|
5169894dc4
|
code restructured and improvements.
|
6 months ago |
|
Sikander Saleem
|
16a0f20fbb
|
cost added.
|
6 months ago |
|
WaseemAbbasi22
|
0b97ffe296
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
Sikander Saleem
|
36657cd5ca
|
cost added & refactor.
|
6 months ago |
|
WaseemAbbasi22
|
c1c595b135
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
WaseemAbbasi22
|
4698a3325e
|
add validation for assistant employee start and end date
|
6 months ago |
|
Sikander Saleem
|
413f6cc398
|
refactor service request to cm module
|
6 months ago |
|
Sikander Saleem
|
8c9a8aa326
|
FMS- description of finding & action taken field added.
|
6 months ago |
|
Sikander Saleem
|
a54370005f
|
bug 902 fixed.
|
6 months ago |
|
Sikander Saleem
|
56c758f0a7
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
Sikander Saleem
|
8dc35a20af
|
FMS- engineer can create CM request, hide priority for nurse.
|
6 months ago |
|
WaseemAbbasi22
|
7251ba0e93
|
ATOMS-893 fixed
|
6 months ago |
|
WaseemAbbasi22
|
6004ed1a27
|
ATOMS-820 fixed
|
6 months ago |
|
WaseemAbbasi22
|
bd2155ea21
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
WaseemAbbasi22
|
f780049e87
|
ATOMS-881 fixed
|
6 months ago |
|
Sikander Saleem
|
225aa697bd
|
Bug 878 fixed
|
6 months ago |
|
Sikander Saleem
|
e16233e642
|
Bug 877,fixed
|
6 months ago |
|
Sikander Saleem
|
4e1ff56c65
|
type of alert added.
|
6 months ago |
|
Sikander Saleem
|
c41d43d890
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
WaseemAbbasi22
|
facbb9002d
|
ATOMS-811 fixed
|
6 months ago |
|
WaseemAbbasi22
|
eeafda869a
|
ATOMS-857 fixed
|
6 months ago |
|
Sikander Saleem
|
91fb195d4f
|
bug 860 fixed.
|
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
|
b77acfacd6
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
WaseemAbbasi22
|
e3531d471d
|
ATOMS-783 fixed
|
6 months ago |
|
Sikander Saleem
|
50ca2bb8a3
|
create request method improvement.
|
6 months ago |
|
WaseemAbbasi22
|
b577343353
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
WaseemAbbasi22
|
824f46b0e3
|
ATOMS-823, ATOMS-825, ATOMS-782, ATOMS-784, ATOMS-807, issues fixed
|
6 months ago |
|
Sikander Saleem
|
50fb07b504
|
on back confirmation dialog added on gas refill, task and asset transfer
|
6 months ago |
|
Sikander Saleem
|
5b3d746b14
|
ui improvements & task details added on details screen
|
6 months ago |
|
Sikander Saleem
|
68ee5d9da7
|
Bug 770 fixed.
|
6 months ago |
|
WaseemAbbasi22
|
5e9ba71be6
|
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
|
99249b4839
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
# lib/views/pages/device_transfer/device_transfer_details.dart
|
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 |
|
Sikander Saleem
|
14c2decd75
|
Bug 789 fixed.
|
6 months ago |
|
WaseemAbbasi22
|
72823e37f8
|
bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed
|
6 months ago |
|
WaseemAbbasi22
|
aca081aee5
|
Merge branch 'design_3.0_TM_Module' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
WaseemAbbasi22
|
cf30e72926
|
added missing information on task detail page and also added value for task on dashboard list
|
6 months ago |
|
WaseemAbbasi22
|
93c7fb553d
|
task detail page improvement
|
6 months ago |
|
Sikander Saleem
|
71a0ead92c
|
loading dialog fix on save and continue button.
|
6 months ago |
|
Sikander Saleem
|
3ee2b66fbf
|
code clean, unused files removed.
|
6 months ago |
|
Sikander Saleem
|
002172ab87
|
unused file
|
6 months ago |
|
Sikander Saleem
|
b8f6473378
|
UAt apk provided To QA.
|
6 months ago |
|
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 |