Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Improvements

Browse Source
main_design2.0
zaid_daoud 2 years ago
parent 7fcf49df5c
commit 9ce5ca2f09
4 changed files with 126 additions and 146 deletions
Show Stats Download Patch File Download Diff File

186
lib/views/pages/device_transfer/device_transfer_details.dart
Unescape Escape View File

@ -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,73 +69,87 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
child: Column( child: Column(
children: [ children: [
_buildDetailsCard( _buildDetailsCard(
Column( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
children: [ Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
Row( 8.height,
children: [ Column(
/// TBD crossAxisAlignment: CrossAxisAlignment.start,
// StatusLabel( children: [
// label: "", _buildTextWidget('${context.translation.assetName} : ${_model.assetName}'),
// id: 0, _buildTextWidget('${context.translation.assetNumber} : ${_model.assetNumber}'),
// textColor: AColors.getPriorityStatusTextColor(0), _buildTextWidget('${context.translation.model} : ${_model.modelName}'),
// backgroundColor: AColors.getPriorityStatusColor(0)), _buildTextWidget('${context.translation.sn} : ${_model.assetSerialNo}'),
8.width, ],
/// TBD ),
//StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)), 8.height,
], ],
), ).expanded,
1.width.expanded, Column(
Text(widget.model.createdOn != null ?widget.model.createdOn.toServiceRequestCardFormat:"", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), crossAxisAlignment: CrossAxisAlignment.end,
], children: [
), /// TBD
8.height, // Row(
Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), // children: [
8.height, // /// TBD
Column( // // StatusLabel(
crossAxisAlignment: CrossAxisAlignment.start, // // label: "",
children: [ // // id: 0,
_buildTextWidget('${context.translation.assetName} : ${_model.assetName}'), // // textColor: AColors.getPriorityStatusTextColor(0),
_buildTextWidget('${context.translation.assetNumber} : ${_model.assetNumber}'), // // backgroundColor: AColors.getPriorityStatusColor(0)),
_buildTextWidget('${context.translation.model} : ${_model.modelName}'), // 8.width,
_buildTextWidget('${context.translation.sn} : ${_model.assetSerialNo}'), //
], // /// TBD
), // //StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)),
8.height, // ],
], // ),
).paddingAll(14) 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
label: _model.senderMachineStatusName, ? StatusLabel(
id: _model.senderMachineStatusId, label: _model.senderMachineStatusName,
textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.senderMachineStatusName)), id: _model.senderMachineStatusId,
backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.senderMachineStatusName))):null, textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.senderMachineStatusName)),
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
label: _model.receiverMachineStatusName??"", ? StatusLabel(
id: _model.receiverMachineStatusId, label: _model.receiverMachineStatusName ?? "",
textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.receiverMachineStatusName)), id: _model.receiverMachineStatusId,
backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.receiverMachineStatusName))):null, textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.receiverMachineStatusName)),
backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.receiverMachineStatusName)))
: null,
), ),
], ],
), ),
@ -152,7 +162,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
); );
} }
_buildDetailsCard(Widget widget){ _buildDetailsCard(Widget widget) {
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -162,13 +172,14 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
).paddingOnly(top: 14, start: 14, end: 14); ).paddingOnly(top: 14, start: 14, end: 14);
} }
_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)),
); );
} }
_buildCard({@required String site, @required String unit, @required String comment, @required bool isSender, StatusLabel statusLabel}){ _buildCard({@required String site, @required String unit, @required String comment, @required bool isSender, StatusLabel statusLabel}) {
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -183,13 +194,12 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
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( Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender)));
model: _model, }),
isSender: isSender,
)));
}
: _model.receiverMachineStatusName == "Closed"
? null
: () {
Navigator.of(context).push(MaterialPageRoute(
builder: (_) => UpdateDeviceTransfer(
model: _model,
isSender: isSender,
)));
}),
], ],
), ),
Column( Column(
@ -239,19 +236,18 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
).paddingAll(14), ).paddingAll(14),
).paddingOnly(top: 14, start: 14, end: 14); ).paddingOnly(top: 14, start: 14, end: 14);
} }
int getIdstatus(String status){ int getIdstatus(String status) {
switch(status){ switch (status) {
case "Closed": case "Closed":
return 3 ; return 3;
break; break;
case "Open": case "Open":
return 1 ; return 1;
break; break;
case "In Progress": case "In Progress":
return 2; return 2;
break; break;
} }
} }
} }

17
lib/views/pages/user/land_page.dart
Unescape Escape View File

@ -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);
}, // },
), // ),
], ],
), ),
], ],

67
lib/views/widgets/device_trancfer/device_transfer_item.dart
Unescape Escape View File

@ -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( crossAxisAlignment: CrossAxisAlignment.start,
padding: const EdgeInsets.symmetric(vertical: 4), children: [
child: ElevatedButton( Column(
style: ElevatedButton.styleFrom( crossAxisAlignment: CrossAxisAlignment.stretch,
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,
children: [ children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
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);
} }
} }

2
lib/views/widgets/gas_refill/gas_refill_item.dart
Unescape Escape View File

@ -61,7 +61,7 @@ class GasRefillItem extends StatelessWidget {
size: 14, size: 14,
) )
], ],
), ).onPress(() => onPressed(item)),
// Row( // Row(
// children: [ // children: [
// Expanded( // Expanded(

Write Preview
Loading…
Cancel
Save