 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
|
594fabd51a
|
uat apk provided
|
7 months ago |
|
Sikander Saleem
|
8f2e9db062
|
existing loan check api added.
|
7 months ago |
 WaseemAbbasi22
|
60051af331
|
Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/modules/demo_module/create_demo_request_page.dart
# lib/modules/demo_module/demo_provider.dart
|
7 months ago |
|
WaseemAbbasi22
|
1e158e8bd4
|
update form changed
|
7 months ago |
|
Sikander Saleem
|
cea77ff7f7
|
evaluation form added.
|
7 months ago |
|
Sikander Saleem
|
3372f7d38d
|
demo attachment document type added.
|
7 months ago |
|
WaseemAbbasi22
|
afa165dc3d
|
added vendor dropdown along with free text
|
7 months ago |
|
WaseemAbbasi22
|
938f5173a4
|
improvements
|
7 months ago |
|
WaseemAbbasi22
|
5d856fc46b
|
improvements
|
7 months ago |
|
WaseemAbbasi22
|
e0ed594072
|
API's implemented
|
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
|
9eaae96c84
|
Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/main.dart
# lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
# lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
# lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
|
7 months ago |
|
Sikander Saleem
|
178309eb1e
|
Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/main.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
|
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
|
4bd055cfe8
|
merge conflict resolved.
|
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 |
|
WaseemAbbasi22
|
1c86fe71a2
|
improvements and added modifiedBy details
|
7 months ago |
|
WaseemAbbasi22
|
ac50236aa2
|
bugs fixes
|
7 months ago |
|
Sikander Saleem
|
7a5db103e0
|
api integrate cont.
|
7 months ago |
|
WaseemAbbasi22
|
3c9688fdcb
|
delivery notes item design updated
|
7 months ago |
|
WaseemAbbasi22
|
3944a549b2
|
requested changes done
|
7 months ago |
|
Sikander Saleem
|
45d736a64e
|
app release v1.5.0+32 to stores
|
8 months ago |
|
WaseemAbbasi22
|
e303b4e099
|
chat bug fixes
|
8 months ago |
|
WaseemAbbasi22
|
077095502e
|
chat count implemented
|
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
|
c2068544db
|
Medical Gas Inspection completed
|
8 months ago |
|
Sikander Saleem
|
6d6be40b9e
|
chat notification redirection added.
|
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
|
1ebd6f2fbc
|
Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
# lib/controllers/providers/api/all_requests_provider.dart
|
8 months ago |
|
Sikander Saleem
|
b3f8dabf2f
|
Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
|
8 months ago |
|
Sikander Saleem
|
17210195db
|
uat improvements. md->department, enable recall and alert for quality user.
|
8 months ago |
|
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
|
8 months ago |
|
Sikander Saleem
|
58ff17e008
|
Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
8 months ago |
|
Sikander Saleem
|
7d7a34a6d5
|
Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
|
8 months ago |
|
Sikander Saleem
|
16de0eaa41
|
Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
8 months ago |
|
Sikander Saleem
|
e1efd59252
|
request no, md and site details, remove item if no finding selected and dashboard api added for quality user.
|
8 months ago |
|
Sikander Saleem
|
4b991d807c
|
v1.4.0+31 uploaded on stores.
|
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 |
|
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
|
9 months 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
|
9 months ago |
|
Sikander Saleem
|
05e97a5c47
|
apk provided for pre-release.
|
9 months ago |
|
Sikander Saleem
|
7cdd3aa58a
|
dev to uat env
|
9 months ago |
waseemabbasi22
|
2962f248e0
|
timer fixes
|
9 months ago |
|
Sikander Saleem
|
07ec866315
|
loan attachment added & improvements.
|
9 months ago |
|
Sikander Saleem
|
ff7ee7f8bb
|
user module permission api added. asset inventory switch to user permissions.
|
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 |
|
waseemabbasi22
|
de48ca97bd
|
initial test done
|
9 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
|
9 months ago |
|
waseemabbasi22
|
b4943aff3d
|
initial test done
|
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
|
92a94577d5
|
merge conflict resolved.
|
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 |
|
Sikander Saleem
|
7445902564
|
chat attachment added.
|
9 months ago |
|
Sikander Saleem
|
c5b4325aec
|
survey notification finalized.
|
9 months ago |
|
Sikander Saleem
|
186987c5ce
|
chat flow improvement and connect to SignalR.
|
9 months ago |
|
Sikander Saleem
|
781e61814a
|
survey questionare finalized.
|
9 months ago |
|
Sikander Saleem
|
47e68b8cc3
|
switch to dev.
|
9 months ago |
|
Sikander Saleem
|
a902204ff1
|
survey improvements.
|
9 months ago |
|
WaseemAbbasi22
|
a04ae0c833
|
attachment fixes
|
9 months ago |
|
Sikander Saleem
|
9d7c3a38b2
|
chat connection improvements
|
9 months ago |
|
Sikander Saleem
|
37ff2b4f4a
|
APK to provided to FM with fixed tracker issues.
|
9 months ago |
|
Sikander Saleem
|
1cc5ebd9fb
|
survey question cont.
|
9 months ago |
|
Sikander Saleem
|
bcfa23bad3
|
chat message ui completed for sender and recipient.
|
9 months ago |
|
Sikander Saleem
|
01f004cecc
|
chat development cont.
|
9 months ago |
|
Sikander Saleem
|
ec28f8992c
|
chat cont.
|
9 months ago |
|
Sikander Saleem
|
675c1fa10b
|
for uat
|
9 months ago |
|
WaseemAbbasi22
|
c1455378a6
|
bug fixes and improvements
|
9 months ago |
|
WaseemAbbasi22
|
81dd189025
|
internal audit api's implementation in progress
|
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 |
|
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 |
|
WaseemAbbasi22
|
4a283a685c
|
classification API added
|
10 months ago |
|
Sikander Saleem
|
8c1c865759
|
temporary server added.
|
10 months ago |
|
Sikander Saleem
|
a763538771
|
temporary server added.
|
10 months ago |
|
Sikander Saleem
|
4f2cb42a3f
|
temporary server added.
|
10 months ago |
|
WaseemAbbasi22
|
cbddd807d4
|
internal audit design complete
|
10 months ago |
|
Sikander Saleem
|
866ec5754e
|
improvements
|
10 months ago |
Sikander Saleem
|
ea54aea1f6
|
1.3.11+30 uploaded on stores.
|
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
|
7c367ba614
|
Apk provided to QA.
|
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 |