From 1436dbb68ae50c03b6684b3ba948d6eff451ea50 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 7 Jun 2018 18:25:16 +0200 Subject: [PATCH] FIX CICLO su all machine... --- .../WebUserControls/mod_sequencerStatiJS.ascx | 6 +++--- MapoDb/resoconti.cs | 17 ++++------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/MP-Site/WebUserControls/mod_sequencerStatiJS.ascx b/MP-Site/WebUserControls/mod_sequencerStatiJS.ascx index 376a5e6f..322a1931 100644 --- a/MP-Site/WebUserControls/mod_sequencerStatiJS.ascx +++ b/MP-Site/WebUserControls/mod_sequencerStatiJS.ascx @@ -39,8 +39,8 @@ //console.log(response); var output = response.responseText.replace("{\"d\":null}", ""); //console.log(output); - var fullData = JSON.parse(output); - console.log(fullData); + var tlData = JSON.parse(output); + //console.log(tlData); // Configuration for the Timeline var options = { @@ -52,7 +52,7 @@ , end: '2018-05-30' }; // Crea la Timeline - var timeline = new vis.Timeline(container, fullData.Items, fullData.Groups, options); + var timeline = new vis.Timeline(container, tlData.Items, tlData.Groups, options); } diff --git a/MapoDb/resoconti.cs b/MapoDb/resoconti.cs index 38fafe78..b82944ae 100644 --- a/MapoDb/resoconti.cs +++ b/MapoDb/resoconti.cs @@ -606,23 +606,14 @@ public class resoconti } else { - //numSplit = (int)Math.Ceiling((decimal)(numSplit / 100 / 4) * 100); - int index = 0; - for (int i = 3001; i < 3005; i++) - { - sequenza.AddRange(seqSingleMachine(i.ToString(), _intervallo, numSplit, index)); - index = sequenza.Count; - } -#if false + int index = 0; // ciclo su tutte le macchine var elMacchine = DataLayer.obj.taSelMacc.getAttive(); - // ricalcolo numSplit: sarà (1/numMacchine) arrotondato a 100... - numSplit = (int)Math.Ceiling((decimal)(numSplit / 100 / elMacchine.Count) * 100); foreach (var item in elMacchine) { - sequenza.AddRange(seqSingleMachine(item.value, _intervallo, numSplit)); - } -#endif + sequenza.AddRange(seqSingleMachine(item.value, _intervallo, numSplit, index)); + index = sequenza.Count; + } } return sequenza; }