WaseemAbbasi22
|
77f5d41757
|
export feature added for asset and my request
|
4 months ago |
 Sikander Saleem
|
68fcc444d9
|
Merge branch 'refs/heads/main_production_ai_enhancement' into cleaner_module
|
4 months ago |
|
WaseemAbbasi22
|
33f1f07e86
|
housekeeping module completed
|
4 months ago |
|
Sikander Saleem
|
1d8ef3676b
|
loan details user model, bug fixed.
|
4 months ago |
|
Sikander Saleem
|
b09609f692
|
commented files/codes deleted.
|
4 months ago |
|
Sikander Saleem
|
32038102fc
|
v1.7.4+39 uploaded on stores. nfc support devices bug fix on android 11 & below devices.
|
4 months ago |
|
Sikander Saleem
|
a3630e0d8c
|
improvement.
|
5 months ago |
|
Sikander Saleem
|
d59a8f4d6f
|
qr scanner improvements
|
5 months ago |
|
WaseemAbbasi22
|
887217646a
|
QR scanning fixes for Huawei
|
5 months ago |
|
WaseemAbbasi22
|
aab2a557c8
|
search fixes
|
5 months ago |
|
WaseemAbbasi22
|
123738e333
|
location and bottomsheet keyboard bug fixes
|
5 months ago |
|
Sikander Saleem
|
bdaae11c36
|
nfc manager improvements
|
5 months ago |
|
WaseemAbbasi22
|
e4b84bb3e0
|
Merge remote-tracking branch 'origin/main_production_upgrade' into main_production_upgrade
|
5 months ago |
|
WaseemAbbasi22
|
765115390f
|
bottomsheet fixes
|
5 months ago |
|
Sikander Saleem
|
7f359ba496
|
logic improved for pre select values.
|
5 months ago |
|
Sikander Saleem
|
b94d5d1fbd
|
android sdk upgraded to 36, 16kb page size support added.
|
6 months ago |
|
Sikander Saleem
|
3180a80a88
|
demo moved to permission api.
|
6 months ago |
|
Sikander Saleem
|
86c530dc45
|
improvements
|
6 months ago |
|
Sikander Saleem
|
7020b9b36e
|
improvement
|
6 months ago |
|
Sikander Saleem
|
65c0566eef
|
Merge branch 'design_3.0_incident_module' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/main.dart
# lib/new_views/common_widgets/single_item_drop_down_menu.dart
# lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
# lib/new_views/pages/land_page/my_request/my_requests_page.dart
# lib/new_views/pages/land_page/requests/request_paginated_listview.dart
# lib/new_views/pages/land_page/widgets/request_item_view_list.dart
|
6 months ago |
|
Sikander Saleem
|
71dfcde5a1
|
Merge branch 'refs/heads/design_3.0_rota_module' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
6 months ago |
|
Sikander Saleem
|
64fbf46b82
|
Merge branch 'refs/heads/design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/modules/loan_module/pages/loan_equipment_detail_page.dart
# lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
# lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
# lib/new_views/pages/land_page/my_request/my_requests_page.dart
|
6 months ago |
|
Sikander Saleem
|
31a9296a8e
|
improvements
|
6 months ago |
|
Sikander Saleem
|
2349925ed1
|
information dialog added.
|
6 months ago |
|
Sikander Saleem
|
df8d22f792
|
chat employee id changes.
|
6 months ago |
|
Sikander Saleem
|
267a4445d1
|
ui improvements
|
6 months ago |
|
Sikander Saleem
|
9dc19354a2
|
hide loan for release
|
6 months ago |
|
Sikander Saleem
|
f6a433ca09
|
Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
6 months ago |
|
Sikander Saleem
|
6cf051e66e
|
incident detail page addded.
|
6 months ago |
|
Sikander Saleem
|
58ee00b00a
|
incident module dev -1
|
6 months ago |
|
Sikander Saleem
|
1a2845337b
|
improvements
|
7 months ago |
 WaseemAbbasi22
|
42677a72b3
|
improvements
|
7 months ago |
|
WaseemAbbasi22
|
60051af331
|
Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/modules/demo_module/create_demo_request_page.dart
# lib/modules/demo_module/demo_provider.dart
|
7 months ago |
|
WaseemAbbasi22
|
1e158e8bd4
|
update form changed
|
7 months ago |
|
Sikander Saleem
|
cea77ff7f7
|
evaluation form added.
|
7 months ago |
|
WaseemAbbasi22
|
938f5173a4
|
improvements
|
7 months ago |
|
WaseemAbbasi22
|
5d856fc46b
|
improvements
|
7 months ago |
|
WaseemAbbasi22
|
e0ed594072
|
API's implemented
|
7 months ago |
|
WaseemAbbasi22
|
bf4d2a3257
|
Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module
|
7 months ago |
|
WaseemAbbasi22
|
0908cda2b0
|
Ui improvement and delivery inspection new apis implemented
|
7 months ago |
|
Sikander Saleem
|
6f43fd777a
|
user shift information added.
|
7 months ago |
|
Sikander Saleem
|
9eaae96c84
|
Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/main.dart
# lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
# lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
# lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
|
7 months ago |
|
Sikander Saleem
|
178309eb1e
|
Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/main.dart
# lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
# lib/new_views/pages/land_page/my_request/my_requests_page.dart
|
7 months ago |
|
Sikander Saleem
|
da85a2b639
|
Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
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
|
520e7af640
|
fcm initialization changed to landing page
|
7 months ago |
|
WaseemAbbasi22
|
73ee12cba4
|
Atoms-1743,1745,1748 fixes
|
7 months ago |
|
WaseemAbbasi22
|
3c9688fdcb
|
delivery notes item design updated
|
7 months ago |
|
WaseemAbbasi22
|
3944a549b2
|
requested changes done
|
7 months ago |
|
Sikander Saleem
|
45d736a64e
|
app release v1.5.0+32 to stores
|
8 months ago |
|
WaseemAbbasi22
|
2425c78cf9
|
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
|
c2068544db
|
Medical Gas Inspection completed
|
8 months ago |
|
Sikander Saleem
|
a103eae1c1
|
demo module ui cont.
|
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
|
282bf04094
|
Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_medical_gas_inspection
|
8 months ago |
|
Sikander Saleem
|
1ebd6f2fbc
|
Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
# lib/controllers/providers/api/all_requests_provider.dart
|
8 months ago |
|
Sikander Saleem
|
b3f8dabf2f
|
Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
|
8 months ago |
|
Sikander Saleem
|
17210195db
|
uat improvements. md->department, enable recall and alert for quality user.
|
8 months ago |
|
Sikander Saleem
|
86f96a8f62
|
medical gas ui added.
|
8 months ago |
|
Sikander Saleem
|
ea05e965d5
|
Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
# lib/modules/tm_module/device_transfer/device_transfer_details.dart
# lib/views/widgets/gas_refill/gas_refill_list.dart
|
8 months ago |
|
Sikander Saleem
|
5ff9fc5808
|
chat added gas refill, transfer asset internal & external, task request.
|
8 months ago |
|
WaseemAbbasi22
|
789522b79b
|
asset delivery modules design flow completed
|
8 months ago |
|
Sikander Saleem
|
b407103002
|
Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
|
9 months ago |
|
Sikander Saleem
|
af69b2959b
|
Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
# lib/controllers/api_routes/api_manager.dart
# lib/controllers/api_routes/urls.dart
|
9 months ago |
|
Sikander Saleem
|
12cd68a30f
|
Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
# lib/controllers/providers/api/all_requests_provider.dart
# lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
|
9 months ago |
|
Sikander Saleem
|
f4d47244be
|
Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/controllers/providers/api/all_requests_provider.dart
# lib/controllers/providers/api/user_provider.dart
# lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
# lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
# lib/new_views/pages/land_page/my_request/my_requests_page.dart
|
9 months ago |
|
Sikander Saleem
|
07ec866315
|
loan attachment added & improvements.
|
9 months ago |
|
Sikander Saleem
|
ff7ee7f8bb
|
user module permission api added. asset inventory switch to user permissions.
|
9 months ago |
|
Sikander Saleem
|
22fd3c8cc9
|
loan equipment item view added;
|
9 months ago |
|
Sikander Saleem
|
60511b60cf
|
files refactoring
|
9 months ago |
|
Sikander Saleem
|
09762fd278
|
files refactoring
|
9 months ago |
|
Sikander Saleem
|
1a3861d816
|
files refactoring
|
9 months ago |
|
Sikander Saleem
|
16a2fa2b26
|
files refactoring
|
9 months ago |
|
Sikander Saleem
|
62cc13b1c0
|
standard / backup loan request creation.
|
9 months ago |
waseemabbasi22
|
c9d2df4ea7
|
Merge remote-tracking branch 'origin/design_3.0_internal_audit_module' into design_3.0_internal_audit_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
9 months ago |
|
waseemabbasi22
|
b4943aff3d
|
initial test done
|
9 months ago |
|
Sikander Saleem
|
a3509e9464
|
Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
# lib/main.dart
# lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
|
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 |
|
WaseemAbbasi22
|
542070c791
|
improvements
|
9 months ago |
|
WaseemAbbasi22
|
255691f47a
|
loan design in progress
|
9 months ago |
|
Sikander Saleem
|
a902204ff1
|
survey improvements.
|
9 months ago |
|
Sikander Saleem
|
01f004cecc
|
chat development cont.
|
9 months ago |
|
Sikander Saleem
|
830700ce79
|
grey error fixed on release build.
|
9 months ago |
|
WaseemAbbasi22
|
81dd189025
|
internal audit api's implementation in progress
|
9 months ago |
|
WaseemAbbasi22
|
a8e8774040
|
internal audit api's implementation in progress
|
10 months ago |
|
Sikander Saleem
|
96b65e99fa
|
chat list ui added-1.
|
10 months ago |
|
Sikander Saleem
|
18a53d7518
|
chat list ui added.
|
10 months ago |
|
Sikander Saleem
|
22a667a7b3
|
Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/controllers/providers/api/all_requests_provider.dart
# lib/dashboard_latest/widgets/request_category_list.dart
# lib/models/new_models/dashboard_detail.dart
# lib/new_views/pages/land_page/my_request/my_requests_page.dart
# lib/new_views/pages/land_page/requests/request_paginated_listview.dart
# lib/new_views/pages/land_page/widgets/request_item_view_list.dart
|
10 months ago |
|
Sikander Saleem
|
160dc57b86
|
Merge branch 'refs/heads/design_3.0_data_segregation' into design_3.0_asset_inventory_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/controllers/providers/api/all_requests_provider.dart
|
10 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
|
46fd537c3a
|
global health ui improvements added.
|
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
|
866ec5754e
|
improvements
|
10 months ago |
Sikander Saleem
|
985d559860
|
ppm update button hide for end user. & status color changed.
|
10 months ago |
|
Sikander Saleem
|
40c7e75fa4
|
assessor role added for TRAF.
|
10 months ago |
|
Sikander Saleem
|
599da01554
|
traf request item list view added.
|
10 months ago |
|
Sikander Saleem
|
144951caec
|
traf request creation completed.
|
10 months ago |
|
Sikander Saleem
|
174e714d38
|
nurse cannot see recall and alert.
|
10 months ago |
|
Sikander Saleem
|
dd19507fa1
|
add traf payload added.
|
10 months ago |
|
Sikander Saleem
|
5d28eb6c21
|
ui improvement.
|
10 months ago |
|
Sikander Saleem
|
ceee6d689d
|
total working hours added on task detail.
|
10 months ago |
|
Sikander Saleem
|
76acdddabc
|
asset by oracle code api added, departments lookup added.
|
10 months ago |
|
Sikander Saleem
|
b17d6db327
|
po number, site, information added in asset details,
|
10 months ago |
|
Sikander Saleem
|
d3c000004e
|
code improvements
|
10 months ago |
|
Sikander Saleem
|
56328b81b4
|
traf module added, create, view details, update. cont
|
10 months ago |
|
WaseemAbbasi22
|
8578319cc3
|
asset inventory module ready for qa
|
10 months ago |
|
WaseemAbbasi22
|
c19fdb173b
|
api integrated for main views
|
11 months ago |
|
WaseemAbbasi22
|
e5775019a4
|
asset inventory design
|
11 months ago |
|
Sikander Saleem
|
3ac3c11b4b
|
improvement
|
11 months ago |
|
Sikander Saleem
|
ee70ca3c2b
|
Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge
|
11 months ago |
|
WaseemAbbasi22
|
423968d7f6
|
timer history added
|
11 months ago |
|
Sikander Saleem
|
89b81391e9
|
site contact list api added.
|
11 months ago |
|
WaseemAbbasi22
|
e40d9a1138
|
ATOMS-1025, ATOMS-937 and some color fixes for dark mode
|
11 months ago |
|
Sikander Saleem
|
23e7550212
|
counter animation added.
|
12 months ago |
|
Sikander Saleem
|
7efeeed619
|
bottom sheet ui improvements,safe area added.
|
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 |
|
WaseemAbbasi22
|
ccef98860f
|
recall and alert type request added
|
12 months ago |
|
Sikander Saleem
|
c1a7562e3b
|
create asset transfer, on internal & external destination values reset.
|
12 months ago |
|
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
|
12 months ago |
|
Sikander Saleem
|
642d1a908c
|
auto login improvement.
|
12 months ago |
|
waseemabbasi22
|
6c3f36944a
|
auth and attachment fixes
|
12 months ago |
|
Sikander Saleem
|
b2d3d60152
|
logout api added.
|
1 year ago |
|
WaseemAbbasi22
|
2fab61b144
|
task module disabled
|
1 year ago |
|
WaseemAbbasi22
|
5e3b09315f
|
dark mode color fixes
|
1 year ago |
|
Sikander Saleem
|
e0ad359295
|
system bottom navigation bar theme improvement.
|
1 year ago |
|
Sikander Saleem
|
f3539f1471
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
|
1 year ago |
|
Sikander Saleem
|
a479a23790
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module
|
1 year ago |
|
Sikander Saleem
|
e3a97c0ae9
|
enable engineer time picker issue fixed, session expired dialog issue fixed.
|
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
|
4e665d1959
|
attachment fixes
|
1 year ago |
|
WaseemAbbasi22
|
7ecccf8bf8
|
improvements
|
1 year ago |
|
WaseemAbbasi22
|
6d39b20e0b
|
dark mode implementation
|
1 year ago |
|
Sikander Saleem
|
aa1d75de07
|
merge conflict resolved.
|
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 |
 SikanderSaleem
|
5589d5b563
|
asset currency model & ios face id failed improvement.
|
1 year ago |
|
Sikander Saleem
|
eba3154f32
|
splash session expired handled.
|
1 year ago |
|
Sikander Saleem
|
5484c7f5a4
|
improvement
|
1 year ago |
|
Sikander Saleem
|
262b3aa42f
|
local auth fail handling and improvements.
|
1 year ago |
|
Sikander Saleem
|
6adea49150
|
image full screen loading improvement
|
1 year ago |
|
Sikander Saleem
|
daa4a12893
|
improvement
|
1 year ago |
|
Sikander Saleem
|
97adfa1def
|
Merge remote-tracking branch 'origin/design_3.0_task_module_new' into design_3.0_task_module_new
|
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 |
|
WaseemAbbasi22
|
8b76629448
|
requestlist changes to model for status fixes
|
1 year ago |
|
Sikander Saleem
|
a2e5a8a588
|
otp verification improved, serial no added
|
1 year ago |
|
Sikander Saleem
|
8101521791
|
eng can create Task request.
|
1 year ago |