diff --git a/lib/models/device/asset_search.dart b/lib/models/device/asset_search.dart index 6d70fadb..9d57ddbd 100644 --- a/lib/models/device/asset_search.dart +++ b/lib/models/device/asset_search.dart @@ -157,7 +157,7 @@ class DeviceSearch { final map = {}; if (code != null && code!.isNotEmpty) map['code'] = code; if (assetSerialNumber != null && assetSerialNumber!.isNotEmpty) map['assetSerialNumber'] = assetSerialNumber; - if (assetName != null && assetName!.isNotEmpty) map['assetName'] = assetName; + if (assetName != null && assetName!.isNotEmpty) map['assetName'] = [assetName]; if (supplyDateSymbol != null) { map['supplyDateSymbol'] = supplyDateSymbol!.toJson(); } diff --git a/lib/modules/pm_module/recurrent_wo/recurrent_work_order_view.dart b/lib/modules/pm_module/recurrent_wo/recurrent_work_order_view.dart index fd0c88ef..b9524cfa 100644 --- a/lib/modules/pm_module/recurrent_wo/recurrent_work_order_view.dart +++ b/lib/modules/pm_module/recurrent_wo/recurrent_work_order_view.dart @@ -118,8 +118,9 @@ class _RecurrentWorkOrderViewState extends State { children: [ AppFilledButton( label: context.translation.save, - buttonColor: context.isDark ? AppColor.neutral20 : AppColor.white60, - textColor: context.isDark ? Colors.white : AppColor.black10, + buttonColor: AppColor.background(context), + textColor: AppColor.labelTextStyleColor(context), + showBorder: true, onPressed: () => _updateTask(context: context, status: 0), ).expanded, 12.width, diff --git a/lib/new_views/swipe_module/dialoge/acknowledge_work_dialog.dart b/lib/new_views/swipe_module/dialoge/acknowledge_work_dialog.dart index 916d1b06..0b2595cc 100644 --- a/lib/new_views/swipe_module/dialoge/acknowledge_work_dialog.dart +++ b/lib/new_views/swipe_module/dialoge/acknowledge_work_dialog.dart @@ -40,7 +40,7 @@ class AcknowledgeWorkDialog extends StatelessWidget { children: [ AppFilledButton( label: cancelButtonText?? "Discard", - buttonColor: Colors.white54, + buttonColor: AppColor.background(context), textColor: AppColor.red30, height: 40, showBorder: true,