 Sikander Saleem
|
4bd055cfe8
|
merge conflict resolved.
|
7 months ago |
|
Sikander Saleem
|
48b4b5e368
|
Merge branch 'design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
# lib/controllers/notification/firebase_notification_manger.dart
# lib/modules/cm_module/cm_detail_page.dart
# lib/modules/cx_module/chat/chat_widget.dart
# lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
# lib/new_views/pages/land_page/requests/service_request_item_view.dart
# lib/views/pages/user/requests/pending_requests_screen.dart
|
7 months ago |
|
Sikander Saleem
|
b78d10af46
|
current user employee id for chat.
|
7 months ago |
|
Sikander Saleem
|
45d736a64e
|
app release v1.5.0+32 to stores
|
8 months ago |
 WaseemAbbasi22
|
077095502e
|
chat count implemented
|
8 months ago |
|
Sikander Saleem
|
9f670d4a0b
|
Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
8 months ago |
|
WaseemAbbasi22
|
7dd8fff34e
|
asset delivery modules completed
|
8 months ago |
|
Sikander Saleem
|
6d20e6f307
|
chat enable for cm module when engineer assigned.
|
8 months ago |
|
Sikander Saleem
|
a9362d90f5
|
asset information auto fetch from CM workOrder.
|
8 months ago |
|
Sikander Saleem
|
5d2291a30f
|
loan option for in progress requests.
|
9 months ago |
|
Sikander Saleem
|
290cdf29d8
|
Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
# lib/modules/cm_module/cm_detail_page.dart
# lib/modules/cx_module/chat/chat_page.dart
|
9 months ago |
|
Sikander Saleem
|
07ec866315
|
loan attachment added & improvements.
|
9 months ago |
|
Sikander Saleem
|
e7e0f7375c
|
chat fix when contact persons list is empty.
|
9 months ago |
|
Sikander Saleem
|
09762fd278
|
files refactoring
|
9 months ago |
|
Sikander Saleem
|
1a3861d816
|
files refactoring
|
9 months ago |
|
Sikander Saleem
|
f6f5048cc8
|
Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/main.dart
# pubspec.lock
# pubspec.yaml
|
9 months ago |
|
Sikander Saleem
|
6ef6bc40a0
|
Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/dashboard_latest/widgets/request_category_list.dart
# lib/new_views/pages/land_page/requests/request_paginated_listview.dart
# lib/new_views/pages/land_page/widgets/request_item_view_list.dart
|
9 months ago |
|
Sikander Saleem
|
1f074b33e5
|
chat finalized.
|
9 months ago |
|
Sikander Saleem
|
c31771aaa7
|
chat improvements
|
9 months ago |
|
Sikander Saleem
|
e52caee730
|
chat improvements
|
9 months ago |
|
Sikander Saleem
|
7445902564
|
chat attachment added.
|
9 months ago |
|
Sikander Saleem
|
c5b4325aec
|
survey notification finalized.
|
9 months ago |
|
Sikander Saleem
|
186987c5ce
|
chat flow improvement and connect to SignalR.
|
9 months ago |
|
Sikander Saleem
|
781e61814a
|
survey questionare finalized.
|
9 months ago |
|
Sikander Saleem
|
9d7c3a38b2
|
chat connection improvements
|
9 months ago |
|
Sikander Saleem
|
1cc5ebd9fb
|
survey question cont.
|
9 months ago |
|
Sikander Saleem
|
01f004cecc
|
chat development cont.
|
9 months ago |
|
Sikander Saleem
|
d48fdfaaa5
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation
|
10 months ago |
|
Sikander Saleem
|
25475de68e
|
Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_TM_Module_snagsFix
# Conflicts:
# lib/modules/pm_module/ppm_wo/ppm_details_page.dart
|
10 months ago |
|
WaseemAbbasi22
|
cbddd807d4
|
internal audit design complete
|
10 months ago |
Sikander Saleem
|
985d559860
|
ppm update button hide for end user. & status color changed.
|
10 months ago |
|
Sikander Saleem
|
4d035e9c46
|
android AGP upgraded & enhancement.
|
11 months ago |
|
WaseemAbbasi22
|
423968d7f6
|
timer history added
|
11 months ago |
|
Sikander Saleem
|
fad81a84ba
|
1.3.10+29 uploaded.
|
11 months ago |
|
Sikander Saleem
|
0604dd6d69
|
improvements.
|
11 months ago |
|
Sikander Saleem
|
328b2fe48d
|
for edd date limitation increased 1 year.
|
12 months ago |
|
Sikander Saleem
|
df66cf5c77
|
improvements
|
12 months ago |
|
Sikander Saleem
|
b7aefbe7f3
|
task contact info in detail view, & improvements
|
12 months ago |
|
WaseemAbbasi22
|
9a332e86e2
|
Merge branch 'design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
|
12 months ago |
|
Sikander Saleem
|
c1a7562e3b
|
create asset transfer, on internal & external destination values reset.
|
12 months ago |
|
WaseemAbbasi22
|
5e3b09315f
|
dark mode color fixes
|
1 year ago |
|
Sikander Saleem
|
e0ad359295
|
system bottom navigation bar theme improvement.
|
1 year ago |
|
Sikander Saleem
|
c4efbba6a8
|
ui fixes
|
1 year 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
|
1 year ago |
|
Sikander Saleem
|
89865c0ddd
|
Merge branch 'refs/heads/design_3.0_dark_mode' into design_3.0_TM_Module_attachmentFix
# Conflicts:
# lib/modules/cm_module/views/forms/asset_retired/verify_asset_detail.dart
# lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
# lib/modules/pm_module/ppm_wo/update_ppm/ppm_calibration_tools_form.dart
# lib/views/pages/device_transfer/update_device_transfer.dart
|
1 year ago |
|
WaseemAbbasi22
|
0637a51ea0
|
spare part attachment fixes
|
1 year ago |
|
Sikander Saleem
|
f2eb4d7432
|
update asset details improvement.
|
1 year ago |
|
Sikander Saleem
|
4fe2943a5f
|
update asset details improvement.
|
1 year ago |
|
WaseemAbbasi22
|
4e665d1959
|
attachment fixes
|
1 year ago |
|
Sikander Saleem
|
b4e8e82995
|
mr no keyboard type fix.
|
1 year ago |
|
WaseemAbbasi22
|
8d9aacb870
|
dark mode fixes
|
1 year ago |
|
WaseemAbbasi22
|
0f7a8e0955
|
Merge branch 'design_3.0_TM_Module_snagsFix' into design_3.0_dark_mode
|
1 year ago |
|
WaseemAbbasi22
|
8d02ff5ec1
|
mr number and exchange cost added
|
1 year ago |
|
WaseemAbbasi22
|
4ce0504ab7
|
dark mode implementation
|
1 year ago |
|
WaseemAbbasi22
|
6d39b20e0b
|
dark mode implementation
|
1 year 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
|
1 year ago |
|
Sikander Saleem
|
262b3aa42f
|
local auth fail handling and improvements.
|
1 year ago |
|
Sikander Saleem
|
d9f3a4e73a
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix
|
1 year ago |
|
Sikander Saleem
|
bf97215683
|
duplicate value added, to enable mark as complete.
|
1 year ago |
|
WaseemAbbasi22
|
1285ae68ec
|
multiple assistant employee structure added
|
1 year ago |
|
Sikander Saleem
|
a1e0c92b34
|
spare part validation added when create.
|
1 year ago |
|
Sikander Saleem
|
37c3b54237
|
improvements
|
1 year ago |
|
WaseemAbbasi22
|
705dff245d
|
multiple assistant employee structure added
|
1 year ago |
|
Sikander Saleem
|
ffbe58b6c6
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix
|
1 year ago |
|
WaseemAbbasi22
|
59c4d8f9b0
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix
|
1 year ago |
|
WaseemAbbasi22
|
32627bbda1
|
form fixes
|
1 year ago |
|
Sikander Saleem
|
95ab0192fe
|
edd and cm frame improvements
|
1 year ago |
|
Sikander Saleem
|
93caf55354
|
edd and wo frame fields added.
|
1 year ago |
|
WaseemAbbasi22
|
621ca230f5
|
Bug 904 fixes and add validation for assist employee start and end date in maintenance request
|
1 year ago |
|
Sikander Saleem
|
4c92525589
|
1.3.3+22 uploaded
|
1 year ago |
|
Sikander Saleem
|
12752535b8
|
improvements
|
1 year ago |
|
Sikander Saleem
|
eead9bed02
|
improvements
|
1 year ago |
|
Sikander Saleem
|
c92aae9048
|
improvements
|
1 year ago |
|
Sikander Saleem
|
d5059758ac
|
Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new
|
1 year ago |
|
Sikander Saleem
|
bf44e5cbec
|
verification method issue fixed, if requester not confirms arrival.
|
1 year ago |
|
Sikander Saleem
|
a2e5a8a588
|
otp verification improved, serial no added
|
1 year ago |
|
Sikander Saleem
|
616ce9b630
|
timer picker end date selection fixed.
|
1 year ago |
|
Sikander Saleem
|
6539848f31
|
method name fix.
|
1 year ago |
|
Sikander Saleem
|
5fd2bb1e5b
|
vendor list issue when already have a supplier.
|
1 year ago |
|
Sikander Saleem
|
f3f09d1eb2
|
timer improvements
|
1 year ago |
|
Sikander Saleem
|
407c913002
|
timer issue fixed.
|
1 year ago |
|
WaseemAbbasi22
|
60979b7f95
|
Date picker end time fixes
|
1 year ago |
|
WaseemAbbasi22
|
547b815b61
|
End date picker last date changed to current date
|
1 year ago |
|
Sikander Saleem
|
20b5ddb92b
|
improvements.
|
1 year ago |
|
Sikander Saleem
|
293dc809b7
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
1 year ago |
|
WaseemAbbasi22
|
9d4d678668
|
Service request attachment fixes
|
1 year ago |
|
Sikander Saleem
|
50eb16ce32
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
1 year ago |
|
Sikander Saleem
|
46dd66b165
|
selection replaced to full screen.
|
1 year ago |
|
WaseemAbbasi22
|
aa11d93409
|
update user contact info bottomsheet design and statedate time initial value added
|
1 year ago |
|
Sikander Saleem
|
fb6641f880
|
number keyboard replaced with decimal
|
1 year ago |
|
Sikander Saleem
|
afe0d45d86
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
1 year ago |
|
Sikander Saleem
|
4d13105b91
|
cancel a selection from bottom sheet dropdown added.
|
1 year ago |
|
WaseemAbbasi22
|
9561b29822
|
update user info bottomsheet design and service request external date check added
|
1 year ago |
|
Sikander Saleem
|
62dd395a73
|
timer picker added, and code improvements
|
1 year ago |
|
WaseemAbbasi22
|
cfdf41233c
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
1 year ago |
|
WaseemAbbasi22
|
a241b4a24e
|
return to service datepicker issue fixed
|
1 year ago |
|
Sikander Saleem
|
6050e47d26
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
1 year ago |
|
Sikander Saleem
|
bed3a9821e
|
decimal keyboard on traveling hours, email keyboard for email for external engineer
|
1 year ago |
|
Sikander Saleem
|
13be4e960a
|
notification issue, otp issue fixed.
|
1 year ago |
|
WaseemAbbasi22
|
4d15dc9dab
|
mark as complete confirmation dialog and new timer added for all type of requests
|
1 year ago |