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
|
3 months ago |
Sikander Saleem
|
ff7ee7f8bb
|
user module permission api added. asset inventory switch to user permissions.
|
3 months ago |
Sikander Saleem
|
9eb828cc75
|
Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
3 months ago |
Sikander Saleem
|
e1c06a1857
|
site id improvement
|
3 months ago |
Sikander Saleem
|
59d21ae72e
|
jira 1430 & 1434 & 1437 fixed.
|
3 months ago |
WaseemAbbasi22
|
659f2029dc
|
label changes
|
4 months ago |
Sikander Saleem
|
12e971749e
|
rename Oracle Code-> Name/Oracle Code
|
4 months ago |
Sikander Saleem
|
233dc19030
|
users position added.
|
4 months ago |
Sikander Saleem
|
5c8e1d5763
|
bug fixes.
|
4 months ago |
WaseemAbbasi22
|
c1455378a6
|
bug fixes and improvements
|
4 months ago |
Sikander Saleem
|
3d2e908613
|
traf form validation added.
|
4 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
|
4 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
|
4 months ago |
Sikander Saleem
|
d48fdfaaa5
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation
|
4 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
|
4 months ago |
Sikander Saleem
|
c5c0c51ecb
|
phone number added.
|
4 months ago |
Sikander Saleem
|
eb70aa6e58
|
spelling correct.
|
4 months ago |
Sikander Saleem
|
ee36baaad5
|
transaction date added in asset detail card.
|
4 months ago |
Sikander Saleem
|
dccd5542bf
|
request creation failed bug fix.
|
4 months ago |
Sikander Saleem
|
3c93245e4d
|
census q type changed from int to string.
|
4 months ago |
Sikander Saleem
|
33251cfcff
|
improvements.
|
4 months ago |
WaseemAbbasi22
|
1e901e4c24
|
ATOMS-1374 fixes
|
4 months ago |
WaseemAbbasi22
|
4438d96312
|
ATOMS-1356 fixes
|
4 months ago |
Sikander Saleem
|
d181cce56b
|
improvements.
|
4 months ago |
Sikander Saleem
|
78cec1c69c
|
created date added.
|
4 months ago |
WaseemAbbasi22
|
4a283a685c
|
classification API added
|
4 months ago |
WaseemAbbasi22
|
549e5f4fd9
|
ATOMS-1305 bug fixes
|
4 months ago |
Sikander Saleem
|
866ec5754e
|
improvements
|
4 months ago |
Sikander Saleem
|
985d559860
|
ppm update button hide for end user. & status color changed.
|
4 months ago |
Sikander Saleem
|
c6e66e82e8
|
ppm external type id changed to value.
|
4 months ago |
Sikander Saleem
|
b71207538d
|
assessor dashboard api improvement.
|
4 months ago |
Sikander Saleem
|
8c45d89c3e
|
improvements
|
4 months ago |
Sikander Saleem
|
599da01554
|
traf request item list view added.
|
5 months ago |
Sikander Saleem
|
144951caec
|
traf request creation completed.
|
5 months ago |
Sikander Saleem
|
dd19507fa1
|
add traf payload added.
|
5 months ago |
Sikander Saleem
|
567be98f74
|
improvement.
|
5 months ago |
Sikander Saleem
|
ceee6d689d
|
total working hours added on task detail.
|
5 months ago |
Sikander Saleem
|
76acdddabc
|
asset by oracle code api added, departments lookup added.
|
5 months ago |
Sikander Saleem
|
b17d6db327
|
po number, site, information added in asset details,
|
5 months ago |
WaseemAbbasi22
|
d0565a321a
|
asset number free text field added for existing project and manual project not registered
|
5 months ago |
WaseemAbbasi22
|
f83109d5ca
|
pagination fixes and
|
5 months ago |
Sikander Saleem
|
d3c000004e
|
code improvements
|
5 months ago |
Sikander Saleem
|
56328b81b4
|
traf module added, create, view details, update. cont
|
5 months ago |
WaseemAbbasi22
|
8578319cc3
|
asset inventory module ready for qa
|
5 months ago |
WaseemAbbasi22
|
c19fdb173b
|
api integrated for main views
|
5 months ago |
Sikander Saleem
|
f9b101c233
|
improvement.
|
5 months ago |
Sikander Saleem
|
dfef9aadb7
|
Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module
|
5 months ago |
WaseemAbbasi22
|
e5775019a4
|
asset inventory design
|
5 months ago |
Sikander Saleem
|
4d035e9c46
|
android AGP upgraded & enhancement.
|
5 months ago |
Sikander Saleem
|
88f64e2297
|
comment bug fixed, on time picker.
|
5 months ago |