implement searchWorkOrders api and edit on ui

merge-requests/29/head
nextwo 2 years ago
parent 8b7b40b0af
commit 4e89566d1f

@ -137,7 +137,6 @@
"workPerformed": "العمل انجز",
"actualDate": "تاريخ الفعلي",
"done": "تم الانتهاء",
"expectDate": "التاريخ المتوقع",
"images": "الصور",
"imagesRequired": "الصور مطلوبة",
@ -195,8 +194,7 @@
"assetName": "اسم الاصل",
"site": "الموقع",
"maintenanceSituation": "موقع الصيانه",
"currentSituation": "الموقع الحالي"
"duplicateRequest": "تكرار الطلب",
"currentSituation": "الموقع الحالي",
"comment" : "تعليق",
"updateServiceRequest" : "تعديل طلب الخدمة"
}

@ -136,7 +136,6 @@
"workPerformed": "Work Performed",
"actualDate": "Actual Date",
"done": "Done",
"expectDate": "Expect Date",
"images": "Images",
"imagesRequired": "Images Required",
@ -198,6 +197,5 @@
"duplicateRequest": "Duplicate Request",
"comment" : "Comment",
"updateServiceRequest" : "Update Service Request"
"duplicateRequest": "Duplicate Request"
}

@ -76,7 +76,7 @@ class User {
}
UsersTypes get type {
switch (userRoles.first.name) {
switch (userRoles?.first?.name) {
case "Engineer":
return UsersTypes.engineer;
case "Hospital":
@ -157,11 +157,8 @@ class User {
password = json['password'];
token = json['token'];
roles = json['roles'];
if (json['userRoles'] != null) {
userRoles = [];
json['userRoles'].forEach((v) {
userRoles.add(UserRoles.fromJson(v));
});
if (userRoles != null) {
json['userRoles'] = userRoles.map((v) => v.toJson()).toList();
}
tokenlife = json['tokenlife'];
isAuthenticated = json['isAuthenticated'];

@ -12,18 +12,18 @@ import 'package:test_sa/views/widgets/loaders/app_loading.dart';
import 'package:test_sa/views/widgets/loaders/failed_loading.dart';
import 'edit_service_report.dart';
class FutureServiceReport extends StatefulWidget {
final ServiceRequest request;
final SearchWorkOrders workOrder;
const FutureServiceReport({Key key, this.request,this.workOrder}) : super(key: key);
const FutureServiceReport({Key key, this.request, this.workOrder}) : super(key: key);
@override
_FutureServiceReportState createState() => _FutureServiceReportState();
}
class _FutureServiceReportState extends State<FutureServiceReport> {
UserProvider _userProvider;
SettingProvider _settingProvider;
@override
@ -33,19 +33,16 @@ class _FutureServiceReportState extends State<FutureServiceReport> {
Subtitle _subtitle = AppLocalization.of(context).subtitle;
return Scaffold(
body: FutureBuilder<ServiceReport>(
future: ServiceRequestsProvider().getSingleServiceReport(
reportId: widget.workOrder.id,
user: _userProvider.user,
host: _settingProvider.host,
subtitle: _subtitle
),
builder: (BuildContext context, AsyncSnapshot<ServiceReport> snapshot){
if(snapshot.hasError)
future: ServiceRequestsProvider().getSingleServiceReport(reportId: widget.workOrder.id, user: _userProvider.user, host: _settingProvider.host, subtitle: _subtitle),
builder: (BuildContext context, AsyncSnapshot<ServiceReport> snapshot) {
if (snapshot.hasError)
return FailedLoading(
message: snapshot.error.toString(),
onReload: (){setState(() {});},
onReload: () {
setState(() {});
},
);
if(snapshot.hasData){
if (snapshot.hasData) {
return EditServiceReport(
report: snapshot.data,
request: widget.request,

Loading…
Cancel
Save