Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

# Conflicts:
#	lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart
design_3.0_demo_module
Sikander Saleem 3 years ago
commit 89bcb20314

@ -35,10 +35,10 @@ extension WidgetExtensions on Widget {
) )
: this; : this;
Widget get toShadowContainer => Container( Widget toShadowContainer(BuildContext context) => Container(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
decoration: ShapeDecoration( decoration: ShapeDecoration(
color: Colors.white, color: Theme.of(context).cardColor,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),

@ -43,7 +43,7 @@ class _CalendarPageState extends State<CalendarPage> with SingleTickerProviderSt
"Sunday to Thursday".bodyText(context), "Sunday to Thursday".bodyText(context),
"09:00 to 18:00".bodyText(context).custom(color: AppColor.neutral50), "09:00 to 18:00".bodyText(context).custom(color: AppColor.neutral50),
], ],
).toShadowContainer, ).toShadowContainer(context),
).paddingOnly(start: 16, end: 16), ).paddingOnly(start: 16, end: 16),
16.height, 16.height,
Container( Container(

@ -82,7 +82,7 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
], ],
), ),
], ],
).toShadowContainer, ).toShadowContainer(context),
); );
} }
} }

@ -94,7 +94,7 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
// availableGestures: AvailableGestures.none, // availableGestures: AvailableGestures.none,
// ), // ),
], ],
).toShadowContainer, ).toShadowContainer(context),
); );
} }

@ -4,7 +4,6 @@ import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/enums/translation_keys.dart';
import '../../app_style/app_color.dart'; import '../../app_style/app_color.dart';
@ -42,9 +41,9 @@ class ContactUsBottomSheet extends StatelessWidget {
16.height, 16.height,
Row( Row(
children: [ children: [
contactItem(context.isDark, "phone", context.translation.callUs, "+966 546345567").onPress(() { }).expanded, contactItem(context, context.isDark, "phone", context.translation.callUs, "+966 546345567").onPress(() {}).expanded,
16.width, 16.width,
contactItem(context.isDark, "whatsapp", context.translation.liveChat, context.translation.openWhatsapp).onPress(() {}).expanded, contactItem(context, context.isDark, "whatsapp", context.translation.liveChat, context.translation.openWhatsapp).onPress(() {}).expanded,
], ],
), ),
32.height, 32.height,
@ -53,7 +52,7 @@ class ContactUsBottomSheet extends StatelessWidget {
); );
} }
Widget contactItem(bool isDark, String iconName, String title, String subtitle) { Widget contactItem(BuildContext context, bool isDark, String iconName, String title, String subtitle) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -72,6 +71,6 @@ class ContactUsBottomSheet extends StatelessWidget {
style: AppTextStyles.bodyText.copyWith(color: isDark ? AppColor.neutral10 : AppColor.neutral20), style: AppTextStyles.bodyText.copyWith(color: isDark ? AppColor.neutral10 : AppColor.neutral20),
), ),
], ],
).toShadowContainer; ).toShadowContainer(context);
} }
} }

@ -68,6 +68,6 @@ class RequestsFragment extends StatelessWidget {
], ],
).toShimmer(isShow: isLoading), ).toShimmer(isShow: isLoading),
], ],
).toShadowContainer; ).toShadowContainer(context);
} }
} }

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/localization/localization.dart';
import 'package:test_sa/controllers/providers/api/asset_transfer_provider.dart'; import 'package:test_sa/controllers/providers/api/asset_transfer_provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
@ -12,11 +11,8 @@ import 'package:test_sa/models/device/asset_transfer.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/device_transfer/update_device_transfer.dart'; import 'package:test_sa/views/pages/device_transfer/update_device_transfer.dart';
import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
import 'package:test_sa/views/widgets/buttons/app_small_button.dart';
import 'package:test_sa/views/widgets/loaders/app_loading.dart'; import 'package:test_sa/views/widgets/loaders/app_loading.dart';
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
import 'package:test_sa/views/widgets/requests/info_row.dart';
import '../../../extensions/text_extensions.dart'; import '../../../extensions/text_extensions.dart';
import '../../../models/enums/user_types.dart'; import '../../../models/enums/user_types.dart';
@ -73,31 +69,12 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
child: Column( child: Column(
children: [ children: [
_buildDetailsCard( _buildDetailsCard(
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
/// TBD
// StatusLabel(
// label: "",
// id: 0,
// textColor: AColors.getPriorityStatusTextColor(0),
// backgroundColor: AColors.getPriorityStatusColor(0)),
8.width,
/// TBD
//StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)),
],
),
1.width.expanded,
Text(widget.model.createdOn != null ?widget.model.createdOn.toServiceRequestCardFormat:"", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
),
8.height,
Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
8.height, 8.height,
Column( Column(
@ -111,35 +88,68 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
), ),
8.height, 8.height,
], ],
).paddingAll(14) ).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
/// TBD
// Row(
// children: [
// /// TBD
// // StatusLabel(
// // label: "",
// // id: 0,
// // textColor: AColors.getPriorityStatusTextColor(0),
// // backgroundColor: AColors.getPriorityStatusColor(0)),
// 8.width,
//
// /// TBD
// //StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)),
// ],
// ),
1.width,
Text(widget.model.createdOn != null ? widget.model.createdOn.toServiceRequestCardFormat : "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
),
],
).paddingAll(14),
), ),
// sender card // sender card
_buildCard( _buildCard(
isSender: true, isSender: true,
site: _model.senderSiteName ?? "", site: _model.senderSiteName ?? "",
/// TBD /// TBD
unit: _model.senderDepartmentName ?? "", unit: _model.senderDepartmentName ?? "",
comment: _model.senderComment ?? "", comment: _model.senderComment ?? "",
/// TBD /// TBD
statusLabel: _model.senderMachineStatusName != null? StatusLabel( statusLabel: _model.senderMachineStatusName != null
? StatusLabel(
label: _model.senderMachineStatusName, label: _model.senderMachineStatusName,
id: _model.senderMachineStatusId, id: _model.senderMachineStatusId,
textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.senderMachineStatusName)), textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.senderMachineStatusName)),
backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.senderMachineStatusName))):null, backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.senderMachineStatusName)))
: null,
), ),
// receiver card // receiver card
_buildCard( _buildCard(
isSender: false, isSender: false,
site: _model.destSiteName ?? "", site: _model.destSiteName ?? "",
/// TBD /// TBD
unit: _model.destDepartmentName ?? "", unit: _model.destDepartmentName ?? "",
comment: _model.receiverComment ?? "", comment: _model.receiverComment ?? "",
/// TBD /// TBD
statusLabel: _model.receiverMachineStatusName != null ? StatusLabel( statusLabel: _model.receiverMachineStatusName != null
? StatusLabel(
label: _model.receiverMachineStatusName ?? "", label: _model.receiverMachineStatusName ?? "",
id: _model.receiverMachineStatusId, id: _model.receiverMachineStatusId,
textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.receiverMachineStatusName)), textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.receiverMachineStatusName)),
backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.receiverMachineStatusName))):null, backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.receiverMachineStatusName)))
: null,
), ),
], ],
), ),
@ -164,7 +174,8 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
_buildTextWidget(String text) { _buildTextWidget(String text) {
return Text( return Text(
text, style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), text,
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
); );
} }
@ -185,11 +196,10 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
children: [ children: [
statusLabel ?? Container(), statusLabel ?? Container(),
8.height, 8.height,
Text(isSender?context.translation.senderDetails:context.translation.receiverDetails, Text(isSender ? context.translation.senderDetails : context.translation.receiverDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
], ],
), ),
if (_userProvider.user?.type == UsersTypes.engineer) if ((_userProvider.user?.type == UsersTypes.engineer) && (isSender ? _model.senderMachineStatusName != "Closed" : _model.receiverMachineStatusName != "Closed"))
CircleAvatar( CircleAvatar(
radius: 25, radius: 25,
backgroundColor: AppColor.neutral30, backgroundColor: AppColor.neutral30,
@ -201,26 +211,13 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
child: SvgPicture.asset('assets/images/update.svg'), child: SvgPicture.asset('assets/images/update.svg'),
), ),
), ),
).onPress( ).onPress(isSender
isSender ? _model.senderMachineStatusName == "Closed" ? () {
? null Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender)));
: () {
Navigator.of(context).push(MaterialPageRoute(
builder: (_) => UpdateDeviceTransfer(
model: _model,
isSender: isSender,
)));
} }
: _model.receiverMachineStatusName == "Closed"
? null
: () { : () {
Navigator.of(context).push(MaterialPageRoute( Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender)));
builder: (_) => UpdateDeviceTransfer(
model: _model,
isSender: isSender,
)));
}), }),
], ],
), ),
Column( Column(
@ -253,5 +250,4 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
break; break;
} }
} }
} }

@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart';
@ -31,7 +29,6 @@ class GasRefillDetailsPage extends StatefulWidget {
class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> { class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
GasRefillModel _model = GasRefillModel(gazRefillDetails: []); GasRefillModel _model = GasRefillModel(gazRefillDetails: []);
bool _enableEdit = false;
UserProvider _userProvider; UserProvider _userProvider;
bool _isLoading = false; bool _isLoading = false;
@ -46,7 +43,6 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_userProvider = Provider.of<UserProvider>(context); _userProvider = Provider.of<UserProvider>(context);
return Scaffold( return Scaffold(
@ -61,9 +57,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
stateCode: 200, stateCode: 200,
onRefresh: () async {}, onRefresh: () async {},
child: Column( child: Column(
children: [ children: [informationCard()],
informationCard()
],
), ),
), ),
), ),
@ -99,17 +93,35 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
//textColor: AColors.getPriorityStatusTextColor(serviceRequest.priority.id), //textColor: AColors.getPriorityStatusTextColor(serviceRequest.priority.id),
//backgroundColor: AColors.getPriorityStatusColor(serviceRequest.priority.id) //backgroundColor: AColors.getPriorityStatusColor(serviceRequest.priority.id)
//), //),
8.width, // 8.width,
StatusLabel( StatusLabel(
label: widget.model.status?.name ?? "", label: widget.model.status?.name ?? "",
textColor: AColors.getRequestStatusTextColor(widget.model.status?.value ?? 0), textColor: AColors.getRequestStatusTextColor(widget.model.status?.value ?? 0),
backgroundColor: AColors.getRequestStatusColor(widget.model.status?.value ?? 0)), backgroundColor: AColors.getRequestStatusColor(widget.model.status?.value ?? 0)),
8.height, 8.height,
Text(context.translation.gasRefillRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), Text(context.translation.gasRefillRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
8.height,
///TBD
Text(
context.translation.gasRequest,
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
Text(
'${context.translation.cylinderSize}: ${widget.model.gazRefillDetails[0].cylinderSize.value}',
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
Text(
'${context.translation.site}: ${widget.model.site.name}',
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
], ],
), ),
1.width.expanded, 1.width.expanded,
if (_userProvider.user.type == UsersTypes.engineer) Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
if (_userProvider.user.type == UsersTypes.engineer && (widget.model.status?.value ?? 0) != 2)
CircleAvatar( CircleAvatar(
radius: 25, radius: 25,
backgroundColor: AppColor.neutral30, backgroundColor: AppColor.neutral30,
@ -122,11 +134,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
), ),
), ),
).onPress( ).onPress(
(widget.model.status?.value ?? 0) == 2
? null
:
() async { () async {
_enableEdit = !_enableEdit;
_model?.fromGasRefillModel(widget.model); _model?.fromGasRefillModel(widget.model);
// setState(() {}); // setState(() {});
Navigator.push( Navigator.push(
@ -142,34 +150,12 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
} }
}); });
setState(() {}); setState(() {});
},), },
],
),
8.height,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
///TBD
Text(
context.translation.gasRequest,
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
Text(
'${context.translation.cylinderSize}: ${widget.model.gazRefillDetails[0].cylinderSize.value}',
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
Text(
'${context.translation.site}: ${widget.model.site.name}',
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
],
), ),
Text(widget.model.startDate?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), Text(widget.model.startDate?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
], ],
)
],
), ),
8.height, 8.height,
const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1),
@ -185,6 +171,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
8.height, 8.height,
], ],
).paddingAll(16), ).paddingAll(16),
/// TBD /// TBD
(_userProvider.user.type == UsersTypes.normal_user (_userProvider.user.type == UsersTypes.normal_user
? Container( ? Container(
@ -236,8 +223,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
), ),
], ],
).paddingOnly(bottom: 16, start: 16, end: 16)) ).paddingOnly(bottom: 16, start: 16, end: 16))
.onPress(() { .onPress(() {}),
}),
], ],
), ),
).paddingAll(16); ).paddingAll(16);

@ -178,9 +178,11 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
stateCode: 200, stateCode: 200,
onRefresh: () async {}, onRefresh: () async {},
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
SingleChildScrollView( SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Container( Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
@ -257,8 +259,8 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
onSaved: (value) {}, onSaved: (value) {},
), ),
], ],
).paddingAll(16)) ).paddingAll(16),
.expanded, ).expanded,
AppFilledButton( AppFilledButton(
label: widget.gasRefillModel == null ? context.translation.submit : context.translation.update, label: widget.gasRefillModel == null ? context.translation.submit : context.translation.update,
onPressed: () async { onPressed: () async {

@ -15,7 +15,6 @@ import 'package:test_sa/new_views/pages/new_gas_refill_request_page.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/device_transfer/track_device_transfer.dart'; import 'package:test_sa/views/pages/device_transfer/track_device_transfer.dart';
import 'package:test_sa/views/pages/sub_workorder/search_sub_workorder_page.dart';
import 'package:test_sa/views/pages/user/gas_refill/track_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_service_request_page.dart'; import 'package:test_sa/views/pages/user/requests/create_service_request_page.dart';
import 'package:test_sa/views/pages/user/visits/regular_visits_page.dart'; import 'package:test_sa/views/pages/user/visits/regular_visits_page.dart';
@ -212,14 +211,14 @@ class _LandPageState extends State<LandPage> {
Navigator.of(context).pushNamed(TrackDeviceTransferPage.id); Navigator.of(context).pushNamed(TrackDeviceTransferPage.id);
}, },
), ),
if (_userProvider?.user != null && _userProvider?.user?.type != UsersTypes.normal_user) // if (_userProvider?.user != null && _userProvider?.user?.type != UsersTypes.normal_user)
LandPageItem( // LandPageItem(
text: "Create Sub Work Order", // text: "Create Sub Work Order",
svgPath: "assets/images/sub_workorder_icon.svg", // svgPath: "assets/images/sub_workorder_icon.svg",
onPressed: () { // onPressed: () {
Navigator.of(context).pushNamed(SearchSubWorkOrderPage.id); // Navigator.of(context).pushNamed(SearchSubWorkOrderPage.id);
}, // },
), // ),
], ],
), ),
], ],

@ -120,7 +120,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
children: [ children: [
SingleChildScrollView( SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Card( Card(
child: Column( child: Column(

@ -9,6 +9,7 @@ import 'package:test_sa/models/service_request/service_request.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; 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/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/views/pages/user/requests/work_order/update_service_report.dart';
import '../../../../../controllers/providers/api/user_provider.dart'; import '../../../../../controllers/providers/api/user_provider.dart';
import '../../../../../models/enums/user_types.dart'; import '../../../../../models/enums/user_types.dart';
@ -75,7 +76,7 @@ class WorkOrderDetailsPage extends StatelessWidget {
if (userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3) if (userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3)
AppFilledButton( AppFilledButton(
onPressed: () { onPressed: () {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => Container())); Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateServiceReport(workOrder: workOrder, request: serviceRequest)));
}, },
label: context.translation.updateRequest, label: context.translation.updateRequest,
).paddingAll(16), ).paddingAll(16),

@ -7,7 +7,6 @@ import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/visits/visit.dart'; import 'package:test_sa/models/visits/visit.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/views/pages/user/visits/pantry/edit_pentry.dart';
import '../../../../controllers/providers/api/user_provider.dart'; import '../../../../controllers/providers/api/user_provider.dart';
import '../../../../models/enums/user_types.dart'; import '../../../../models/enums/user_types.dart';
@ -77,10 +76,11 @@ class VisitDetailsPage extends StatelessWidget {
).paddingAll(16), ).paddingAll(16),
), ),
).expanded, ).expanded,
if (userProvider.user.type == UsersTypes.engineer && visit.status.value != 5 && visit.status.value != 3) if (userProvider.user.type == UsersTypes.engineer && visit.status.id != 270)
AppFilledButton( AppFilledButton(
onPressed: () { onPressed: () {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => EditPentry(visit: visit, pentry: visit.pentry))); print(visit.status.id);
// Navigator.of(context).push(MaterialPageRoute(builder: (_) => EditPentry(visit: visit, pentry: visit.pentry)));
}, },
label: context.translation.updateRequest, label: context.translation.updateRequest,
).paddingAll(16), ).paddingAll(16),

@ -4,11 +4,8 @@ import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/models/device/asset_transfer.dart';
import 'package:test_sa/views/app_style/sizing.dart';
import '../../../extensions/text_extensions.dart'; import '../../../extensions/text_extensions.dart';
import '../../app_style/colors.dart';
import '../requests/request_status.dart';
class DeviceTransferItem extends StatelessWidget { class DeviceTransferItem extends StatelessWidget {
final int index; final int index;
@ -19,41 +16,12 @@ class DeviceTransferItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row(
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: ElevatedButton(
style: ElevatedButton.styleFrom(
elevation: 0,
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
backgroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)),
),
),
onPressed: () {
onPressed(item);
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
/// TBD
// StatusLabel(
// label: '',
// id: 0,
// textColor: AColors.getPriorityStatusTextColor(0),
// backgroundColor: AColors.getPriorityStatusColor(0)),
8.width,
/// TBD
//StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)),
1.width.expanded,
Text(item.createdOn != null ?item.createdOn.toServiceRequestCardFormat:"", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
),
8.height,
Text(context.translation.deviceTransferRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), Text(context.translation.deviceTransferRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
Text( Text(
'${context.translation.from} : ${item.senderAssignedEmployeeName}', '${context.translation.from} : ${item.senderAssignedEmployeeName}',
@ -78,10 +46,27 @@ class DeviceTransferItem extends StatelessWidget {
size: 14, size: 14,
) )
], ],
), ).onPress(() => onPressed(item)),
],
).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
/// TBD
// StatusLabel(
// label: '',
// id: 0,
// textColor: AColors.getPriorityStatusTextColor(0),
// backgroundColor: AColors.getPriorityStatusColor(0)),
// 8.width,
/// TBD
//StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)),
1.width,
Text(item.createdOn != null ? item.createdOn.toServiceRequestCardFormat : "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
], ],
)
), ),
); ],
).toShadowContainer(context).paddingOnly(bottom: 8);
} }
} }

@ -3,7 +3,6 @@ import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/views/app_style/sizing.dart';
import '../../../extensions/text_extensions.dart'; import '../../../extensions/text_extensions.dart';
import '../../../models/new_models/gas_refill_model.dart'; import '../../../models/new_models/gas_refill_model.dart';
@ -19,21 +18,7 @@ class GasRefillItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column(
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: ElevatedButton(
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
backgroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)),
),
),
onPressed: () {
onPressed(item);
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
@ -45,7 +30,7 @@ class GasRefillItem extends StatelessWidget {
// id: , // id: ,
// textColor: AColors.getPriorityStatusTextColor(), // textColor: AColors.getPriorityStatusTextColor(),
// backgroundColor: AColors.getPriorityStatusColor()), // backgroundColor: AColors.getPriorityStatusColor()),
8.width, // 8.width,
StatusLabel(label: item.status.name, textColor: AColors.getRequestStatusTextColor(item.status.value), backgroundColor: AColors.getRequestStatusColor(item.status.value)), StatusLabel(label: item.status.name, textColor: AColors.getRequestStatusTextColor(item.status.value), backgroundColor: AColors.getRequestStatusColor(item.status.value)),
1.width.expanded, 1.width.expanded,
Text(item.startDate != null ? item.startDate.toServiceRequestCardFormat : "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), Text(item.startDate != null ? item.startDate.toServiceRequestCardFormat : "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
@ -76,7 +61,7 @@ class GasRefillItem extends StatelessWidget {
size: 14, size: 14,
) )
], ],
), ).onPress(() => onPressed(item)),
// Row( // Row(
// children: [ // children: [
// Expanded( // Expanded(
@ -148,8 +133,6 @@ class GasRefillItem extends StatelessWidget {
// ], // ],
// ), // ),
], ],
), ).toShadowContainer(context).paddingOnly(bottom: 8);
),
);
} }
} }

Loading…
Cancel
Save