improvements

merge-requests/30/head
Sikander Saleem 3 years ago
parent 29181aa965
commit ecb8d1e1a7

@ -154,7 +154,7 @@ class ServiceReport {
factory ServiceReport.fromJson(Map<String, dynamic> parsedJson, int id) { factory ServiceReport.fromJson(Map<String, dynamic> parsedJson, int id) {
List<Part> _parts = []; List<Part> _parts = [];
if (parsedJson["sparePartsWorkOrders"] != null) { if (parsedJson["sparePartsWorkOrders"] != null) {
if (parsedJson["sparePartsWorkOrders"][0]["id"] != null) { if ((parsedJson["sparePartsWorkOrders"]as List ).isNotEmpty && parsedJson["sparePartsWorkOrders"][0]["id"] != null) {
List partsList = parsedJson["sparePartsWorkOrders"]; List partsList = parsedJson["sparePartsWorkOrders"];
_parts = partsList.map((e) => Part.fromJson(e["sparePart"], reportJson: e)).toList(); _parts = partsList.map((e) => Part.fromJson(e["sparePart"], reportJson: e)).toList();
} }

@ -12,6 +12,7 @@ import 'package:test_sa/models/service_request/service_request.dart';
import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/app_style/sizing.dart';
import 'package:test_sa/views/pages/user/requests/create_request.dart';
import 'package:test_sa/views/pages/user/requests/report/create_service_report.dart'; import 'package:test_sa/views/pages/user/requests/report/create_service_report.dart';
import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
import 'package:test_sa/views/widgets/buttons/app_button.dart'; import 'package:test_sa/views/widgets/buttons/app_button.dart';
@ -84,13 +85,16 @@ class RequestDetailsPage extends StatelessWidget {
buttonSize: 42, buttonSize: 42,
backgroundColor: AColors.green, backgroundColor: AColors.green,
onPressed: () async { onPressed: () async {
showModalBottomSheet( Navigator.of(context).push(
context: context, MaterialPageRoute(builder: (_) => CreateRequestPage(serviceRequest: serviceRequest)),
builder: (context) { );
return ServiceRequestsUpdateDialog( // showModalBottomSheet(
request: serviceRequest, // context: context,
); // builder: (context) {
}); // return ServiceRequestsUpdateDialog(
// request: serviceRequest,
// );
// });
// DateTime picked = await showDatePicker( // DateTime picked = await showDatePicker(
// context: context, // context: context,
// initialDate: DateTime.now(), // initialDate: DateTime.now(),
@ -302,6 +306,7 @@ class RequestDetailsPage extends StatelessWidget {
future: _serviceRequestsProvider.searchWorkOrders(callId: serviceRequest.requestCode), future: _serviceRequestsProvider.searchWorkOrders(callId: serviceRequest.requestCode),
builder: (context, snap) { builder: (context, snap) {
workOrders = snap.data as List<SearchWorkOrders>; workOrders = snap.data as List<SearchWorkOrders>;
if (snap.connectionState == ConnectionState.waiting) return Center(child: CircularProgressIndicator());
if (snap.connectionState == ConnectionState.done && (snap.data?.length ?? 0) != 0) { if (snap.connectionState == ConnectionState.done && (snap.data?.length ?? 0) != 0) {
return ListView.separated( return ListView.separated(
padding: EdgeInsets.all(21), padding: EdgeInsets.all(21),

Loading…
Cancel
Save