Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/recipe

Browse Source
This commit is contained in:
Samuele Locatelli
2020-07-27 10:51:51 +02:00
parent 2819c901f1 f741a39644
commit b707c4a2f5
4 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Config/Config/userSoftKeyConfig.xml
+43 -30
View File
@@ -2,7 +2,7 @@
<userSoftKeys>
<softKey_procedure>
<active>true</active>
<active>false</active>
<category>1</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
<plcId>1</plcId>
@@ -25,7 +25,7 @@
<visible>true</visible>
</softKey_procedure>
<softKey_toggle>
<softKey_procedure>
<active>false</active>
<category>3</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -35,9 +35,9 @@
<lang langKey="it">Termoregolatori</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
</softKey_procedure>
<softKey_toggle>
<softKey_procedure>
<active>false</active>
<category>4</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -47,9 +47,9 @@
<lang langKey="it">Portellone frontale</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
</softKey_procedure>
<softKey_toggle>
<softKey_procedure>
<active>true</active>
<category>5</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -59,7 +59,7 @@
<lang langKey="it">Pausa ciclo</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
</softKey_procedure>
<softKey_procedure>
<active>true</active>
@@ -71,9 +71,10 @@
<lang langKey="it">Parcheggio macchina</lang>
</localizedNames>
<visible>true</visible>
<starred>true</starred>
</softKey_procedure>
<softKey_toggle>
<softKey_procedure>
<active>true</active>
<category>7</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -83,9 +84,23 @@
<lang langKey="it">Riflettori</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
<starred>true</starred>
</softKey_procedure>
<softKey_toggle>
<softKey_procedure>
<active>true</active>
<category>7</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
<plcId>8</plcId>
<localizedNames>
<lang langKey="en">Heaters Back</lang>
<lang langKey="it">Riscaldi indietro</lang>
</localizedNames>
<visible>true</visible>
<starred>true</starred>
</softKey_procedure>
<softKey_procedure>
<active>true</active>
<category>1</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -95,7 +110,7 @@
<lang langKey="it">Pompe vuoto</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
</softKey_procedure>
<softKey_procedure>
<active>true</active>
@@ -155,7 +170,6 @@
<lang langKey="it">Extra 10s riscaldo superiore</lang>
</localizedNames>
<visible>true</visible>
<starred>true</starred>
</softKey_procedure>
<softKey_procedure>
@@ -168,7 +182,6 @@
<lang langKey="it">Extra 10s riscaldo inferiore</lang>
</localizedNames>
<visible>true</visible>
<starred>true</starred>
</softKey_procedure>
<softKey_procedure>
@@ -404,7 +417,7 @@
</softKey_procedure>
<softKey_procedure>
<active>true</active>
<active>false</active>
<category>7</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
<plcId>35</plcId>
@@ -451,22 +464,22 @@
</refCall>
</softKey_procedure>
<!--
<softKey_group>
<active>true</active>
<category>3</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
<localizedNames>
<lang langKey="en">Brakes ON/FF:</lang>
<lang langKey="it">Freni ON/OFF</lang>
</localizedNames>
<subKeys>
<subKey active="true" plcId="50"> B </subKey>
<subKey active="true" plcId="51"> C </subKey>
</subKeys>
<visible>true</visible>
</softKey_group>
-->
<!--softKey_group>
<active>true</active>
<category>1</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
<localizedNames>
<lang langKey="en">aaa:</lang>
<lang langKey="it">aaa</lang>
</localizedNames>
<subKeys>
<subKey active="true" plcId="21"> B </subKey>
<subKey active="true" plcId="22"> C </subKey>
</subKeys>
<visible>true</visible>
</softKey_group-->
</userSoftKeys>
Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs
+3
View File
@@ -20,6 +20,7 @@ namespace Thermo.Active.Model.DTOModels
public bool Visible { get; set; }
public bool Starred { get; set; } = false;
public bool Value { get; set; }
public bool OperatorConfirmationNeeded { get; set; }
public string RefCallParam { get; set; } = "";
public string RefCallLabel { get; set; } = "";
@@ -36,6 +37,8 @@ namespace Thermo.Active.Model.DTOModels
return false;
if (Value != item.Value)
return false;
if (OperatorConfirmationNeeded != item.OperatorConfirmationNeeded)
return false;
if (RefCallParam != item.RefCallParam)
return false;
if (RefCallLabel != item.RefCallLabel)
Thermo.Active.NC/NcAdapter.cs
+6
View File
@@ -1015,6 +1015,7 @@ namespace Thermo.Active.NC
Starred = softKey.IsStarred,
RefCallParam = softKey.RefCallParam,
RefCallLabel = softKey.RefCallLabel,
OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
Category = softKey.Category,
Value = plcSoftKey.Value
});
@@ -1024,6 +1025,7 @@ namespace Thermo.Active.NC
{
Id = softKey.Id,
Category = softKey.Category,
OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
Visible = softKey.IsVisible
});
}
@@ -1038,6 +1040,7 @@ namespace Thermo.Active.NC
Starred = softKey.IsStarred,
RefCallParam = softKey.RefCallParam,
RefCallLabel = softKey.RefCallLabel,
OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
Category = softKey.Category,
Visible = softKey.IsVisible,
Value = plcSoftKey.Value
@@ -1079,6 +1082,7 @@ namespace Thermo.Active.NC
Starred = softKey.IsStarred,
RefCallParam = softKey.RefCallParam,
RefCallLabel = softKey.RefCallLabel,
OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
Category = softKey.Category,
Value = plcSoftKey.Value
});
@@ -1091,6 +1095,7 @@ namespace Thermo.Active.NC
{
Id = softKey.Id,
Category = softKey.Category,
OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
Visible = softKey.IsVisible
});
}
@@ -1108,6 +1113,7 @@ namespace Thermo.Active.NC
Starred = softKey.IsStarred,
RefCallParam = softKey.RefCallParam,
RefCallLabel = softKey.RefCallLabel,
OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
Category = softKey.Category,
Visible = softKey.IsVisible,
Value = plcSoftKey.Value
Thermo.Active/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.10.53")]
[assembly: AssemblyVersion("0.10.54")]