-design completed

design_3.0_latest
muhammad.abbasi 1 year ago
parent 53c5240377
commit 8dd596bc35

@ -62,7 +62,6 @@ class ServiceRequestsProvider extends ChangeNotifier {
List<SparePartsWorkOrders> _sparePartList = [];
SparePartsWorkOrders _initialSelectedSparePart = SparePartsWorkOrders();
ServiceRequest? _currentSelectedRequest;
int _selectedListIndex = 0;
int get selectedListIndex => _selectedListIndex;
@ -72,10 +71,10 @@ class ServiceRequestsProvider extends ChangeNotifier {
notifyListeners();
}
ServiceRequest? get currentSelectedRequest => _currentSelectedRequest;
ServiceRequest? currentSelectedRequest;
set currentSelectedRequest(ServiceRequest? value) {
_currentSelectedRequest = value;
void updateCurrentSelectedRequest(ServiceRequest? value) {
currentSelectedRequest = value;
notifyListeners();
}
@ -326,10 +325,10 @@ class ServiceRequestsProvider extends ChangeNotifier {
"status": request.statusId == null
? null
: {
"id": request.statusId,
"name": request.statusLabel,
"value": request.statusValue,
},
"id": request.statusId,
"name": request.statusLabel,
"value": request.statusValue,
},
"callLastSituation": null,
"firstAction": request.firstAction?.toJson(),
"loanAvailablity": request.loanAvailability?.toJson(),
@ -614,18 +613,18 @@ class ServiceRequestsProvider extends ChangeNotifier {
Future<ServiceRequest?> getServiceRequestObjectById({required String requestId}) async {
// try {
isDetialLoading = true;
Response response = await ApiManager.instance.get(URLs.getServiceRequestById + "?callRequestId=$requestId");
if (response.statusCode >= 200 && response.statusCode < 300) {
isDetialLoading = false;
return ServiceRequest.fromJson(json.decode(response.body)["data"]);
} else {
isDetialLoading = false;
return null;
}
// } catch (error) {
isDetialLoading = true;
Response response = await ApiManager.instance.get(URLs.getServiceRequestById + "?callRequestId=$requestId");
if (response.statusCode >= 200 && response.statusCode < 300) {
isDetialLoading = false;
return ServiceRequest.fromJson(json.decode(response.body)["data"]);
} else {
isDetialLoading = false;
return null;
}
// } catch (error) {
isDetialLoading = false;
return null;
// }
}
@ -653,11 +652,11 @@ class ServiceRequestsProvider extends ChangeNotifier {
}
Future<List<SearchWorkOrder>> searchForWorkOrders(
SearchWorkOrder search,
String callerId,
Lookup dateOperator,
String site,
) async {
SearchWorkOrder search,
String callerId,
Lookup dateOperator,
String site,
) async {
Response response;
try {
var body = {

@ -180,6 +180,34 @@ class ServiceRequest {
}
return true;
}
Map<String, dynamic> toFixRemotelyJson() {
return {'workOrderId': id, 'startDate': startDate, 'endDate': endDate, 'workingHour': workingHours, 'comment': comments};
}
//TODO feedback not defined...
Map<String, dynamic> toMarkAsFixedJson() {
return {'workOrderId': id, 'feedback': comments};
}
Map<String, dynamic> toNeedVisitJson() {
return {'workOrderId': id, 'visitDate': visitDate, 'comment': comments};
}
//TODO signatureNurse not defined...
Map<String, dynamic> toNurseActionJson() {
return {'workOrderId': id, 'feedback': comments, 'signatureNurse': 'signatureNurse'};
}
//TODO workOrder fields not defined...
Map<String, dynamic> toWorkOrderJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data['workOrderId'] = id;
data['equipmentStatusId'] = statusValue;
data['returnToService'] = 're';
data['serviceTypeId'] = 'se';
data['loanAvailabilityId'] = loanAvailability;
data['loanAssetId'] = loanAvailability?.id;
data['failureReasonId'] = faultDescription?.id;
data['faultDescriptionId'] = 'faultDescriptionId';
data['solution'] = 'solution';
return data;
}
}
class CallCreatedBy {

@ -15,6 +15,7 @@ import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/service_request_latest/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart';
import 'package:test_sa/service_request_latest/views/components/initial_visit_card.dart';
import 'package:test_sa/service_request_latest/views/components/timer_widget.dart';
import 'package:test_sa/service_request_latest/views/forms/asset_retired/asset_retired.dart';
@ -109,7 +110,7 @@ class _RequestDetailViewState extends State<RequestDetailView> {
),
),
FooterActionButton.requestDetailsFooterWidget(status: 7, context: context),
TimerWidget(),
const TimerWidget(),
],
),
);
@ -331,7 +332,7 @@ class _RequestDetailViewState extends State<RequestDetailView> {
showBorder: true,
onPressed: () async {
// Navigator.push(context, MaterialPageRoute(builder: (context) => AssetRetired()));
Navigator.push(context, MaterialPageRoute(builder: (context) => const CreateNewRequest()));
ServiceRequestBottomSheet.initialVisitBottomSheet(context: context);
}),
);
}

Loading…
Cancel
Save