From 09b6e4e0090c775129f8928aab828990e7117fe1 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Tue, 12 Mar 2019 09:56:58 +0100 Subject: [PATCH] Fix timeline date --- Step.Config/Report/Programs.xml | 115 ++++++++++++++++++++ Step.Config/Report/TimeLine.xml | 44 ++++---- Step.Config/Step.Config.csproj | 3 + Step/Controllers/WebApi/ReportController.cs | 4 +- 4 files changed, 142 insertions(+), 24 deletions(-) create mode 100644 Step.Config/Report/Programs.xml diff --git a/Step.Config/Report/Programs.xml b/Step.Config/Report/Programs.xml new file mode 100644 index 00000000..0d1cb8b2 --- /dev/null +++ b/Step.Config/Report/Programs.xml @@ -0,0 +1,115 @@ + + + + + Nuovo Prg + 17 + 10/02/2019 12:00 + 10/02/2019 19:00 + 03:00:00 + 02:00:00 + 04:00:00 + +01:00:00 + 10 + + + Finestra + 3 + 22/02/2019 12:00 + 22/02/2019 11:00 + 01:00:00 + 01:00:00 + 02:00:00 + 00:00:00 + 5 + + + Telaio + 22 + 15/02/2019 12:00 + 17/02/2019 19:00 + 01:00:00 + 00:50:45 + 01:00:00 + -01:00:00 + 30 + + + Fresatura + 50 + 01/02/2019 10:00 + 04/02/2019 16:00 + 15:00:00 + 13:00:00 + 14:00:00 + -01:00:00 + 40 + + + Vasca + 7 + 01/02/2019 10:00 + 04/02/2019 16:00 + 03:00:00 + 03:00:00 + 03:00:00 + +00:00:00 + 20 + + + Portiera + 45 + 01/02/2019 10:00 + 04/02/2019 16:00 + 15:00:00 + 13:00:00 + 14:00:00 + -01:00:00 + 30 + + + Buchi + 38 + 01/01/2019 10:00 + 02/01/2019 11:00 + 01:00:00 + 00:55:00 + 01:20:00 + +00:25:00 + 55 + + + Finestra + 1 + 22/02/2019 20:00 + 22/02/2019 22:00 + 02:00:00 + 02:00:45 + 02:30:00 + +00:30:45 + 2 + + + Occhiali + 38 + 16/01/2019 08:00 + 16/01/2019 19:00 + 00:50:11 + 00:45:20 + 00:50:00 + +00:04:40 + 80 + + + Misurazione + 60 + 11/02/2019 08:00 + 17/02/2019 19:00 + 00:02:11 + 00:01:50 + 00:01:30 + -00:00:20 + 60 + + + \ No newline at end of file diff --git a/Step.Config/Report/TimeLine.xml b/Step.Config/Report/TimeLine.xml index a9fd0937..e5cdbbf2 100644 --- a/Step.Config/Report/TimeLine.xml +++ b/Step.Config/Report/TimeLine.xml @@ -3,36 +3,36 @@ - 01/01/2019 - 03/01/2019 + 2019-02-01 + 2019-02-03 - 05/01/2019 - 10/01/2019 + 2019-02-22 + 2019-02-28 - 22/01/2019 - 27/01/2019 + 2019-03-05 + 2019-03-10 - 04/01/2019 - 05/01/2019 + 2019-02-15 + 2019-02-17 - 18/01/2019 - 20/01/2019 + 2019-03-01 + 2019-03-05 - 11/01/2019 - 18/01/2019 + 2019-02-11 + 2019-02-13 - 28/01/2019 - 30/01/2019 + 2019-03-04 + 2019-03-05 @@ -44,12 +44,12 @@ 44 - 01/01/2019 - 05/01/2019 + 2019-02-01 + 2019-02-05 - 10/01/2019 - 15/01/2019 + 2019-02-10 + 2019-02-15 @@ -59,12 +59,12 @@ 33 - 20/01/2019 - 23/01/2019 + 2019-02-20 + 2019-02-23 - 25/01/2019 - 25/01/2019 + 2019-02-25 + 2019-02-25 diff --git a/Step.Config/Step.Config.csproj b/Step.Config/Step.Config.csproj index e35ea7f2..5bb37d5c 100644 --- a/Step.Config/Step.Config.csproj +++ b/Step.Config/Step.Config.csproj @@ -52,6 +52,9 @@ + + Always + Always diff --git a/Step/Controllers/WebApi/ReportController.cs b/Step/Controllers/WebApi/ReportController.cs index b84f0690..166c1372 100644 --- a/Step/Controllers/WebApi/ReportController.cs +++ b/Step/Controllers/WebApi/ReportController.cs @@ -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