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

Merge branch 'majd_development' into 'master'

Browse Source 
null safety

See merge request haroon6138/cloudsolutions-atoms!10
merge-requests/11/merge
Sikander Saleem 3 years ago
parent 0ee51298e3 9afe7e7ec6
commit 942fa0f0ba
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

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

@ -90,12 +90,12 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
RequestInfoRow( RequestInfoRow(
title: _subtitle?.title??"", title: _subtitle!.title,
info: widget.model.title??"", info: widget.model.title,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle?.device??"", title: _subtitle?.device,
info: widget.model.device?.serialNumber??"", info: widget.model.device?.serialNumber,
), ),
const SizedBox(height:8), const SizedBox(height:8),
Row( Row(

30
lib/views/widgets/device_trancfer/device_transfer_info_section.dart
Unescape Escape View File

@ -18,42 +18,42 @@ class DeviceTransferInfoSection extends StatelessWidget {
return Column( return Column(
children: [ children: [
RequestInfoRow( RequestInfoRow(
title: subtitle?.hospital??"", title: subtitle?.hospital,
info: info.client?.name??"", info: info.client?.name,
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle?.unite??"", title: subtitle?.unite,
info: info.department?.name??"", info: info.department?.name,
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle?.engineerName??"", title: subtitle?.engineerName,
info: info.name??"", info: info.name,
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle?.workingHours??"", title: subtitle?.workingHours,
info: info.workingHours??"", info: info.workingHours,
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle?.travelingHours??"", title: subtitle?.travelingHours,
info: info.travelingHours??"", info: info.travelingHours,
), ),
RequestInfoRow( RequestInfoRow(
title: "Comment", title: "Comment",
info: info.comment??"", info: info.comment,
), ),
RequestInfoRow( RequestInfoRow(
title: "Signature", title: "Signature",
info: (info.signature?.isEmpty??false) != false info: (info.signature?.isEmpty) != false
? subtitle?.noDateFound??"" : "", ? subtitle?.noDateFound : "",
contentWidget: (info.signature?.isEmpty??false) != false ? Container() : contentWidget: (info.signature?.isEmpty??false) != false ? Container() :
ImageLoader( ImageLoader(
url: info.signature??"", url: info.signature??"",
), ),
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle?.status??"", title: subtitle?.status,
infoWidget: StatusLabel( infoWidget: StatusLabel(
label: info.status?.label??"", label: info.status!.label,
color: AColors.getGasStatusColor(info.status?.id??0) color: AColors.getGasStatusColor(info.status?.id??0)
), ),
), ),

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

@ -74,7 +74,7 @@ class DeviceTransferItem extends StatelessWidget {
), ),
StatusLabel( StatusLabel(
color: AColors.getRequestStatusColor(item.sender?.status?.id??0), color: AColors.getRequestStatusColor(item.sender?.status?.id??0),
label: item.sender?.status?.label??"", label: item.sender!.status!.label,
) )
], ],
@ -113,7 +113,7 @@ class DeviceTransferItem extends StatelessWidget {
), ),
StatusLabel( StatusLabel(
color: AColors.getRequestStatusColor(item.receiver?.status?.id??0), color: AColors.getRequestStatusColor(item.receiver?.status?.id??0),
label: item.receiver?.status?.label??"", label: item.receiver!.status!.label,
) )
], ],

Write Preview
Loading…
Cancel
Save