michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Config.Entities.Medium : ToDescription() used in UI, Strings.cold/hot removed, gorjaca->ciepla, ver.2.19.879

Browse Source
This commit is contained in:
Milan Hanajik
2018-04-17 09:04:32 +02:00
parent 7c940bd633
commit 04878cea50
7 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs
+3 -3
View File
@@ -149,7 +149,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
case 21: return Text4;
case 22: return Text5;
case 23: return (WaterTemp == Medium.HotWater) ? Strings.hot : Strings.cold; /// "tepla" : "zimna";
case 23: return (WaterTemp == Medium.HotWater) ? Medium.HotWater.ToDescription() : Medium.ColdWater.ToDescription(); /// "tepla" : "zimna";
default: return string.Empty;
}
}
@@ -207,7 +207,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
case 21: Text4 = strValue; return;
case 22: Text5 = strValue; return;
case 23: WaterTemp = strValue.Equals(Strings.hot) ? Medium.HotWater : Medium.ColdWater; return; /// "tepla"
case 23: WaterTemp = strValue.Equals(Medium.HotWater.ToDescription()) ? Medium.HotWater : Medium.ColdWater; return; /// "tepla"
default: return;
}
}
@@ -258,7 +258,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
for (FlowProfileSensitivityClass tc = 0; tc < FlowProfileSensitivityClass.Count; tc++) if (tc.ToDescription().Equals(strValue)) return true;
break;
case 23:
if (strValue.Equals(Strings.cold) || strValue.Equals(Strings.hot)) return true; /// "zimna", "tepla"
if (strValue.Equals(Medium.ColdWater.ToDescription()) || strValue.Equals(Medium.HotWater.ToDescription())) return true; /// "zimna", "tepla"
break;
default:
message = "Invalid index";