Commit Graph

256 Commits (e544fc640e3580dd8aaf30aa1b0b2e95e2f9e6d0)

Author SHA1 Message Date
Sikander Saleem 290cdf29d8 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/cm_module/cm_detail_page.dart
#	lib/modules/cx_module/chat/chat_page.dart
2 months ago
Sikander Saleem 8e29c84c70 loan improvements. 2 months ago
waseemabbasi22 2962f248e0 timer fixes 2 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 2 months ago
Sikander Saleem e7e0f7375c chat fix when contact persons list is empty. 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 e76067bdac LoanTypeId param 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 05d9224a08 Merge remote-tracking branch 'origin/design_3.0_loan_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
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 60125bb6d9 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 2 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
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 c02fc2f1b1 api integration inprogress 2 months ago
waseemabbasi22 7291d1b4d8 Merge branch 'design_3.0_traf_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
2 months ago
Sikander Saleem bbeabda38d parameter added for push notifications. 2 months ago
waseemabbasi22 0ffc0f650f improvements 2 months ago
waseemabbasi22 c4160ff98b improvements 2 months ago
WaseemAbbasi22 a2453e8c88 loan form desing created 2 months ago
Sikander Saleem 4f78e23922 chat widget finalized. 2 months ago
WaseemAbbasi22 542070c791 improvements 2 months ago
WaseemAbbasi22 255691f47a loan design in progress 2 months ago
Sikander Saleem e1c06a1857 site id improvement 2 months ago
Sikander Saleem 59d21ae72e jira 1430 & 1434 & 1437 fixed. 2 months ago
Sikander Saleem e3857149e7 improvements 2 months ago
Sikander Saleem 1f074b33e5 chat finalized. 2 months ago
Sikander Saleem c31771aaa7 chat improvements 2 months ago
Sikander Saleem e52caee730 chat improvements 2 months ago
Sikander Saleem f3aa929cb1 view all attachments added. 2 months ago
Sikander Saleem 7445902564 chat attachment added. 2 months ago
Sikander Saleem c5b4325aec survey notification finalized. 2 months ago
Sikander Saleem 186987c5ce chat flow improvement and connect to SignalR. 2 months ago
Sikander Saleem 781e61814a survey questionare finalized. 2 months ago
Sikander Saleem db1e7ea0bd 1 to 1 chat ui completed for text message, with 2 users. 2 months ago
Sikander Saleem a902204ff1 survey improvements. 2 months ago
WaseemAbbasi22 659f2029dc label changes 2 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 2 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 2 months ago
Sikander Saleem 1cc5ebd9fb survey question cont. 2 months ago
Sikander Saleem bcfa23bad3 chat message ui completed for sender and recipient. 2 months ago
Sikander Saleem 01f004cecc chat development cont. 2 months ago
Sikander Saleem ec28f8992c chat cont. 2 months ago
Sikander Saleem 12e971749e rename Oracle Code-> Name/Oracle Code 2 months ago
Sikander Saleem 233dc19030 users position added. 2 months ago
Sikander Saleem 5c8e1d5763 bug fixes. 2 months ago
WaseemAbbasi22 c1455378a6 bug fixes and improvements 2 months ago
Sikander Saleem 3d2e908613 traf form validation added. 2 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 2 months ago
Sikander Saleem d2665fd10f chat provider , api client added. 3 months ago
WaseemAbbasi22 81dd799672 internal audit api's implementation in progress 3 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 3 months ago
Sikander Saleem 3b6a0eea3c voice note ui added. 3 months ago
Sikander Saleem 96b65e99fa chat list ui added-1. 3 months ago
Sikander Saleem 18a53d7518 chat list ui added. 3 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
3 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
3 months ago
Sikander Saleem d48fdfaaa5 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation 3 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
3 months ago
Sikander Saleem c5c0c51ecb phone number added. 3 months ago
Sikander Saleem eb70aa6e58 spelling correct. 3 months ago
Sikander Saleem ee36baaad5 transaction date added in asset detail card. 3 months ago
Sikander Saleem dccd5542bf request creation failed bug fix. 3 months ago
Sikander Saleem 3c93245e4d census q type changed from int to string. 3 months ago
Sikander Saleem 33251cfcff improvements. 3 months ago
WaseemAbbasi22 1e901e4c24 ATOMS-1374 fixes 3 months ago
WaseemAbbasi22 4438d96312 ATOMS-1356 fixes 3 months ago
Sikander Saleem d181cce56b improvements. 3 months ago
WaseemAbbasi22 09843a9625 Ui Changes 3 months ago
Sikander Saleem 78cec1c69c created date added. 3 months ago
WaseemAbbasi22 4a283a685c classification API added 3 months ago
WaseemAbbasi22 549e5f4fd9 ATOMS-1305 bug fixes 3 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 c6e66e82e8 ppm external type id changed to value. 3 months ago
Sikander Saleem b71207538d assessor dashboard api improvement. 3 months ago
Sikander Saleem 8c45d89c3e improvements 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 dd19507fa1 add traf payload added. 3 months ago
Sikander Saleem 567be98f74 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
WaseemAbbasi22 d0565a321a asset number free text field added for existing project and manual project not registered 3 months ago
WaseemAbbasi22 f83109d5ca pagination fixes and 3 months ago
Sikander Saleem d3c000004e code improvements 4 months ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 4 months ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 4 months ago
WaseemAbbasi22 c19fdb173b api integrated for main views 4 months ago
Sikander Saleem f9b101c233 improvement. 4 months ago
Sikander Saleem dfef9aadb7 Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module 4 months ago