From b8ea1ab030fcde47c9c1e79a1331379e5e59a7f5 Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Mon, 19 Jun 2023 13:22:32 +0300 Subject: [PATCH] work order --- .../create_sub_workorder_page.dart | 32 +++++++++++++++++++ .../search_sub_workorder_page.dart | 1 + .../sub_workorder/workorder_details.dart | 12 +++++-- .../pages/sub_workorder/workorder_list.dart | 9 ++++-- 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 1619e536..bbf8d7cf 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -6,12 +6,17 @@ 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 'package:test_sa/views/pages/sub_workorder/workorder_details.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'; +import '../../widgets/date_and_time/date_picker.dart'; +import '../../widgets/status/report/service_report_equipment_status.dart'; +import '../../widgets/status/report/service_report_reasons.dart'; +import '../../widgets/titles/app_sub_title.dart'; class CreateSubWorkOrderPage extends StatefulWidget { static const id = "/CreateSubWorkOrder"; @@ -32,6 +37,32 @@ class _CreateSubWorkOrderPageState extends State { child: SingleChildScrollView( child: Column( children: [ + // ServiceReportEquipmentStatusMenu( + // report: _serviceReport, + // request: widget.request, + // onSelect: (status) { + // _serviceReport.equipmentStatus = status; + // }, + // ), + // ADatePicker( + // // date: _from, + // // from: DateTime(1950), + // onDatePicker: (date) { + // // _from = date; + // // setState(() {}); + // // widget.onPickFrom(date); + // }, + // ), + // ASubTitle("_subtitle.reasons"), + // const SizedBox( + // height: 4, + // ), + // ServiceReportReasonsMenu( + // initialValue: _serviceReport.reason, + // onSelect: (status) { + // _serviceReport.reason = status; + // }, + // ), Container( color: AColors.primaryColor, padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4), @@ -60,6 +91,7 @@ class _CreateSubWorkOrderPageState extends State { padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 16), child: Column( children: [ + WorkOrderDetails(), const SizedBox(height: 8), InkWell( onTap: () { diff --git a/lib/views/pages/sub_workorder/search_sub_workorder_page.dart b/lib/views/pages/sub_workorder/search_sub_workorder_page.dart index 8595bf45..f23c6364 100644 --- a/lib/views/pages/sub_workorder/search_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/search_sub_workorder_page.dart @@ -6,6 +6,7 @@ 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'; diff --git a/lib/views/pages/sub_workorder/workorder_details.dart b/lib/views/pages/sub_workorder/workorder_details.dart index 1d6fb311..23467b4a 100644 --- a/lib/views/pages/sub_workorder/workorder_details.dart +++ b/lib/views/pages/sub_workorder/workorder_details.dart @@ -14,7 +14,6 @@ class WorkOrderDetails extends StatelessWidget { children: [ Container( padding: EdgeInsets.all(10), - margin: EdgeInsets.all(10), decoration: BoxDecoration( color: AColors.inputFieldBackgroundColor, border: Border.all( @@ -39,7 +38,16 @@ class WorkOrderDetails extends StatelessWidget { ], ), ), - Container(child: _buildRow("call id", "", context),) + Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: AColors.inputFieldBackgroundColor, + border: Border.all( + color: Color(0xffefefef), + ), + borderRadius: BorderRadius.circular(AppStyle.borderRadius * AppStyle.getScaleFactor(context)), + ), + child: _buildRow("call id", "", context),) ], ); } diff --git a/lib/views/pages/sub_workorder/workorder_list.dart b/lib/views/pages/sub_workorder/workorder_list.dart index 5754678c..4875df49 100644 --- a/lib/views/pages/sub_workorder/workorder_list.dart +++ b/lib/views/pages/sub_workorder/workorder_list.dart @@ -7,6 +7,7 @@ import '../../../models/service_request/search_work_order.dart'; import '../../../models/subtitle.dart'; import '../../widgets/loaders/lazy_loading.dart'; import '../../widgets/loaders/no_item_found.dart'; +import 'create_sub_workorder_page.dart'; class WorkOrderList extends StatelessWidget { final List items; @@ -31,8 +32,12 @@ class WorkOrderList extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), itemBuilder: (context, itemIndex) { return WorkOrderItem(index: itemIndex, onPressed: (model){ - Navigator.of(context).push(MaterialPageRoute( - builder: (_) => WorkOrderUpdate(item: model,))); + // Navigator.of(context).push(MaterialPageRoute( + // builder: (_) => WorkOrderUpdate(item: model,))); + Navigator.push( + context, + MaterialPageRoute(builder: (context) => CreateSubWorkOrderPage(workOrder:model)), + ); }, item: items[itemIndex], ); }), );