Merge branch 'majd_development' into 'master'

null safety

See merge request haroon6138/cloudsolutions-atoms!10
merge-requests/11/merge
Sikander Saleem 3 years ago
commit 942fa0f0ba

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

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

@ -74,7 +74,7 @@ class DeviceTransferItem extends StatelessWidget {
),
StatusLabel(
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(
color: AColors.getRequestStatusColor(item.receiver?.status?.id??0),
label: item.receiver?.status?.label??"",
label: item.receiver!.status!.label,
)
],

Loading…
Cancel
Save