initial testing

design_3.0_latest
muhammad.abbasi 1 year ago
parent cc9b993de7
commit 473b26036e

@ -0,0 +1,3 @@
description: This file stores settings for Dart & Flutter DevTools.
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
extensions:

@ -17,7 +17,7 @@ class FixRemotelyHelperModel {
} }
class WorkOrderHelperModel { class WorkOrderHelperModel {
int? assetId; num? assetId;
int? equipmentStatusId; int? equipmentStatusId;
int? priorityId; int? priorityId;
int? problemDescriptionId; int? problemDescriptionId;

@ -47,7 +47,7 @@ class AppBottomNavigationBar extends StatelessWidget {
icon: iconName icon: iconName
.toSvgAsset( .toSvgAsset(
width: showLabel ? 28 : 38, width: showLabel ? 28 : 38,
height: showLabel ? 26 : 40, height: showLabel ? 26 : 37,
color: showLabel || (showLabel && selectedIndex != 2) color: showLabel || (showLabel && selectedIndex != 2)
? selectedIndex == index ? selectedIndex == index
? Theme.of(context).bottomNavigationBarTheme.selectedItemColor ? Theme.of(context).bottomNavigationBarTheme.selectedItemColor

@ -107,6 +107,7 @@ class _LandPageState extends State<LandPage> {
})), })),
// const old_page.LandPage(), // const old_page.LandPage(),
const MyRequestsPage(), const MyRequestsPage(),
if(_userProvider!.user!.type != UsersTypes.engineer) const CreateNewRequest(),
// if (_userProvider!.user!.type != UsersTypes.engineer) const CalendarPage(), // if (_userProvider!.user!.type != UsersTypes.engineer) const CalendarPage(),
const MyAssetsPage(fromBottomBar: true), const MyAssetsPage(fromBottomBar: true),
]; ];
@ -135,9 +136,7 @@ class _LandPageState extends State<LandPage> {
selectedIndex: currentPageIndex, selectedIndex: currentPageIndex,
onPressed: (index) { onPressed: (index) {
bool isEngineer = _userProvider!.user!.type == UsersTypes.engineer; bool isEngineer = _userProvider!.user!.type == UsersTypes.engineer;
if(!isEngineer&&index==2){
Navigator.push(context, MaterialPageRoute(builder: (context)=>const CreateNewRequest()));
}
if (index == (!isEngineer ? 4 : 3)) { if (index == (!isEngineer ? 4 : 3)) {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,

@ -12,6 +12,7 @@ import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_models.dart'; import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_models.dart';
import 'package:test_sa/models/lookup.dart';
import 'package:test_sa/models/service_request/pending_service_request_model.dart'; import 'package:test_sa/models/service_request/pending_service_request_model.dart';
import 'package:test_sa/models/service_request/service_request.dart'; import 'package:test_sa/models/service_request/service_request.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
@ -239,7 +240,6 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
pendingAssetServiceRequest = null; pendingAssetServiceRequest = null;
_serviceRequest.device = asset; _serviceRequest.device = asset;
await checkAssetForPendingServiceRequest(asset.id!.toInt()); await checkAssetForPendingServiceRequest(asset.id!.toInt());
if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) { if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) {
showPendingRequestBottomSheet(); showPendingRequestBottomSheet();
} }
@ -253,8 +253,9 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
children: [ children: [
context.translation.highPriority.bodyText(context).custom(color: AppColor.black20), context.translation.highPriority.bodyText(context).custom(color: AppColor.black20),
Consumer<PriorityProvider>(builder: (cxt, snapshot, _) { Consumer<PriorityProvider>(builder: (cxt, snapshot, _) {
_serviceRequest.priority ??= snapshot.items.firstWhere((element) => element.value == 0, orElse: null); if(snapshot.items.isNotEmpty){
_serviceRequest.priority ??= snapshot.items.firstWhere((element) => element.value == 0, orElse: () => Lookup());
}
return CupertinoSwitch( return CupertinoSwitch(
thumbColor: AppColor.red70, thumbColor: AppColor.red70,
activeColor: AppColor.red30.withOpacity(0.4), activeColor: AppColor.red30.withOpacity(0.4),
@ -361,7 +362,7 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
attachement.add(WorkOrderAttachments(id: 0, name: "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}")); attachement.add(WorkOrderAttachments(id: 0, name: "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}"));
} }
_requestDetailProvider.workOrderHelperModel = WorkOrderHelperModel( _requestDetailProvider.workOrderHelperModel = WorkOrderHelperModel(
assetId: _serviceRequest.deviceId, assetId: _serviceRequest.device?.id,
priorityId: _serviceRequest.priority?.id, priorityId: _serviceRequest.priority?.id,
equipmentStatusId: _serviceRequest.defectType?.id, equipmentStatusId: _serviceRequest.defectType?.id,
voiceNote: _serviceRequest.audio, voiceNote: _serviceRequest.audio,
@ -369,8 +370,12 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
comments: _serviceRequest.callComments, comments: _serviceRequest.callComments,
//add attachments also... //add attachments also...
); );
print('model to add activity is ${_requestDetailProvider.workOrderHelperModel?.toJson()}');
int status = await _requestDetailProvider.createWorkOrder();
if(status==200){
await _requestDetailProvider.createWorkOrder(); }
// await _serviceRequestsProvider.createRequest( // await _serviceRequestsProvider.createRequest(
// context: context, // context: context,

Loading…
Cancel
Save