 Sikander Saleem
|
1523d51533
|
haptic added on qr scan.
|
5 months ago |
|
Sikander Saleem
|
d59a8f4d6f
|
qr scanner improvements
|
5 months ago |
WaseemAbbasi22
|
c4b4c7f75f
|
QR scanning fixes for Huawei asset scan
|
5 months ago |
|
WaseemAbbasi22
|
887217646a
|
QR scanning fixes for Huawei
|
5 months ago |
|
WaseemAbbasi22
|
123738e333
|
location and bottomsheet keyboard bug fixes
|
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
|
e87346e5b3
|
qr & barcode scanner improvement.
|
5 months ago |
|
Sikander Saleem
|
b94d5d1fbd
|
android sdk upgraded to 36, 16kb page size support added.
|
6 months ago |
|
Sikander Saleem
|
4ab1ad941a
|
unread message string same as web.
|
6 months ago |
|
Sikander Saleem
|
d837d01629
|
improvement
|
6 months ago |
|
Sikander Saleem
|
86c530dc45
|
improvements
|
6 months ago |
|
Sikander Saleem
|
2e3736cdc9
|
Merge branch 'design_3.0_loan_module' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/models/generic_attachment_model.dart
# lib/modules/loan_module/pages/loan_equipment_detail_page.dart
|
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
|
619c643367
|
Merge branch 'refs/heads/design_3.0_eng_role_module' into design_3.0_demo_module
|
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
|
c81d3181d2
|
acknowledgment added for demo request creation.
|
6 months ago |
|
Sikander Saleem
|
9226fe3ac7
|
asset room number
|
6 months ago |
|
Sikander Saleem
|
07c3775887
|
unread message list added.
|
6 months ago |
|
Sikander Saleem
|
c510c8e168
|
unread message list added.
|
6 months ago |
|
Sikander Saleem
|
4fdd04b106
|
unread messages api added.
|
6 months ago |
|
Sikander Saleem
|
4d5f001cd2
|
dropdown last item overlapping with navigation bar
|
6 months ago |
|
Sikander Saleem
|
cdc69fcee0
|
asset scan user feedback if not found.
|
6 months ago |
|
Sikander Saleem
|
267a4445d1
|
ui improvements
|
6 months ago |
|
Sikander Saleem
|
c50e979790
|
keyboard dismiss issue fixed.
|
6 months ago |
|
Sikander Saleem
|
1a2845337b
|
improvements
|
6 months ago |
|
Sikander Saleem
|
b14130e6c7
|
Merge branch 'design_3.0_rota_module' into design_3.0_eng_role_module
# Conflicts:
# lib/views/pages/user/profile_page.dart
|
7 months ago |
|
Sikander Saleem
|
d993a22b39
|
monthly calender added for rota
|
7 months ago |
|
Sikander Saleem
|
0f4a409780
|
assign to me added ion gas refill and tasks
|
7 months ago |
|
Sikander Saleem
|
c69bcc2843
|
improvement.
|
7 months ago |
|
Sikander Saleem
|
3372f7d38d
|
demo attachment document type added.
|
7 months ago |
|
Sikander Saleem
|
786d89404e
|
shift start time and end time improvement.
|
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
|
c377c67f40
|
rota module added.
|
7 months ago |
|
Sikander Saleem
|
6f43fd777a
|
user shift information added.
|
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
|
b78d10af46
|
current user employee id for chat.
|
7 months ago |
|
Sikander Saleem
|
45d736a64e
|
app release v1.5.0+32 to stores
|
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
|
f2ebadf1b7
|
attachment list view added in files list widget.
|
8 months ago |
|
Sikander Saleem
|
4763132302
|
attachment as listview added.
|
8 months ago |
|
Sikander Saleem
|
bf2b777f8d
|
chat improvements.
|
8 months ago |
|
Sikander Saleem
|
5ff9fc5808
|
chat added gas refill, transfer asset internal & external, task request.
|
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 |
waseemabbasi22
|
2962f248e0
|
timer fixes
|
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 |
|
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
|
4f78e23922
|
chat widget finalized.
|
9 months ago |
|
WaseemAbbasi22
|
542070c791
|
improvements
|
9 months ago |
|
Sikander Saleem
|
e3857149e7
|
improvements
|
9 months ago |
|
Sikander Saleem
|
7445902564
|
chat attachment added.
|
9 months ago |
|
Sikander Saleem
|
c5b4325aec
|
survey notification finalized.
|
9 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
|
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 |
Sikander Saleem
|
985d559860
|
ppm update button hide for end user. & status color changed.
|
10 months ago |
|
Sikander Saleem
|
ae0e08183f
|
asset group switching added.
|
10 months ago |
|
Sikander Saleem
|
76acdddabc
|
asset by oracle code api added, departments lookup added.
|
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 |
|
Sikander Saleem
|
dfef9aadb7
|
Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module
|
11 months ago |
|
Sikander Saleem
|
a9973047d6
|
improvement
|
11 months ago |
|
WaseemAbbasi22
|
e5775019a4
|
asset inventory design
|
11 months ago |
|
Sikander Saleem
|
4d035e9c46
|
android AGP upgraded & enhancement.
|
11 months ago |
|
Sikander Saleem
|
3ac3c11b4b
|
improvement
|
11 months ago |
|
WaseemAbbasi22
|
423968d7f6
|
timer history added
|
11 months ago |
|
Sikander Saleem
|
f9c7d335e2
|
file format.
|
11 months ago |
|
WaseemAbbasi22
|
e40d9a1138
|
ATOMS-1025, ATOMS-937 and some color fixes for dark mode
|
11 months ago |
|
Sikander Saleem
|
5e9e8dc870
|
assistant employee selection sheet ui improvement.
|
11 months ago |
|
Sikander Saleem
|
7efeeed619
|
bottom sheet ui improvements,safe area added.
|
11 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 |
|
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
|
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
|
19ee892d67
|
app timer, time and date picker color improvements.
|
1 year ago |
|
Sikander Saleem
|
c1b1f37eec
|
asset search loading ui fixed.
|
1 year ago |
|
Sikander Saleem
|
1edcea47be
|
1.3.6+25 merge conflict resolved.
|
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
|
8d9aacb870
|
dark mode fixes
|
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 |