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
|
1 month ago |
Sikander Saleem
|
5ff9fc5808
|
chat added gas refill, transfer asset internal & external, task request.
|
1 month ago |
Sikander Saleem
|
b407103002
|
Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
|
1 month 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
|
1 month 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
|
1 month 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
|
1 month ago |
Sikander Saleem
|
07ec866315
|
loan attachment added & improvements.
|
2 months ago |
Sikander Saleem
|
ff7ee7f8bb
|
user module permission api added. asset inventory switch to user permissions.
|
2 months ago |
Sikander Saleem
|
22fd3c8cc9
|
loan equipment item view added;
|
2 months ago |
Sikander Saleem
|
60511b60cf
|
files refactoring
|
2 months ago |
Sikander Saleem
|
09762fd278
|
files refactoring
|
2 months ago |
Sikander Saleem
|
1a3861d816
|
files refactoring
|
2 months ago |
Sikander Saleem
|
16a2fa2b26
|
files refactoring
|
2 months ago |
Sikander Saleem
|
62cc13b1c0
|
standard / backup loan request creation.
|
2 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
|
2 months ago |
waseemabbasi22
|
b4943aff3d
|
initial test done
|
2 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
|
2 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
|
2 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
|
2 months ago |
WaseemAbbasi22
|
542070c791
|
improvements
|
2 months ago |
WaseemAbbasi22
|
255691f47a
|
loan design in progress
|
2 months ago |
Sikander Saleem
|
a902204ff1
|
survey improvements.
|
2 months ago |
Sikander Saleem
|
01f004cecc
|
chat development cont.
|
2 months ago |
Sikander Saleem
|
830700ce79
|
grey error fixed on release build.
|
2 months ago |
WaseemAbbasi22
|
81dd189025
|
internal audit api's implementation in progress
|
2 months ago |
WaseemAbbasi22
|
a8e8774040
|
internal audit api's implementation in progress
|
2 months ago |
Sikander Saleem
|
96b65e99fa
|
chat list ui added-1.
|
2 months ago |
Sikander Saleem
|
18a53d7518
|
chat list ui added.
|
2 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
|
2 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
|
2 months ago |
Sikander Saleem
|
d48fdfaaa5
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation
|
2 months ago |
Sikander Saleem
|
46fd537c3a
|
global health ui improvements added.
|
2 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
|
2 months ago |
WaseemAbbasi22
|
cbddd807d4
|
internal audit design complete
|
3 months ago |
Sikander Saleem
|
866ec5754e
|
improvements
|
3 months ago |
Sikander Saleem
|
985d559860
|
ppm update button hide for end user. & status color changed.
|
3 months ago |
Sikander Saleem
|
40c7e75fa4
|
assessor role added for TRAF.
|
3 months ago |
Sikander Saleem
|
599da01554
|
traf request item list view added.
|
3 months ago |
Sikander Saleem
|
144951caec
|
traf request creation completed.
|
3 months ago |
Sikander Saleem
|
174e714d38
|
nurse cannot see recall and alert.
|
3 months ago |
Sikander Saleem
|
dd19507fa1
|
add traf payload added.
|
3 months ago |
Sikander Saleem
|
5d28eb6c21
|
ui improvement.
|
3 months ago |
Sikander Saleem
|
ceee6d689d
|
total working hours added on task detail.
|
3 months ago |
Sikander Saleem
|
76acdddabc
|
asset by oracle code api added, departments lookup added.
|
3 months ago |
Sikander Saleem
|
b17d6db327
|
po number, site, information added in asset details,
|
3 months ago |
Sikander Saleem
|
d3c000004e
|
code improvements
|
3 months ago |
Sikander Saleem
|
56328b81b4
|
traf module added, create, view details, update. cont
|
3 months ago |
WaseemAbbasi22
|
8578319cc3
|
asset inventory module ready for qa
|
3 months ago |
WaseemAbbasi22
|
c19fdb173b
|
api integrated for main views
|
3 months ago |
WaseemAbbasi22
|
e5775019a4
|
asset inventory design
|
3 months ago |