hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 10:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make daily view work when client and server have different timezones

Browse source
This commit is contained in:
Sacha Greif 2016-05-13 15:52:33 +09:00
parent e872c19fd0
commit 89c8616dae
3 changed files with 59 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/nova-core/lib/server/start.js
View file

@ -15,3 +15,5 @@ Meteor.startup(function() {
SyncedCron.start(); SyncedCron.start();
} }
}); });
Inject.obj('serverTimezoneOffset', {offset: new Date().getTimezoneOffset()});

5
packages/nova-lib/package.js
View file

@ -75,7 +75,10 @@ Package.onUse(function (api) {
'utilities:smart-methods@0.1.4', 'utilities:smart-methods@0.1.4',
'ecmascript@0.4.2', 'ecmascript@0.4.2',
'react-meteor-data@0.2.8' 'react-meteor-data@0.2.8',
// 'simple:reactive-method@1.0.2',
'meteorhacks:inject-initial@1.0.4'
]; ];
api.use(packages); api.use(packages);

56
packages/nova-posts/lib/parameters.js
View file

@ -61,16 +61,66 @@ Telescope.callbacks.add("postsParameters", addViewParameter);
// Add "after" and "before" properties to terms which can be used to limit posts in time. // Add "after" and "before" properties to terms which can be used to limit posts in time.
function addTimeParameter (parameters, terms) { function addTimeParameter (parameters, terms) {
// console.log("// addTimeParameter")
if (typeof parameters.selector.postedAt === "undefined") { if (typeof parameters.selector.postedAt === "undefined") {
var postedAt = {}; let postedAt = {}, mAfter, mBefore, startOfDay, endOfDay, clientTimezoneOffset, serverTimezoneOffset, timeDifference;
/*
If we're on the client, add the time difference between client and server
Example: client is on Japanese time (+9 hours),
server on UCT (Greenwich) time (+0 hours), for a total difference of +9 hours.
So the time "00:00, UCT" is equivalent to "09:00, JST".
So if we want to express the timestamp "00:00, UCT" on the client,
we *add* 9 hours to "00:00, JST" on the client to get "09:00, JST" and
sync up both times.
*/
if (Meteor.isClient) {
clientTimezoneOffset = -1 * new Date().getTimezoneOffset();
serverTimezoneOffset = -1 * Injected.obj('serverTimezoneOffset').offset;
timeDifference = clientTimezoneOffset - serverTimezoneOffset;
// console.log("client time:"+clientTimezoneOffset);
// console.log("server time:"+serverTimezoneOffset);
// console.log("difference: "+timeDifference);
}
if (terms.after) { if (terms.after) {
postedAt.$gte = moment(terms.after, "YYYY-MM-DD").startOf('day').toDate();
// console.log("// after: "+terms.after);
mAfter = moment(terms.after, "YYYY-MM-DD");
startOfDay = mAfter.startOf('day');
// console.log("// normal ", mAfter.toDate(), mAfter.valueOf());
// console.log("// startOfDay ", startOfDay.toDate(), startOfDay.valueOf());
if (Meteor.isClient) {
startOfDay.add(timeDifference, "minutes");
// console.log("// after add ", startOfDay.toDate(), startOfDay.valueOf());
}
postedAt.$gte = startOfDay.toDate();
} }
if (terms.before) { if (terms.before) {
postedAt.$lt = moment(terms.before, "YYYY-MM-DD").endOf('day').toDate();
mBefore = moment(terms.before, "YYYY-MM-DD");
endOfDay = mBefore.endOf('day');
if (Meteor.isClient) {
endOfDay.add(timeDifference, "minutes");
}
postedAt.$lt = endOfDay.toDate();
} }
if (!_.isEmpty(postedAt)) { if (!_.isEmpty(postedAt)) {