diff --git a/data/data.json b/data/data.json index eada054..b9d86f0 100644 --- a/data/data.json +++ b/data/data.json @@ -1 +1 @@ -[["2016-10-14",7,13,19,31,34,1,11],["2016-10-11",5,12,20,24,37,4,11],["2016-10-07",2,12,20,27,30,9,11],["2016-10-04",4,7,14,34,38,4,11],["2016-09-30",17,35,37,43,44,2,10],["2016-09-27",6,9,13,39,41,2,12],["2016-09-23",14,16,39,42,49,3,9],["2016-09-20",1,4,10,41,45,6,9],["2016-09-16",5,8,14,22,32,2,11],["2016-09-13",4,7,16,35,44,1,3],["2016-09-09",4,11,15,17,28,1,3],["2016-09-06",12,24,30,34,45,7,10],["2016-09-02",8,16,32,40,50,2,11],["2016-08-30",13,16,29,35,42,6,8],["2016-08-26",1,9,28,30,48,7,8],["2016-08-23",2,23,31,37,45,4,8],["2016-08-19",5,6,22,25,34,5,7],["2016-08-16",2,26,34,37,46,4,8],["2016-08-12",2,15,28,36,50,2,11],["2016-08-09",12,19,43,44,45,5,10],["2016-08-05",16,19,24,35,37,2,7],["2016-08-02",2,8,27,38,46,2,6],["2016-07-29",1,21,26,40,50,2,4],["2016-07-26",3,10,13,45,49,2,11],["2016-07-22",7,24,26,37,45,5,9],["2016-07-19",19,24,28,36,37,3,6],["2016-07-15",2,11,13,14,21,1,8],["2016-07-12",3,7,26,33,41,2,10],["2016-07-08",8,12,18,33,44,4,8],["2016-07-05",1,10,29,38,48,3,4],["2016-07-01",2,11,13,40,50,1,10],["2016-06-28",26,32,37,43,49,4,5],["2016-06-24",11,19,27,28,39,3,10],["2016-06-21",5,17,32,35,49,1,5],["2016-06-17",1,7,18,27,43,4,8],["2016-06-14",13,34,39,42,50,9,11],["2016-06-10",14,21,35,42,43,7,9],["2016-06-07",19,26,35,45,49,2,5],["2016-06-03",7,23,31,33,39,6,10],["2016-05-31",6,12,26,30,48,6,7],["2016-05-27",13,25,27,43,46,4,8],["2016-05-24",16,17,23,34,37,6,9],["2016-05-20",9,14,30,41,45,4,9],["2016-05-17",15,27,32,36,39,3,10],["2016-05-13",7,15,28,31,42,10,11],["2016-05-10",2,26,27,40,49,5,10],["2016-05-06",32,34,40,45,48,1,10],["2016-05-03",8,23,24,34,38,3,7],["2016-04-29",4,5,25,28,43,6,11],["2016-04-26",10,17,31,32,42,2,5],["2016-04-22",17,26,32,34,43,2,10],["2016-04-19",11,14,15,27,44,2,7],["2016-04-15",13,14,32,37,48,1,7],["2016-04-12",1,5,9,22,38,2,10],["2016-04-08",6,8,26,43,49,6,10],["2016-04-05",3,5,9,19,40,2,5],["2016-04-01",2,16,23,25,49,6,9],["2016-03-29",1,4,19,25,36,3,11],["2016-03-25",12,19,36,42,43,5,8],["2016-03-22",12,15,26,42,49,5,8],["2016-03-18",14,19,21,24,49,5,11],["2016-03-15",5,7,10,34,44,2,10],["2016-03-11",1,21,26,40,43,6,9],["2016-03-08",1,8,9,14,23,1,7],["2016-03-04",6,9,14,23,40,1,5],["2016-03-01",4,7,13,28,37,10,11],["2016-02-26",5,13,15,33,50,9,11],["2016-02-23",23,25,32,37,42,1,11],["2016-02-19",13,14,30,32,39,3,9],["2016-02-16",3,10,22,37,50,6,10],["2016-02-12",3,20,28,31,49,2,5],["2016-02-09",6,9,13,28,37,4,5],["05-Feb-2016",3,27,32,41,46,4,8],["02-Feb-2016",36,21,10,6,9,6,2],["29-Jan-2016",29,32,23,1,5,1,7],["26-Jan-2016",15,40,24,48,38,2,9],["22-Jan-2016",27,10,30,47,12,9,8],["19-Jan-2016",2,30,38,43,46,7,2],["15-Jan-2016",43,38,19,10,46,1,11],["12-Jan-2016",2,10,30,44,1,1,8],["08-Jan-2016",35,33,26,40,5,3,8],["05-Jan-2016",6,10,31,36,39,6,10],["01-Jan-2016",4,37,38,39,44,4,7]] +[["2016-10-18",2,17,21,25,27,6,9],["2016-10-14",7,13,19,31,34,1,11],["2016-10-11",5,12,20,24,37,4,11],["2016-10-07",2,12,20,27,30,9,11],["2016-10-04",4,7,14,34,38,4,11],["2016-09-30",17,35,37,43,44,2,10],["2016-09-27",6,9,13,39,41,2,12],["2016-09-23",14,16,39,42,49,3,9],["2016-09-20",1,4,10,41,45,6,9],["2016-09-16",5,8,14,22,32,2,11],["2016-09-13",4,7,16,35,44,1,3],["2016-09-09",4,11,15,17,28,1,3],["2016-09-06",12,24,30,34,45,7,10],["2016-09-02",8,16,32,40,50,2,11],["2016-08-30",13,16,29,35,42,6,8],["2016-08-26",1,9,28,30,48,7,8],["2016-08-23",2,23,31,37,45,4,8],["2016-08-19",5,6,22,25,34,5,7],["2016-08-16",2,26,34,37,46,4,8],["2016-08-12",2,15,28,36,50,2,11],["2016-08-09",12,19,43,44,45,5,10],["2016-08-05",16,19,24,35,37,2,7],["2016-08-02",2,8,27,38,46,2,6],["2016-07-29",1,21,26,40,50,2,4],["2016-07-26",3,10,13,45,49,2,11],["2016-07-22",7,24,26,37,45,5,9],["2016-07-19",19,24,28,36,37,3,6],["2016-07-15",2,11,13,14,21,1,8],["2016-07-12",3,7,26,33,41,2,10],["2016-07-08",8,12,18,33,44,4,8],["2016-07-05",1,10,29,38,48,3,4],["2016-07-01",2,11,13,40,50,1,10],["2016-06-28",26,32,37,43,49,4,5],["2016-06-24",11,19,27,28,39,3,10],["2016-06-21",5,17,32,35,49,1,5],["2016-06-17",1,7,18,27,43,4,8],["2016-06-14",13,34,39,42,50,9,11],["2016-06-10",14,21,35,42,43,7,9],["2016-06-07",19,26,35,45,49,2,5],["2016-06-03",7,23,31,33,39,6,10],["2016-05-31",6,12,26,30,48,6,7],["2016-05-27",13,25,27,43,46,4,8],["2016-05-24",16,17,23,34,37,6,9],["2016-05-20",9,14,30,41,45,4,9],["2016-05-17",15,27,32,36,39,3,10],["2016-05-13",7,15,28,31,42,10,11],["2016-05-10",2,26,27,40,49,5,10],["2016-05-06",32,34,40,45,48,1,10],["2016-05-03",8,23,24,34,38,3,7],["2016-04-29",4,5,25,28,43,6,11],["2016-04-26",10,17,31,32,42,2,5],["2016-04-22",17,26,32,34,43,2,10],["2016-04-19",11,14,15,27,44,2,7],["2016-04-15",13,14,32,37,48,1,7],["2016-04-12",1,5,9,22,38,2,10],["2016-04-08",6,8,26,43,49,6,10],["2016-04-05",3,5,9,19,40,2,5],["2016-04-01",2,16,23,25,49,6,9],["2016-03-29",1,4,19,25,36,3,11],["2016-03-25",12,19,36,42,43,5,8],["2016-03-22",12,15,26,42,49,5,8],["2016-03-18",14,19,21,24,49,5,11],["2016-03-15",5,7,10,34,44,2,10],["2016-03-11",1,21,26,40,43,6,9],["2016-03-08",1,8,9,14,23,1,7],["2016-03-04",6,9,14,23,40,1,5],["2016-03-01",4,7,13,28,37,10,11],["2016-02-26",5,13,15,33,50,9,11],["2016-02-23",23,25,32,37,42,1,11],["2016-02-19",13,14,30,32,39,3,9],["2016-02-16",3,10,22,37,50,6,10],["2016-02-12",3,20,28,31,49,2,5],["2016-02-09",6,9,13,28,37,4,5],["05-Feb-2016",3,27,32,41,46,4,8],["02-Feb-2016",36,21,10,6,9,6,2],["29-Jan-2016",29,32,23,1,5,1,7],["26-Jan-2016",15,40,24,48,38,2,9],["22-Jan-2016",27,10,30,47,12,9,8],["19-Jan-2016",2,30,38,43,46,7,2],["15-Jan-2016",43,38,19,10,46,1,11],["12-Jan-2016",2,10,30,44,1,1,8],["08-Jan-2016",35,33,26,40,5,3,8],["05-Jan-2016",6,10,31,36,39,6,10],["01-Jan-2016",4,37,38,39,44,4,7]] diff --git a/lot.js b/lot.js index 0ed141f..016dd02 100644 --- a/lot.js +++ b/lot.js @@ -458,6 +458,8 @@ function processData(data) { re.unshift(newArray); + + } function processDataV2(data) { var newArray = []; @@ -465,16 +467,22 @@ function processDataV2(data) { console.log(data); -date = /(\/Date\()([0-9]+)([\s\S]+)/.exec(data.Date); - console.log(date[2]); - date = date[2]; -//date = parseInt(date) / 1000; - console.log(new Date(date)); - // date = Date.create(date.toString()); + date = /(\/Date\()([0-9]+)([\s\S]+)/.exec(data.Date); + var newdate = Sugar.Date.format(new Date(parseInt(date[2])), '%Y-%m-%d'); + newArray.push(newdate); - console.log(date); + newArray.push(data.Num1); + newArray.push(data.Num2); + newArray.push(data.Num3); + newArray.push(data.Num4); + newArray.push(data.Num5); + newArray.push(data.Star1); + newArray.push(data.Star2); + + re.unshift(newArray); + console.log(newArray); } @@ -497,7 +505,8 @@ function GO() { resultsQuery(function (a) { - processData(a); + //processData(a); + processDataV2(a); performCalcs(); @@ -525,30 +534,3 @@ cron.schedule('45 17 * * 2,5', function(){ // console.log('tick'); return -1; }); - - processDataV2({ Date: '/Date(1477008000000+0000)/', - Jackpot: 39000000, - NextJackpot: 49000000, - Num1: 9, - Num2: 20, - Num3: 23, - Num4: 44, - Num5: 48, - PrizeCombinations: - [ { Numbers: 5, Prize: 0, Stars: 2, Winners: 0 }, - { Numbers: 5, Prize: 408989.59, Stars: 1, Winners: 3 }, - { Numbers: 5, Prize: 28577.5, Stars: 0, Winners: 10 }, - { Numbers: 4, Prize: 3882.81, Stars: 2, Winners: 36 }, - { Numbers: 4, Prize: 176.24, Stars: 1, Winners: 846 }, - { Numbers: 3, Prize: 130.81, Stars: 2, Winners: 1591 }, - { Numbers: 4, Prize: 65.36, Stars: 0, Winners: 1806 }, - { Numbers: 2, Prize: 21.79, Stars: 2, Winners: 24943 }, - { Numbers: 3, Prize: 15.99, Stars: 1, Winners: 35930 }, - { Numbers: 3, Prize: 12.73, Stars: 0, Winners: 85437 }, - { Numbers: 1, Prize: 11.99, Stars: 2, Winners: 128187 }, - { Numbers: 2, Prize: 8.48, Stars: 1, Winners: 544209 }, - { Numbers: 2, Prize: 4.4, Stars: 0, Winners: 1289660 } ], - RaffleNumber: 0, - Star1: 8, - Star2: 10 } - );