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

Fix timeline date

Browse Source
This commit is contained in:
Lucio Maranta
2019-03-12 09:56:58 +01:00
parent c391a161c5
commit 09b6e4e009
4 changed files with 142 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Config/Report/Programs.xml
+115
View File
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8" ?>
<root>
<programs>
<program>
<name>Nuovo Prg</name>
<quantity>17</quantity>
<startDate>10/02/2019 12:00</startDate>
<endDate>10/02/2019 19:00</endDate>
<actualT>03:00:00</actualT>
<averageT>02:00:00</averageT>
<theoricT>04:00:00</theoricT>
<deviation>+01:00:00</deviation>
<frequency>10</frequency>
</program>
<program>
<name>Finestra</name>
<quantity>3</quantity>
<startDate>22/02/2019 12:00</startDate>
<endDate>22/02/2019 11:00</endDate>
<actualT>01:00:00</actualT>
<averageT>01:00:00</averageT>
<theoricT>02:00:00</theoricT>
<deviation>00:00:00</deviation>
<frequency>5</frequency>
</program>
<program>
<name>Telaio</name>
<quantity>22</quantity>
<startDate>15/02/2019 12:00</startDate>
<endDate>17/02/2019 19:00</endDate>
<actualT>01:00:00</actualT>
<averageT>00:50:45</averageT>
<theoricT>01:00:00</theoricT>
<deviation>-01:00:00</deviation>
<frequency>30</frequency>
</program>
<program>
<name>Fresatura</name>
<quantity>50</quantity>
<startDate>01/02/2019 10:00</startDate>
<endDate>04/02/2019 16:00</endDate>
<actualT>15:00:00</actualT>
<averageT>13:00:00</averageT>
<theoricT>14:00:00</theoricT>
<deviation>-01:00:00</deviation>
<frequency>40</frequency>
</program>
<program>
<name>Vasca</name>
<quantity>7</quantity>
<startDate>01/02/2019 10:00</startDate>
<endDate>04/02/2019 16:00</endDate>
<actualT>03:00:00</actualT>
<averageT>03:00:00</averageT>
<theoricT>03:00:00</theoricT>
<deviation>+00:00:00</deviation>
<frequency>20</frequency>
</program>
<program>
<name>Portiera</name>
<quantity>45</quantity>
<startDate>01/02/2019 10:00</startDate>
<endDate>04/02/2019 16:00</endDate>
<actualT>15:00:00</actualT>
<averageT>13:00:00</averageT>
<theoricT>14:00:00</theoricT>
<deviation>-01:00:00</deviation>
<frequency>30</frequency>
</program>
<program>
<name>Buchi</name>
<quantity>38</quantity>
<startDate>01/01/2019 10:00</startDate>
<endDate>02/01/2019 11:00</endDate>
<actualT>01:00:00</actualT>
<averageT>00:55:00</averageT>
<theoricT>01:20:00</theoricT>
<deviation>+00:25:00</deviation>
<frequency>55</frequency>
</program>
<program>
<name>Finestra</name>
<quantity>1</quantity>
<startDate>22/02/2019 20:00</startDate>
<endDate>22/02/2019 22:00</endDate>
<actualT>02:00:00</actualT>
<averageT>02:00:45</averageT>
<theoricT>02:30:00</theoricT>
<deviation>+00:30:45</deviation>
<frequency>2</frequency>
</program>
<program>
<name>Occhiali</name>
<quantity>38</quantity>
<startDate>16/01/2019 08:00</startDate>
<endDate>16/01/2019 19:00</endDate>
<actualT>00:50:11</actualT>
<averageT>00:45:20</averageT>
<theoricT>00:50:00</theoricT>
<deviation>+00:04:40</deviation>
<frequency>80</frequency>
</program>
<program>
<name>Misurazione</name>
<quantity>60</quantity>
<startDate>11/02/2019 08:00</startDate>
<endDate>17/02/2019 19:00</endDate>
<actualT>00:02:11</actualT>
<averageT>00:01:50</averageT>
<theoricT>00:01:30</theoricT>
<deviation>-00:00:20</deviation>
<frequency>60</frequency>
</program>
</programs>
</root>
Step.Config/Report/TimeLine.xml
+22 -22
View File
@@ -3,36 +3,36 @@
<statusData>
<runs>
<run>
<from>01/01/2019</from>
<to>03/01/2019</to>
<from>2019-02-01</from>
<to>2019-02-03</to>
</run>
<run>
<from>05/01/2019</from>
<to>10/01/2019</to>
<from>2019-02-22</from>
<to>2019-02-28</to>
</run>
<run>
<from>22/01/2019</from>
<to>27/01/2019</to>
<from>2019-03-05</from>
<to>2019-03-10</to>
</run>
</runs>
<stops>
<stop>
<from>04/01/2019</from>
<to>05/01/2019</to>
<from>2019-02-15</from>
<to>2019-02-17</to>
</stop>
<stop>
<from>18/01/2019</from>
<to>20/01/2019</to>
<from>2019-03-01</from>
<to>2019-03-05</to>
</stop>
</stops>
<idles>
<idle>
<from>11/01/2019</from>
<to>18/01/2019</to>
<from>2019-02-11</from>
<to>2019-02-13</to>
</idle>
<idle>
<from>28/01/2019</from>
<to>30/01/2019</to>
<from>2019-03-04</from>
<to>2019-03-05</to>
</idle>
</idles>
</statusData>
@@ -44,12 +44,12 @@
<frequency>44</frequency>
<dates>
<date>
<from>01/01/2019</from>
<to>05/01/2019</to>
<from>2019-02-01</from>
<to>2019-02-05</to>
</date>
<date>
<from>10/01/2019</from>
<to>15/01/2019</to>
<from>2019-02-10</from>
<to>2019-02-15</to>
</date>
</dates>
</partPrg>
@@ -59,12 +59,12 @@
<frequency>33</frequency>
<dates>
<date>
<from>20/01/2019</from>
<to>23/01/2019</to>
<from>2019-02-20</from>
<to>2019-02-23</to>
</date>
<date>
<from>25/01/2019</from>
<to>25/01/2019</to>
<from>2019-02-25</from>
<to>2019-02-25</to>
</date>
</dates>
</partPrg>
Step.Config/Step.Config.csproj
+3
View File
@@ -52,6 +52,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServerConfig.cs" />
<Compile Include="ServerConfigController.cs" />
<EmbeddedResource Include="Report\Programs.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Report\TimeLine.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
Step/Controllers/WebApi/ReportController.cs
+2 -2
View File
@@ -145,10 +145,10 @@ namespace Step.Controllers.WebApi
public class DTOTimelineDateElement
{
[XmlElement("from")]
public string From { get; set; }
public DateTime From { get; set; }
[XmlElement("to")]
public string To { get; set; }
public DateTime To { get; set; }
}
public class DTOTimelinePartPrg