diff --git a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart index 38a3265a..b19dac6d 100644 --- a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart +++ b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart @@ -9,11 +9,16 @@ import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/pages/land_page/widgets/request_item_view_list.dart'; +import '../../../../controllers/providers/api/user_provider.dart'; +import '../../../../models/enums/user_types.dart'; + class ProgressFragment extends StatelessWidget { - const ProgressFragment({Key key}) : super(key: key); + ProgressFragment({Key key}) : super(key: key); + UserProvider _userProvider; @override Widget build(BuildContext context) { + _userProvider = Provider.of(context); return Consumer( builder: (context, snapshot, _) { Map statuses = { @@ -82,6 +87,7 @@ class ProgressFragment extends StatelessWidget { // setState(() {}); }, tabs: [ + if(_userProvider.user.type != UsersTypes.engineer) Tab(text: context.translation.open, height: 57.toScreenHeight), Tab(text: context.translation.inProgress, height: 57.toScreenHeight), Tab(text: context.translation.completed, height: 57.toScreenHeight), @@ -91,6 +97,7 @@ class ProgressFragment extends StatelessWidget { 8.height, TabBarView( children: [ + if(_userProvider.user.type != UsersTypes.engineer) RequestItemViewList(snapshot.openRequests?.requestsDetails ?? [], snapshot.isOpenLoading), RequestItemViewList(snapshot.inProgressRequests?.requestsDetails ?? [], snapshot.isInProgressLoading), RequestItemViewList(snapshot.completedRequests?.requestsDetails ?? [], snapshot.isCompleteLoading), diff --git a/lib/new_views/pages/land_page/dashboard_page.dart b/lib/new_views/pages/land_page/dashboard_page.dart index 042da1dd..7f632293 100644 --- a/lib/new_views/pages/land_page/dashboard_page.dart +++ b/lib/new_views/pages/land_page/dashboard_page.dart @@ -124,7 +124,7 @@ class _DashboardPageState extends State { onPageChanged: (index) => setState(() => _currentPage = index), children: [ const RequestsFragment(), - const ProgressFragment(), + ProgressFragment(), RecentActivitiesFragment(), ], ).expanded, diff --git a/lib/views/pages/user/requests/create_service_request_page.dart b/lib/views/pages/user/requests/create_service_request_page.dart index ed1eaea6..843d7ada 100644 --- a/lib/views/pages/user/requests/create_service_request_page.dart +++ b/lib/views/pages/user/requests/create_service_request_page.dart @@ -162,14 +162,16 @@ class CreateServiceRequestPageState extends State { ); }), 8.height, - SingleItemDropDownMenu( + Consumer(builder: (context, snapshot, _){ + return SingleItemDropDownMenu( context: context, title: context.translation.costCodeName, - initialValue: _serviceRequest?.type, - onSelect: (value) { - _serviceRequest.type = value; - }, - ), + enabled: false, + initialValue: snapshot.items?.firstWhere((element) => element.value == 1, orElse: () => null), + // onSelect: (value) { + // _serviceRequest.type = value; + // }, + );}), 8.height, MultiFilesPicker(label: context.translation.attachImage, files: _deviceImages), ((_serviceRequest.devicePhotos?.isNotEmpty ?? false) ? 16 : 8).height, @@ -212,6 +214,7 @@ class CreateServiceRequestPageState extends State { Future _submit() async { _serviceRequest?.requestedThrough = Provider.of(context, listen: false).items?.firstWhere((element) => element.value == 3, orElse: () => null); + _serviceRequest?.type=Provider.of(context, listen: false).items?.firstWhere((element) => element.value == 1, orElse: () => null); if (_formKey.currentState.validate() && await _serviceRequest.validateNewRequest(context)) { _formKey.currentState.save(); _serviceRequest.devicePhotos = _deviceImages.map((e) => _isLocalUrl(e.path) ? "${e.path.split("/").last}|${base64Encode(e.readAsBytesSync())}" : e.path).toList();