Add localized maintenances description

This commit is contained in:
Lucio Maranta
2018-07-10 15:07:37 +02:00
parent b5bd21187b
commit bd7fbb1503
7 changed files with 44 additions and 18 deletions
+12 -6
View File
@@ -2,27 +2,33 @@
<maintenances>
<maintenance>
<id>1</id>
<localizedNames>
<localizedName>
<lang langKey="en">Manutenzione scaduta</lang>
<lang langKey="it">Manutenzione scaduta</lang>
</localizedNames>
</localizedName>
<interval>10</interval>
<deadline>15/06/2018 13:00</deadline>
<type>EXP_DATE</type>
<description>DescriptionUNO</description>
<localizedDescription>
<lang langKey="en">Test 2 </lang>
<lang langKey="it">Ita 2</lang>
</localizedDescription>
<unitOfMeasure>D</unitOfMeasure>
<counterId>2</counterId>
</maintenance>
<maintenance>
<id>2</id>
<localizedNames>
<localizedName>
<lang langKey="en">Test 2 </lang>
<lang langKey="it">Ita 2</lang>
</localizedNames>
</localizedName>
<interval>1000</interval>
<deadline>15/07/2018 13:00</deadline>
<type>MACHINE_INTERVAL</type>
<description>Description</description>
<localizedDescription>
<lang langKey="en">Test 2 </lang>
<lang langKey="it">Ita 2</lang>
</localizedDescription>
<unitOfMeasure>mm</unitOfMeasure>
<counterId>1</counterId>
</maintenance>
@@ -9,7 +9,7 @@
<xs:complexType>
<xs:all>
<xs:element name="id" type="xs:int" />
<xs:element name="localizedNames">
<xs:element name="localizedName">
<xs:complexType>
<xs:sequence>
<xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
@@ -19,7 +19,14 @@
</xs:element>
<xs:element name="interval" type="xs:string" />
<xs:element name="deadline" type="xs:string" />
<xs:element name="description" type="xs:string" />
<xs:element name="localizedDescription">
<xs:complexType>
<xs:sequence>
<xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="unitOfMeasure" type="unitOfMeasureType" />
<xs:element name="type" type="maintenanceType" />
<xs:element name="counterId" type="xs:unsignedInt"/>
+4 -2
View File
@@ -206,14 +206,16 @@ namespace Step.Config
new MaintenanceConfigModel()
{
Id = Convert.ToInt32(x.Element("id").Value),
LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read names list
LocalizedName = x.Element("localizedName").Elements().ToDictionary( // Read localized names
y => y.Attribute("langKey").Value, y => y.Value
),
Intervall = TimeSpan.FromMinutes(Convert.ToDouble(x.Element("interval").Value)),
Deadline = DateTime.Parse(x.Element("deadline").Value),
Type = x.Element("type").Value,
CouterId = Convert.ToInt32(x.Element("counterId").Value),
Description = x.Element("description").Value,
LocalizedDescription = x.Element("localizedDescription").Elements().ToDictionary( // Read localization of description
y => y.Attribute("langKey").Value, y => y.Value
),
UnitOfMeasure = x.Element("unitOfMeasure").Value
})
.ToList();