Skip to content
This repository has been archived by the owner on Feb 24, 2022. It is now read-only.

Commit

Permalink
Merge pull request #4170 from HassenRiahi/FixUTCTimeMon
Browse files Browse the repository at this point in the history 
Fix UTC conversion in the monitor views.
  • Loading branch information
HassenRiahi committed Mar 31, 2014
2 parents 070fac7 + f7a1228 commit 0a5233b
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 91 deletions.
8 changes: 4 additions & 4 deletions src/couchapp/monitor/views/endedByTime/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function(doc) {
var time = start.split(' ')[1];

var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];

var h = time.split(':')[0];
Expand All @@ -21,8 +21,8 @@ function(doc) {
m = startDate.getUTCMinutes();
s = startDate.getUTCSeconds();

if (doc.state=='new') emit([yy, mm, dd, h, m, s], {"state": 'resubmitted'});
else emit([yy, mm, dd, h, m, s], {"state": doc.state});
if (doc.state=='new') emit([yy, mm + 1, dd, h, m, s], {"state": 'resubmitted'});
else emit([yy, mm + 1, dd, h, m, s], {"state": doc.state});

}
}
10 changes: 2 additions & 8 deletions src/couchapp/monitor/views/endedByTimeDest/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function(doc) {
var time = start.split(' ')[1];

var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];

var h = time.split(':')[0];
Expand All @@ -21,13 +21,7 @@ function(doc) {
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();

if ( mm == "12"){
emit([doc.destination, parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state});
}
else {
emit([doc.destination, yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});

}
emit([doc.destination, yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});

}
}
10 changes: 2 additions & 8 deletions src/couchapp/monitor/views/endedByTimeSource/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function(doc) {
var time = start.split(' ')[1];

var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];

var h = time.split(':')[0];
Expand All @@ -21,13 +21,7 @@ function(doc) {
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();

if ( mm == "12"){
emit([doc.source, parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state});
}
else {
emit([doc.source, yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});

}
emit([doc.source, yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});

}
}
6 changes: 3 additions & 3 deletions src/couchapp/monitor/views/endedSizeByTime/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function(doc) {
var day = start.split(' ')[0];
var time = start.split(' ')[1];
var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];
var h = time.split(':')[0];
var m = time.split(':')[1];
Expand All @@ -17,10 +17,10 @@ function(doc) {
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();
if (doc.state=='new') {
emit([yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": 'resubmitted', "size": doc.size});
emit([yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": 'resubmitted', "size": doc.size});
}
else {
emit([yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
emit([yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
}
}
9 changes: 2 additions & 7 deletions src/couchapp/monitor/views/endedSizeByTimeDest/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function(doc) {
var day = start.split(' ')[0];
var time = start.split(' ')[1];
var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];
var h = time.split(':')[0];
var m = time.split(':')[1];
Expand All @@ -16,11 +16,6 @@ function(doc) {
h_utc = startDate.getUTCHours();
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();
if (mm=="12") {
emit([doc.destination, parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state, "size": doc.size});
}
else {
emit([doc.destination, yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
emit([doc.destination, yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
}
9 changes: 2 additions & 7 deletions src/couchapp/monitor/views/endedSizeByTimeSource/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function(doc) {
var day = start.split(' ')[0];
var time = start.split(' ')[1];
var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];
var h = time.split(':')[0];
var m = time.split(':')[1];
Expand All @@ -16,11 +16,6 @@ function(doc) {
h_utc = startDate.getUTCHours();
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();
if (mm=="12") {
emit([doc.source, parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state, "size": doc.size});
}
else {
emit([doc.source, yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
emit([doc.source, yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
}
31 changes: 13 additions & 18 deletions src/couchapp/monitor/views/startedByTime/map.js
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
function(doc) {
if((doc.state)&&(doc.start_time)&&(doc.state != 'done')&&(doc.state != 'failed')&&(doc.state != 'killed')&&(doc.end_time == '')){
var start = doc.start_time;
var day = start.split(' ')[0];
var time = start.split(' ')[1];
if((doc.state)&&(doc.start_time)&&(doc.state != 'done')&&(doc.state != 'failed')&&(doc.state != 'killed')&&(doc.end_time == '')){
var start = doc.start_time;
var day = start.split(' ')[0];
var time = start.split(' ')[1];

var yy = day.split('-')[0];
var mm = day.split('-')[1];
var dd = day.split('-')[2];
var yy = day.split('-')[0];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];

var h = time.split(':')[0];
var m = time.split(':')[1];
var s = time.split(':')[2].split('.')[0];
var h = time.split(':')[0];
var m = time.split(':')[1];
var s = time.split(':')[2].split('.')[0];

var startDate = new Date(yy, mm, dd, h, m, s);
var startDate = new Date(yy, mm, dd, h, m, s);
yy_utc = startDate.getUTCFullYear();
mm_utc = startDate.getUTCMonth();
dd_utc = startDate.getUTCDate();
h_utc = startDate.getUTCHours();
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();
if ( mm == "12"){
emit([parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state});
}
else {
emit([yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});

}
emit([yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});

}
}
}
9 changes: 2 additions & 7 deletions src/couchapp/monitor/views/startedByTimeDest/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function(doc) {
var time = start.split(' ')[1];

var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];

var h = time.split(':')[0];
Expand All @@ -21,13 +21,8 @@ function(doc) {
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();

if ( mm == "12"){
emit([doc.destination, parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state});
}
else {
emit([doc.destination, yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});
emit([doc.destination, yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});

}

}
}
9 changes: 2 additions & 7 deletions src/couchapp/monitor/views/startedByTimeSource/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function(doc) {
var time = start.split(' ')[1];

var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];

var h = time.split(':')[0];
Expand All @@ -21,13 +21,8 @@ function(doc) {
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();

if ( mm == "12"){
emit([doc.source, parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state});
}
else {
emit([doc.source, yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});
emit([doc.source, yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state});

}

}
}
11 changes: 3 additions & 8 deletions src/couchapp/monitor/views/startedSizeByTime/map.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
function(doc) {
if ((doc.state)&&(doc.start_time)&&(doc.state != 'done')&&(doc.state != 'failed')&&(doc.state != 'killed')&&(doc.end_time == '')) {
if ((doc.state)&&(doc.start_time)&&(doc.state != 'done')&&(doc.state != 'failed')&&(doc.state != 'killed')&&(doc.end_time == '')) {
var start = doc.start_time;
var day = start.split(' ')[0];
var time = start.split(' ')[1];
var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];
var h = time.split(':')[0];
var m = time.split(':')[1];
Expand All @@ -16,11 +16,6 @@ function(doc) {
h_utc = startDate.getUTCHours();
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();
if (mm == "12") {
emit([parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state, "size": doc.size});
}
else {
emit([yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
emit([yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
}
9 changes: 2 additions & 7 deletions src/couchapp/monitor/views/startedSizeByTimeDest/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function(doc) {
var day = start.split(' ')[0];
var time = start.split(' ')[1];
var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];
var h = time.split(':')[0];
var m = time.split(':')[1];
Expand All @@ -16,11 +16,6 @@ function(doc) {
h_utc = startDate.getUTCHours();
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();
if (mm=="12") {
emit([doc.destination, parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state, "size": doc.size});
}
else {
emit([doc.destination, yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
emit([doc.destination, yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
}
9 changes: 2 additions & 7 deletions src/couchapp/monitor/views/startedSizeByTimeSource/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function(doc) {
var day = start.split(' ')[0];
var time = start.split(' ')[1];
var yy = day.split('-')[0];
var mm = day.split('-')[1];
var mm = parseInt(day.split('-')[1]) - 1;
var dd = day.split('-')[2];
var h = time.split(':')[0];
var m = time.split(':')[1];
Expand All @@ -16,11 +16,6 @@ function(doc) {
h_utc = startDate.getUTCHours();
m_utc = startDate.getUTCMinutes();
s_utc = startDate.getUTCSeconds();
if (mm=="12") {
emit([doc.source, parseInt(yy), parseInt(mm), parseInt(dd), parseInt(h), parseInt(m), parseInt(s)], {"state": doc.state, "size": doc.size});
}
else {
emit([doc.source, yy_utc, mm_utc, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
emit([doc.source, yy_utc, mm_utc + 1, dd_utc, h_utc, m_utc, s_utc], {"state": doc.state, "size": doc.size});
}
}

0 comments on commit 0a5233b

Please sign in to comment.