 Sikander Saleem
|
ff7ee7f8bb
|
user module permission api added. asset inventory switch to user permissions.
|
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 |
|
Sikander Saleem
|
e1c06a1857
|
site id improvement
|
9 months ago |
|
Sikander Saleem
|
59d21ae72e
|
jira 1430 & 1434 & 1437 fixed.
|
9 months ago |
 WaseemAbbasi22
|
a8e8774040
|
internal audit api's implementation in progress
|
10 months ago |
|
Sikander Saleem
|
e54167b9b0
|
getUsersBasedOnSearch api for nurse role only.
|
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 |
|
WaseemAbbasi22
|
cbddd807d4
|
internal audit design complete
|
10 months ago |
|
Sikander Saleem
|
40c7e75fa4
|
assessor role added for TRAF.
|
10 months ago |
|
Sikander Saleem
|
ae0e08183f
|
asset group switching added.
|
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
|
4e28068eef
|
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
|
e5775019a4
|
asset inventory design
|
11 months ago |
|
Sikander Saleem
|
89b81391e9
|
site contact list api added.
|
11 months ago |
|
WaseemAbbasi22
|
ccef98860f
|
recall and alert type request added
|
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
|
4e665d1959
|
attachment fixes
|
1 year ago |
Sikander Saleem
|
262b3aa42f
|
local auth fail handling and improvements.
|
1 year ago |
|
WaseemAbbasi22
|
32627bbda1
|
form fixes
|
1 year ago |
|
Sikander Saleem
|
456432050d
|
timezone header added, update ppm error flow improvement.
|
1 year ago |
|
Sikander Saleem
|
f3f09d1eb2
|
timer improvements
|
1 year ago |
|
Sikander Saleem
|
0b0f2ba25c
|
improvements.
|
1 year ago |
|
Sikander Saleem
|
40c37f5373
|
profile contact detail update added.
|
1 year ago |
|
WaseemAbbasi22
|
aa11d93409
|
update user contact info bottomsheet design and statedate time initial value added
|
1 year ago |
|
Sikander Saleem
|
62dd395a73
|
timer picker added, and code improvements
|
1 year ago |
|
Sikander Saleem
|
13be4e960a
|
notification issue, otp issue fixed.
|
1 year ago |
|
WaseemAbbasi22
|
8ae51480f9
|
added nurse signature for device transfer request and tested on uat
|
1 year ago |
|
WaseemAbbasi22
|
56c70671d8
|
add contact and created by information for asset transfer and gasrefill request
|
1 year ago |
|
WaseemAbbasi22
|
06e8831d02
|
add label for destination site details
|
1 year ago |
|
WaseemAbbasi22
|
b320e3751a
|
add code for nurse edit gas refill request
|
1 year ago |
|
WaseemAbbasi22
|
e3531d471d
|
ATOMS-783 fixed
|
1 year 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
|
1 year ago |
|
WaseemAbbasi22
|
72823e37f8
|
bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed
|
1 year ago |
|
Sikander Saleem
|
3ee2b66fbf
|
code clean, unused files removed.
|
1 year 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
|
1 year ago |
|
WaseemAbbasi22
|
9edaca4326
|
task request module flow completed and tested with backend
|
1 year 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
|
1 year ago |
|
WaseemAbbasi22
|
71ee34c658
|
gas refill attachment and device transfer assistant employee issue fixes
|
1 year ago |
|
Sikander Saleem
|
e66ae78c83
|
files format
|
1 year ago |
|
Sikander Saleem
|
015b73b634
|
ponit 87 fixed.
|
1 year ago |
|
WaseemAbbasi22
|
2291350d6f
|
added request type for task requests
|
1 year ago |
|
WaseemAbbasi22
|
6795ba7f72
|
device transfer gas refill merged in ppm_newflow
|
1 year 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
|
1 year ago |
|
WaseemAbbasi22
|
5031c3cbb8
|
gas refill fixes
|
1 year ago |
|
WaseemAbbasi22
|
ab91baf216
|
bug fixes mentioned on excel sheet and tested with backend
|
1 year 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
|
1 year ago |
|
WaseemAbbasi22
|
be8c83cc8f
|
Asset tranfer api integrated ready to test
|
1 year ago |
|
Sikander Saleem
|
ef50f37a15
|
bug 703 fixed.
|
1 year ago |
|
WaseemAbbasi22
|
6bd888e06a
|
Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
|
1 year ago |
|
WaseemAbbasi22
|
152a0795c6
|
add and update gas refill ui and api integrated
|
1 year ago |
|
Sikander Saleem
|
4a7f1eb037
|
ppm improvement, recurrent task improvement
|
1 year ago |
|
WaseemAbbasi22
|
3f90630db9
|
gas refill and asset transfer ui completed waiting for api
|
1 year ago |
|
Sikander Saleem
|
edd22bf4af
|
stop working hide for nurse.
|
2 years ago |
|
Sikander Saleem
|
8fe01adcb0
|
ppm pm kits improvement
|
2 years ago |
|
Sikander Saleem
|
58c0f176a6
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
|
2 years ago |
|
WaseemAbbasi22
|
7df18179a1
|
ppm task supplier ui completed and save and update api implemented
|
2 years ago |
|
Sikander Saleem
|
4c328b2cba
|
recurrent task timer improvements.
|
2 years ago |
|
WaseemAbbasi22
|
b67e6dea11
|
Recurrent Work Order Complete ready to test
|
2 years ago |
|
Sikander Saleem
|
28b30d9fa8
|
ppm data model upgraded.
|
2 years ago |
|
Sikander Saleem
|
84dd801ed1
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
# Conflicts:
# lib/views/pages/user/ppm/ppm_details_page.dart
# lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart
|
2 years ago |
|
Sikander Saleem
|
2cd5777f55
|
ppm model improvement.
|
2 years ago |
|
WaseemAbbasi22
|
7b620b9f6e
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
|
2 years ago |
|
WaseemAbbasi22
|
ce1044f201
|
timer and working hours issue fixes
|
2 years ago |
|
Sikander Saleem
|
0a8b3314ce
|
unsafe device added, swipe only added, force update added,
|
2 years ago |
|
WaseemAbbasi22
|
ecaf58fcdc
|
Merge branch 'refs/heads/design_3.0_non_hmg_emp_flow' into design_3.0_ppm_new_flow
# Conflicts:
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
# lib/new_views/pages/land_page/widgets/request_item_view_list.dart
|
2 years ago |
|
WaseemAbbasi22
|
d181c81029
|
save and complete api integrated for recurrent task
|
2 years ago |
|
WaseemAbbasi22
|
99bcae1dc2
|
recurrent task api integrated
|
2 years ago |
|
WaseemAbbasi22
|
c15cec364d
|
Gas refill and Asset Transfer attributes addition done
|
2 years ago |
|
WaseemAbbasi22
|
a5876ec1d3
|
swipe module added
|
2 years ago |
|
WaseemAbbasi22
|
ba50ed5809
|
add swipe and forget password apis
|
2 years ago |
|
Sikander Saleem
|
561881c7f2
|
non hmg employee cont-1
|
2 years ago |
|
Sikander Saleem
|
f3d52eef52
|
bug fixes
|
2 years ago |
|
WaseemAbbasi22
|
c1ec32fa33
|
bug fixes
|
2 years ago |
|
WaseemAbbasi22
|
4c9a730e24
|
all the changes are implemented
|
2 years ago |
|
muhammad.abbasi
|
fbdbdf67a0
|
improvements
|
2 years ago |
|
muhammad.abbasi
|
77d18bd413
|
add maintenance request completed
|
2 years ago |
|
muhammad.abbasi
|
e8dc052d02
|
integrating api in new flow
|
2 years ago |
|
muhammad.abbasi
|
acbf33e2a2
|
Merge branch 'refs/heads/design_3.0_sdk_upgrade' into design_3.0_waseem_dev
# Conflicts:
# lib/service_request_latest/views/components/request_detail_view.dart
|
2 years ago |
|
muhammad.abbasi
|
8dd596bc35
|
-design completed
|
2 years ago |
|
Sikander Saleem
|
69ae0147bb
|
Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
# lib/dashboard_latest/dashboard_provider.dart
# lib/dashboard_latest/dashboard_view.dart
# lib/dashboard_latest/widgets/progress_fragment.dart
# lib/dashboard_latest/widgets/requests_fragment.dart
# lib/new_views/app_style/app_color.dart
# lib/service_request_latest/request_detail_provider.dart
# lib/service_request_latest/views/components/request_detail_view.dart
# lib/service_request_latest/views/request_detail_main_view.dart
|
2 years ago |
|
Sikander Saleem
|
0d333fa688
|
dashboard screen & service detail screen, flow changed.
|
2 years ago |
|
muhammad.abbasi
|
d99a083792
|
bug fixes
|
2 years ago |
|
Sikander Saleem
|
f694252828
|
null safety conversion after merge.
|
2 years ago |
|
Sikander Saleem
|
0d876a41fc
|
Merge remote-tracking branch 'refs/remotes/origin/design_3.0_waseem' into design_3.0_sdk_upgrade
# Conflicts:
# lib/controllers/providers/api/service_requests_provider.dart
# lib/dashboard_latest/dashboard_view.dart
# lib/dashboard_latest/widgets/progress_fragment.dart
# lib/extensions/text_extensions.dart
# lib/models/lookup.dart
# lib/new_views/app_style/app_themes.dart
# lib/new_views/common_widgets/app_bottom_nav_bar.dart
# lib/new_views/common_widgets/app_dashed_button.dart
# lib/new_views/common_widgets/app_filled_button.dart
# lib/new_views/pages/land_page/land_page.dart
# lib/new_views/pages/land_page/requests_list_page.dart
# lib/providers/work_order/reason_provider.dart
# lib/service_request_latest/views/components/bottom_sheets/action_bottomsheet.dart
# lib/service_request_latest/views/components/bottom_sheets/activity_type_bottomsheet.dart
# lib/service_request_latest/views/components/bottom_sheets/initial_visit_bottomsheet.dart
# lib/service_request_latest/views/components/bottom_sheets/reject_request_bottomsheet.dart
# lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
# lib/service_request_latest/views/components/request_detail_view.dart
# lib/service_request_latest/views/components/verify_arrival_view.dart
# lib/service_request_latest/views/forms/spare_part/spare_part_request.dart
# lib/utilities/general_utils.dart
# lib/views/widgets/date_and_time/date_picker.dart
# lib/views/widgets/date_and_time/time_picker.dart
# lib/views/widgets/e_signature/e_signature.dart
# lib/views/widgets/images/multi_image_picker.dart
# pubspec.yaml
|
2 years ago |
|
muhammad.abbasi
|
d13f3e3551
|
Ui updated
|
2 years ago |