Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new

# Conflicts:
#	lib/views/pages/sub_workorder/search_sub_workorder_page.dart
pull/2/head
nextwo 2 years ago
commit 47e744f481

@ -445,10 +445,10 @@ class ServiceRequestsProvider extends ChangeNotifier {
}
Future<int> updateServiceReport({
@required String host,
@required User user,
@required ServiceReport report,
@required ServiceRequest request,
String host,
User user,
ServiceRequest request,
}) async {
Response response;
//Map<String,dynamic> body = report.toMap(request);

@ -36,7 +36,8 @@ import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/pages/login.dart';
import 'package:test_sa/views/pages/register.dart';
import 'package:test_sa/views/pages/splash_screen.dart';
import 'package:test_sa/views/pages/sub_workorder/sub_workorder_page.dart';
import 'package:test_sa/views/pages/sub_workorder/create_sub_workorder_page.dart';
import 'package:test_sa/views/pages/sub_workorder/search_sub_workorder_page.dart';
import 'package:test_sa/views/pages/user/gas_refill/request_gas_refill.dart';
import 'package:test_sa/views/pages/user/gas_refill/track_gas_refill.dart';
import 'package:test_sa/views/pages/user/land_page.dart';
@ -179,7 +180,8 @@ class MyApp extends StatelessWidget {
TrackGasRefillPage.id: (_) => const TrackGasRefillPage(),
RequestDeviceTransfer.id: (_) => const RequestDeviceTransfer(),
TrackDeviceTransferPage.id: (_) => const TrackDeviceTransferPage(),
SubWorkOrderPage.id: (_) => const SubWorkOrderPage(),
SearchSubWorkOrderPage.id: (_) => const SearchSubWorkOrderPage(),
CreateSubWorkOrderPage.id: (_) => const CreateSubWorkOrderPage(),
},
),
),

@ -10,6 +10,8 @@ class SearchWorkOrders {
String assetType;
AssignedEmployee assignedEmployee;
String visitDate;
String startDate;
String endDate;
List assistantEmployees;
String supplier;
String vendorTicketNumber;
@ -44,6 +46,8 @@ class SearchWorkOrders {
this.assetType,
this.assignedEmployee,
this.visitDate,
this.startDate,
this.endDate,
this.assistantEmployees,
this.supplier,
this.vendorTicketNumber,
@ -79,6 +83,8 @@ class SearchWorkOrders {
assetType = json['assetType'];
assignedEmployee = json['assignedEmployee'] != null ? new AssignedEmployee.fromJson(json['assignedEmployee']) : AssignedEmployee();
visitDate = json['visitDate'];
startDate = json['startDate'];
endDate = json['endDate'];
if (json['assistantEmployees'] != null) {
assistantEmployees = json['assistantEmployees'];
}
@ -127,6 +133,8 @@ class SearchWorkOrders {
data['assignedEmployee'] = this.assignedEmployee.toJson();
}
data['visitDate'] = this.visitDate;
data['startDate'] = this.startDate;
data['endDate'] = this.endDate;
if (this.assistantEmployees != null) {
data['assistantEmployees'] = this.assistantEmployees.map((v) => v.toJson()).toList();
}

@ -0,0 +1,162 @@
import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
import 'package:test_sa/models/service_request/search_work_order.dart';
import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/pages/sub_workorder/spare_parts_details_bottom_sheet.dart';
import 'package:test_sa/views/pages/sub_workorder/work_order_details_bottom_sheet.dart';
import '../../../controllers/api_routes/http_status_manger.dart';
import '../../../controllers/localization/localization.dart';
import '../../../models/subtitle.dart';
import '../../widgets/buttons/app_back_button.dart';
import '../../widgets/buttons/app_button.dart';
class CreateSubWorkOrderPage extends StatefulWidget {
static const id = "/CreateSubWorkOrder";
final SearchWorkOrders workOrder;
const CreateSubWorkOrderPage({this.workOrder, Key key}) : super(key: key);
@override
State<CreateSubWorkOrderPage> createState() => _CreateSubWorkOrderPageState();
}
class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
@override
Widget build(BuildContext context) {
final Subtitle subtitle = AppLocalization.of(context).subtitle;
return Scaffold(
body: SafeArea(
child: SingleChildScrollView(
child: Column(
children: [
Container(
color: AColors.primaryColor,
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4),
child: Column(
children: [
Row(
children: [
const ABackButton(),
Expanded(
child: Center(
child: Text(
"New Work Order",
style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.white, fontStyle: FontStyle.italic),
),
),
),
const SizedBox(
width: 48,
)
],
),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 16),
child: Column(
children: [
const SizedBox(height: 8),
InkWell(
onTap: () {
showModalBottomSheet(
context: context,
useSafeArea: true,
isScrollControlled: true,
backgroundColor: Colors.transparent,
builder: (context) => WorkOrderDetailsBottomSheet(workOrder: widget.workOrder),
);
},
child: Card(
child: ListTile(
title: Row(
children: [
Text(
"WO Details",
style: Theme.of(context).textTheme.bodyMedium,
),
const Text("*", style: TextStyle(color: Colors.red)),
],
),
trailing: const Icon(Icons.arrow_forward_ios, size: 14, color: AColors.primaryColor),
),
),
),
const SizedBox(height: 8),
InkWell(
onTap: () {
showModalBottomSheet(
context: context,
useSafeArea: true,
isScrollControlled: true,
backgroundColor: Colors.transparent,
builder: (context) => SparePartsBottomSheet(workOrder: widget.workOrder),
);
},
child: Card(
child: ListTile(
title: Row(
children: [
Text(
"Spare Parts",
style: Theme.of(context).textTheme.bodyMedium,
),
const Text("*", style: TextStyle(color: Colors.red)),
],
),
trailing: const Icon(Icons.arrow_forward_ios, size: 14, color: AColors.primaryColor),
),
),
),
],
),
),
],
),
),
),
floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
floatingActionButton: Padding(
padding: const EdgeInsets.all(16.0),
child: AButton(
text: subtitle.create,
onPressed: () async {
// validate = true;
// if (!_formKey.currentState.validate()) {
// setState(() {});
// return;
// }
// if (!_serviceReport.validate()) return;
_formKey.currentState.save();
// _isLoading = true;
setState(() {});
int status = await Provider.of<ServiceRequestsProvider>(context).createServiceReport(
// user: _userProvider.user,
// host: _settingProvider.host,
// report: _serviceReport,
// request: widget.request,
);
// _isLoading = false;
setState(() {});
if (status >= 200 && status < 300) {
Fluttertoast.showToast(msg: subtitle.requestCompleteSuccessfully);
Navigator.of(context).pop();
Navigator.of(context).pop();
} else {
String errorMessage = HttpStatusManger.getStatusMessage(status: status, subtitle: subtitle);
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(errorMessage),
));
}
},
),
),
);
}
}

@ -6,7 +6,6 @@ import 'package:test_sa/models/engineer.dart';
import 'package:test_sa/models/lookup.dart';
import 'package:test_sa/models/service_request/search_work_order.dart';
import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/views/pages/sub_workorder/workorder_list.dart';
import 'package:test_sa/views/widgets/app_text_form_field.dart';
import 'package:test_sa/views/widgets/date_and_time/date_picker.dart';
@ -21,15 +20,15 @@ import '../../widgets/status/report/service_report_maintenance_situation.dart';
import '../../widgets/status/report/service_report_visit_date_operator.dart';
import '../../widgets/titles/app_sub_title.dart';
class SubWorkOrderPage extends StatefulWidget {
class SearchSubWorkOrderPage extends StatefulWidget {
static String id = "/SubWorkOrderPage";
const SubWorkOrderPage({Key key}) : super(key: key);
const SearchSubWorkOrderPage({Key key}) : super(key: key);
@override
State<SubWorkOrderPage> createState() => _SubWorkOrderPageState();
State<SearchSubWorkOrderPage> createState() => _SearchSubWorkOrderPageState();
}
class _SubWorkOrderPageState extends State<SubWorkOrderPage> {
class _SearchSubWorkOrderPageState extends State<SearchSubWorkOrderPage> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final SearchWorkOrders _searchWorkOrders = SearchWorkOrders();
Subtitle _subtitle;
@ -56,7 +55,7 @@ class _SubWorkOrderPageState extends State<SubWorkOrderPage> {
child: Center(
child: Text(
"Search Work Order",
style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.white, fontStyle: FontStyle.italic),
style: Theme.of(context).textTheme.titleLarge.copyWith(color: AColors.white, fontStyle: FontStyle.italic),
),
),
),
@ -161,7 +160,7 @@ class _SubWorkOrderPageState extends State<SubWorkOrderPage> {
),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: _isLoading
? const ALoading()
? const CircularProgressIndicator()
: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: AButton(

@ -0,0 +1,175 @@
import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/models/service_request/search_work_order.dart';
import 'package:test_sa/views/app_style/colors.dart';
import '../../../controllers/api_routes/http_status_manger.dart';
import '../../../controllers/localization/localization.dart';
import '../../../controllers/providers/api/service_requests_provider.dart';
import '../../../models/service_report.dart';
import '../../../models/subtitle.dart';
import '../../widgets/app_text_form_field.dart';
import '../../widgets/buttons/app_button.dart';
import '../../widgets/titles/app_sub_title.dart';
class SparePartsBottomSheet extends StatefulWidget {
final SearchWorkOrders workOrder;
const SparePartsBottomSheet({this.workOrder, Key key}) : super(key: key);
@override
State<SparePartsBottomSheet> createState() => _SparePartsBottomSheetState();
}
class _SparePartsBottomSheetState extends State<SparePartsBottomSheet> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
SearchWorkOrders _workOrder;
bool _isLoading = false;
@override
void initState() {
super.initState();
_workOrder = widget.workOrder;
}
@override
Widget build(BuildContext context) {
final size = MediaQuery.of(context).size;
final Subtitle subtitle = AppLocalization.of(context).subtitle;
return Padding(
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
child: ClipRRect(
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(15),
topRight: Radius.circular(15),
),
clipBehavior: Clip.antiAliasWithSaveLayer,
child: Container(
color: Colors.white,
height: size.height * 0.9,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 20),
child: Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const ASubTitle("Spare Parts"),
const SizedBox(height: 8),
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: SingleChildScrollView(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 8),
if (_workOrder.sparePartsWorkOrders?.length != null)
ListView.builder(
itemCount: _workOrder.sparePartsWorkOrders?.length,
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
final wo = _workOrder.sparePartsWorkOrders[index];
return Column(
children: [
const ATextFormField(labelText: "Part No."),
const SizedBox(height: 8),
const ATextFormField(
labelText: "Description",
hintText: "Add Some Text",
textInputType: TextInputType.multiline,
),
const SizedBox(height: 8),
const ATextFormField(
labelText: "Quantity",
textInputType: TextInputType.number,
),
const SizedBox(height: 8),
InkWell(
onTap: () {},
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
const Icon(Icons.delete, color: Colors.red),
Text(
"Remove this part",
style: Theme.of(context).textTheme.bodySmall,
),
],
),
),
const SizedBox(height: 8),
],
);
},
),
const Divider(),
const SizedBox(height: 8),
InkWell(
onTap: () {},
child: Container(
decoration: BoxDecoration(
color: AColors.primaryColor.withOpacity(0.15),
borderRadius: BorderRadius.circular(10),
border: Border.all(color: AColors.primaryColor),
),
child: ListTile(
title: Text(
"Add Part",
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: AColors.primaryColor,
),
),
trailing: const Icon(
Icons.add_circle,
color: AColors.primaryColor,
size: 20,
),
),
),
),
const SizedBox(height: 24),
],
),
),
),
),
),
AButton(
text: subtitle.update,
onPressed: () async {
// _validate = true;
if (!_formKey.currentState.validate()) {
setState(() {});
return;
}
// if (!_serviceReport.validate()) {
// setState(() {});
// return;
// }
_formKey.currentState.save();
_isLoading = true;
setState(() {});
int status = await Provider.of<ServiceRequestsProvider>(context).updateServiceReport(report: ServiceReport());
_isLoading = false;
setState(() {});
if (status >= 200 && status < 300) {
Fluttertoast.showToast(msg: subtitle.requestCompleteSuccessfully);
Navigator.of(context).pop();
// Navigator.of(context).pop();
} else {
String errorMessage = HttpStatusManger.getStatusMessage(status: status, subtitle: subtitle);
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(errorMessage)));
}
},
),
],
),
),
),
),
);
}
}

@ -0,0 +1,240 @@
import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
import 'package:test_sa/models/lookup.dart';
import 'package:test_sa/models/service_request/search_work_order.dart';
import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/views/widgets/app_text_form_field.dart';
import 'package:test_sa/views/widgets/buttons/app_button.dart';
import 'package:test_sa/views/widgets/status/report/service_report_maintenance_situation.dart';
import 'package:test_sa/views/widgets/status/report/service_report_repair_location.dart';
import '../../../controllers/api_routes/http_status_manger.dart';
import '../../../controllers/localization/localization.dart';
import '../../../models/engineer.dart';
import '../../../models/service_report.dart';
import '../../app_style/sizing.dart';
import '../../widgets/date_and_time/time_picker.dart';
import '../../widgets/status/report/service_report_all_users.dart';
import '../../widgets/titles/app_sub_title.dart';
class WorkOrderDetailsBottomSheet extends StatefulWidget {
final SearchWorkOrders workOrder;
const WorkOrderDetailsBottomSheet({this.workOrder, Key key}) : super(key: key);
@override
State<WorkOrderDetailsBottomSheet> createState() => _WorkOrderDetailsBottomSheetState();
}
class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomSheet> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
SearchWorkOrders _workOrder;
bool _isLoading = false;
@override
void initState() {
super.initState();
_workOrder = widget.workOrder;
}
@override
Widget build(BuildContext context) {
final size = MediaQuery.of(context).size;
final Subtitle subtitle = AppLocalization.of(context).subtitle;
return Padding(
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
child: ClipRRect(
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(15),
topRight: Radius.circular(15),
),
clipBehavior: Clip.antiAliasWithSaveLayer,
child: Container(
color: Colors.white,
height: size.height * 0.9,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 20),
child: Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const ASubTitle("WO Details"),
const SizedBox(height: 8),
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 8),
ATextFormField(enable: false, hintText: "Assigned Employee: ${_workOrder.assignedEmployee?.name}"),
const SizedBox(height: 8),
const ASubTitle("Assistant Employee"),
const SizedBox(height: 4),
ServiceReportAllUsers(
initialValue: _workOrder.assistantEmployees == null || _workOrder.assistantEmployees.isEmpty
? null
: Engineer(id: _workOrder.assistantEmployees?.first?.id, name: _workOrder.assistantEmployees?.first?.name),
onSelect: (engineer) {
_workOrder.assistantEmployees = [AssignedEmployee(id: engineer.id, name: engineer.name)];
},
),
const SizedBox(height: 8),
Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const ASubTitle("Start of Work"),
SizedBox(
height: 8 * AppStyle.getScaleFactor(context),
),
ADateTimePicker(
date: DateTime.tryParse(_workOrder.startDate ?? ""),
from: DateTime.now().subtract(const Duration(days: 365)),
to: DateTime.now().add(const Duration(days: 365)),
onDateTimePicker: (date) {
_workOrder.startDate = date?.toIso8601String();
setState(() {});
},
),
],
),
),
const SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const ASubTitle("End of Work"),
SizedBox(
height: 8 * AppStyle.getScaleFactor(context),
),
ADateTimePicker(
date: DateTime.tryParse(_workOrder.endDate ?? ""),
from: DateTime.now().subtract(const Duration(days: 365)),
to: DateTime.now().add(const Duration(days: 365)),
onDateTimePicker: (date) {
_workOrder.endDate = date?.toIso8601String();
setState(() {});
},
),
],
),
),
],
),
const SizedBox(height: 8),
ASubTitle(subtitle.workingHours),
const SizedBox(height: 4),
ATextFormField(
initialValue: null,
textAlign: TextAlign.center,
hintText: _workOrder.startDate == null
? "0"
: ((DateTime.tryParse(_workOrder.endDate)?.difference(DateTime.tryParse(_workOrder.startDate ?? ""))?.inMinutes ?? 0) / 60)?.toStringAsFixed(2)?.toString() ?? "0",
enable: false,
style: Theme.of(context).textTheme.titleMedium,
// validator: (value) => Validator.isNumeric(value) ? null : _subtitle.requiredWord,
textInputType: TextInputType.number,
onSaved: (value) {
_workOrder.workingHours = double.tryParse(value);
},
),
const SizedBox(height: 8),
ATextFormField(
labelText: "Travel Hours",
initialValue: _workOrder.travelingHours?.toString(),
textInputType: TextInputType.number,
onSaved: (value) {
_workOrder.travelingHours = num.tryParse(value);
},
),
const SizedBox(height: 8),
ATextFormField(
labelText: "Travel Expense",
initialValue: _workOrder.travelingExpenses?.toString(),
textInputType: TextInputType.number,
onSaved: (value) {
_workOrder.travelingExpenses = num.tryParse(value);
},
),
const SizedBox(height: 8),
ASubTitle(subtitle.callLastSituation),
const SizedBox(height: 4),
ServiceReportMaintenanceSituation(
initialValue: _workOrder.calllastSituation,
onSelect: (status) {
if (status?.value == 12 || _workOrder.calllastSituation?.value == 12) {
_workOrder.calllastSituation = status;
setState(() {});
} else {
_workOrder.calllastSituation = status;
}
},
),
const SizedBox(height: 8),
const ASubTitle("Repair Location"),
const SizedBox(height: 4),
ServiceReportRepairLocation(
initialValue: _workOrder.repairLocation != null ? Lookup(name: _workOrder.repairLocation) : null,
onSelect: (status) {
_workOrder.repairLocation = status.name;
},
),
const SizedBox(height: 8),
ATextFormField(
labelText: "Technical Comments",
initialValue: _workOrder.reviewComment,
textInputType: TextInputType.multiline,
onSaved: (value) {
_workOrder.reviewComment = value;
},
),
const SizedBox(height: 24),
],
),
),
),
),
AButton(
text: subtitle.update,
onPressed: () async {
// _validate = true;
if (!_formKey.currentState.validate()) {
setState(() {});
return;
}
// if (!_serviceReport.validate()) {
// setState(() {});
// return;
// }
_formKey.currentState.save();
_isLoading = true;
setState(() {});
int status = await Provider.of<ServiceRequestsProvider>(context).updateServiceReport(report: ServiceReport());
_isLoading = false;
setState(() {});
if (status >= 200 && status < 300) {
Fluttertoast.showToast(msg: subtitle.requestCompleteSuccessfully);
Navigator.of(context).pop();
// Navigator.of(context).pop();
} else {
String errorMessage = HttpStatusManger.getStatusMessage(status: status, subtitle: subtitle);
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(errorMessage)));
}
},
),
],
),
),
),
),
);
}
}

@ -23,7 +23,7 @@ import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/app_style/sizing.dart';
import 'package:test_sa/views/pages/device_transfer/request_device_transfer.dart';
import 'package:test_sa/views/pages/device_transfer/track_device_transfer.dart';
import 'package:test_sa/views/pages/sub_workorder/sub_workorder_page.dart';
import 'package:test_sa/views/pages/sub_workorder/search_sub_workorder_page.dart';
import 'package:test_sa/views/pages/user/gas_refill/request_gas_refill.dart';
import 'package:test_sa/views/pages/user/gas_refill/track_gas_refill.dart';
import 'package:test_sa/views/pages/user/requests/create_request.dart';
@ -217,7 +217,7 @@ class _LandPageState extends State<LandPage> {
text: "Search Work Order",
svgPath: "assets/images/sub_workorder_icon.svg",
onPressed: () {
Navigator.of(context).pushNamed(SubWorkOrderPage.id);
Navigator.of(context).pushNamed(SearchSubWorkOrderPage.id);
},
),
],

Loading…
Cancel
Save