fix out usersoftkeys
This commit is contained in:
Samuele Locatelli
@@ -350,10 +350,8 @@
|
||||
<lang langKey="it">Apertura cornice</lang>
|
||||
</localizedNames>
|
||||
<visible>true</visible>
|
||||
<refCall>
|
||||
<paramRef>general_sizes_frame_dim_x</paramRef>
|
||||
<label>general_sizes_frame_dim_x_button</label>
|
||||
</refCall>
|
||||
<refCallParam>general_sizes_frame_dim_x</refCallParam>
|
||||
<refCallLabel>general_sizes_frame_dim_x_button</refCallLabel>
|
||||
</softKey_procedure>
|
||||
|
||||
<softKey_procedure>
|
||||
@@ -366,10 +364,8 @@
|
||||
<lang langKey="it">Profondità cornice</lang>
|
||||
</localizedNames>
|
||||
<visible>true</visible>
|
||||
<refCall>
|
||||
<paramRef>general_sizes_frame_dim_y</paramRef>
|
||||
<label>general_sizes_frame_dim_y_button</label>
|
||||
</refCall>
|
||||
<refCallParam>general_sizes_frame_dim_y</refCallParam>
|
||||
<refCallLabel>general_sizes_frame_dim_y_button</refCallLabel>
|
||||
</softKey_procedure>
|
||||
|
||||
<softKey_procedure>
|
||||
@@ -382,10 +378,8 @@
|
||||
<lang langKey="it">Larghezza piastrafinestra</lang>
|
||||
</localizedNames>
|
||||
<visible>true</visible>
|
||||
<refCall>
|
||||
<paramRef>general_sizes_plate_dim_x</paramRef>
|
||||
<label>general_sizes_plate_dim_x_button</label>
|
||||
</refCall>
|
||||
<refCallParam>general_sizes_plate_dim_x</refCallParam>
|
||||
<refCallLabel>general_sizes_plate_dim_x_button</refCallLabel>
|
||||
</softKey_procedure>
|
||||
|
||||
<softKey_procedure>
|
||||
@@ -398,10 +392,8 @@
|
||||
<lang langKey="it">Profondità piastrafinestra</lang>
|
||||
</localizedNames>
|
||||
<visible>true</visible>
|
||||
<refCall>
|
||||
<paramRef>general_sizes_plate_dim_y</paramRef>
|
||||
<label>general_sizes_plate_dim_y_button</label>
|
||||
</refCall>
|
||||
<refCallParam>general_sizes_plate_dim_y</refCallParam>
|
||||
<refCallLabel>general_sizes_plate_dim_y_button</refCallLabel>
|
||||
</softKey_procedure>
|
||||
|
||||
<softKey_procedure>
|
||||
@@ -426,10 +418,8 @@
|
||||
<lang langKey="it">Start Ciclo Caricatore</lang>
|
||||
</localizedNames>
|
||||
<visible>true</visible>
|
||||
<refCall>
|
||||
<paramRef>cycle_loader_enable</paramRef>
|
||||
<label>cycle_loader_enable_button</label>
|
||||
</refCall>
|
||||
<refCallParam>cycle_loader_enable</refCallParam>
|
||||
<refCallLabel>cycle_loader_enable_button</refCallLabel>
|
||||
</softKey_procedure>
|
||||
|
||||
<softKey_procedure>
|
||||
@@ -442,10 +432,8 @@
|
||||
<lang langKey="it">Dashboard Setpoint Plus</lang>
|
||||
</localizedNames>
|
||||
<visible>true</visible>
|
||||
<refCall>
|
||||
<paramRef>dash_setpoint_plus</paramRef>
|
||||
<label>dash_setpoint_plus_button</label>
|
||||
</refCall>
|
||||
<refCallParam>dash_setpoint_plus</refCallParam>
|
||||
<refCallLabel>dash_setpoint_plus_button</refCallLabel>
|
||||
</softKey_procedure>
|
||||
|
||||
<softKey_procedure>
|
||||
@@ -458,10 +446,8 @@
|
||||
<lang langKey="it">Dashboard Setpoint Minus</lang>
|
||||
</localizedNames>
|
||||
<visible>true</visible>
|
||||
<refCall>
|
||||
<paramRef>dash_setpoint_minus</paramRef>
|
||||
<label>dash_setpoint_minus_button</label>
|
||||
</refCall>
|
||||
<refCallParam>dash_setpoint_minus</refCallParam>
|
||||
<refCallLabel>dash_setpoint_minus_button</refCallLabel>
|
||||
</softKey_procedure>
|
||||
|
||||
|
||||
|
||||
@@ -24,14 +24,6 @@
|
||||
</xs:extension>
|
||||
</xs:simpleContent>
|
||||
</xs:complexType>
|
||||
|
||||
<!--gestione refCall-->
|
||||
<xs:complexType name="refCallType">
|
||||
<xs:all>
|
||||
<xs:element name="paramRef" minOccurs="1" maxOccurs="1" type="xs:string"></xs:element>
|
||||
<xs:element name="label" minOccurs="1" maxOccurs="1" type="xs:string"></xs:element>
|
||||
</xs:all>
|
||||
</xs:complexType>
|
||||
|
||||
<!-- Group of softkey type-->
|
||||
<xs:complexType name="groupType">
|
||||
@@ -39,7 +31,8 @@
|
||||
<xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
|
||||
<xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
|
||||
<xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
|
||||
<xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
|
||||
<xs:element name="refCallLabel" minOccurs="0" type="xs:string"></xs:element>
|
||||
<xs:element name="refCallParam" minOccurs="0" type="xs:string"></xs:element>
|
||||
<xs:element name="category" type="xs:integer"></xs:element>
|
||||
<xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
|
||||
<xs:element name="localizedNames">
|
||||
@@ -75,7 +68,8 @@
|
||||
<xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
|
||||
<xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
|
||||
<xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
|
||||
<xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
|
||||
<xs:element name="refCallLabel" minOccurs="0" type="xs:string"></xs:element>
|
||||
<xs:element name="refCallParam" minOccurs="0" type="xs:string"></xs:element>
|
||||
<xs:element name="category" type="xs:integer"></xs:element>
|
||||
<xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
|
||||
<xs:element name="localizedNames">
|
||||
@@ -96,7 +90,8 @@
|
||||
<xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
|
||||
<xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
|
||||
<xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
|
||||
<xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
|
||||
<xs:element name="refCallLabel" minOccurs="0" type="xs:string"></xs:element>
|
||||
<xs:element name="refCallParam" minOccurs="0" type="xs:string"></xs:element>
|
||||
<xs:element name="category" type="xs:integer"></xs:element>
|
||||
<xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
|
||||
<xs:element name="localizedNames">
|
||||
|
||||
@@ -518,8 +518,8 @@ namespace Thermo.Active.Config
|
||||
IsActive = Convert.ToBoolean(x.Element("active").Value),
|
||||
IsVisible = Convert.ToBoolean(x.Element("visible").Value),
|
||||
IsStarred = x.Element("starred") != null ? Convert.ToBoolean(x.Element("starred").Value) : false,
|
||||
RefCallParam = x.Element("refCallParam") != null ? x.Element("refCallParam").Value : "",
|
||||
RefCallLabel = x.Element("refCallLabel") != null ? x.Element("refCallLabel").Value : "",
|
||||
RefCallParam = x.Element("refCallParam") != null ? x.Element("refCallParam").Value : "",
|
||||
Category = Convert.ToInt32(x.Element("category").Value),
|
||||
LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read localized names and convert into a dictionary
|
||||
y => y.Attribute("langKey").Value, y => y.Value
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Config\userSoftKeyConfig.xml">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
<EmbeddedResource Include="Config\userSoftKeyConfigValidator.xsd">
|
||||
|
||||
@@ -46,6 +46,8 @@ namespace Thermo.Active.Database.Controllers
|
||||
Id = softKey.Id,
|
||||
Category = softKey.Category,
|
||||
OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
|
||||
RefCallLabel = softKey.RefCallLabel,
|
||||
RefCallParam = softKey.RefCallParam,
|
||||
Type = softKey.Type,
|
||||
SubKeys = tmpSubKey
|
||||
});
|
||||
|
||||
@@ -8,6 +8,8 @@ namespace Thermo.Active.Model.DTOModels
|
||||
public int Id { get; set; }
|
||||
public int Category { get; set; }
|
||||
public bool OperatorConfirmationNeeded { get; set; }
|
||||
public string RefCallParam { get; set; } = "";
|
||||
public string RefCallLabel { get; set; } = "";
|
||||
public SOFTKEY_TYPE Type { get; set; }
|
||||
public Dictionary<int, string> SubKeys { get; set; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user