Compare commits

..

No commits in common. 'd6f2d78351bb3b75d1f7ac3eb3378762f69df215' and 'eea2f6b4e95d7830e38b624dd6936f350a4e3556' have entirely different histories.

@ -135,10 +135,10 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
// spacing: 8, // spacing: 8,
runSpacing: 8, runSpacing: 8,
children: [ children: [
if (Provider.of<SettingProvider>(context, listen: false).showPriority&&workOrder.priority!=null) ...[ if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
StatusLabel( StatusLabel(
label: workOrder.priority?.name, label: workOrder.priority?.name,
id: workOrder.priority?.value, id: workOrder.priority!.value!,
radius: 4, radius: 4,
textColor: AppColor.getPriorityStatusTextColor(context, workOrder.priority!.value!), textColor: AppColor.getPriorityStatusTextColor(context, workOrder.priority!.value!),
backgroundColor: AppColor.getPriorityStatusColor(context, workOrder.priority!.value!), backgroundColor: AppColor.getPriorityStatusColor(context, workOrder.priority!.value!),

@ -32,7 +32,7 @@ class ServiceRequestItemView extends StatelessWidget {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (Provider.of<SettingProvider>(context, listen: false).showPriority && requestData?.priorityName != null && requestData!.priorityName!.isNotEmpty) ...[ if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
StatusLabel( StatusLabel(
label: requestData!.priorityName!, label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
@ -95,7 +95,7 @@ class ServiceRequestItemView extends StatelessWidget {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (Provider.of<SettingProvider>(context, listen: false).showPriority && requestDetails!.priority != null && requestDetails!.priority!.isNotEmpty) ...[ if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
StatusLabel( StatusLabel(
label: requestDetails!.priority, label: requestDetails!.priority,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority), textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority),

Loading…
Cancel
Save