Skip to content

Commit 8298264

Browse files
committed
TimeZoneConvertion Fixes
1 parent eb3d413 commit 8298264

File tree

1 file changed

+5
-23
lines changed

1 file changed

+5
-23
lines changed

docs/js/subscription_app.js

+5-23
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,7 @@ App = {
1616
IntervalInstance: {},
1717
init: function () {
1818

19-
console.log("App initialized...", "TimeInMilliseconds", App.ReturnUTCTime(), "--", App.FormatDateTime(App.ReturnUTCTime()))
20-
21-
// Multiply by 1000 because JS works in milliseconds instead of the UNIX seconds
22-
var date = new Date();
23-
24-
var year = date.getUTCFullYear();
25-
var month = date.getUTCMonth() + 1; // getMonth() is zero-indexed, so we'll increment to get the correct month number
26-
var day = date.getUTCDate();
27-
var hours = date.getUTCHours();
28-
var minutes = date.getUTCMinutes();
29-
var seconds = date.getUTCSeconds();
30-
31-
month = (month < 10) ? '0' + month : month;
32-
day = (day < 10) ? '0' + day : day;
33-
hours = (hours < 10) ? '0' + hours : hours;
34-
minutes = (minutes < 10) ? '0' + minutes : minutes;
35-
seconds = (seconds < 10) ? '0' + seconds: seconds;
36-
37-
console.log(year + '-' + month + '-' + day + ' ' + hours + ':' + minutes);
38-
19+
console.log("App initialized...", "TimeInMilliseconds", App.ReturnUTCTime(), "-UTC-", App.FormatDateTime(App.ReturnUTCTime()), "-Now-", App.FormatDateTime(Date.now()));
3920
return App.initWeb3();
4021
},
4122

@@ -173,6 +154,7 @@ App = {
173154
App.contracts.Subscription.deployed().then(function (instance) {
174155
subscriptionInstance = instance;
175156
let closingTime = App.ReturnUTCTime() + (1000 * 60 * App.subscriptionTimeInMin);
157+
console.log("-NowInGMT-", App.FormatDateTime(App.ReturnUTCTime()), "-TimeForEVM-", App.FormatDateTime(closingTime))
176158
return subscriptionInstance.putSubscriptions(closingTime, { from: App.account, value: web3.toWei(value, 'ether') });
177159
}).then((receipt) => {
178160
console.log(receipt);
@@ -218,10 +200,10 @@ App = {
218200
subscriptionInstance.subscriptions(i)
219201
.then((subscribe) => {
220202
let subscriberDt = subscribe[2].toNumber();
221-
console.log(i, subscribe[1], "TimeImMilliSeconds", subscriberDt, "Subscription Time", App.FormatDateTime(subscriberDt));
222-
let dt = new Date();
203+
console.log(i, subscribe[1], "TimeImMilliSeconds", subscriberDt, "Time(EVM)", App.FormatDateTime(subscriberDt), "-NowInGMT-", App.FormatDateTime(App.ReturnUTCTime()) );
204+
/*let dt = new Date();
223205
let offset = Math.round(subscriberDt - dt.getTimezoneOffset()*60*1000)
224-
console.log("Offset: InMilliseconds", offset, "-ii-", App.FormatDateTime(offset))
206+
console.log("Offset: InMilliseconds", offset, "-ii-", App.FormatDateTime(offset))*/
225207

226208
if (App.ReturnUTCTime() <= subscribe[2].toNumber()) {
227209
console.log("Subscription On!", )

0 commit comments

Comments
 (0)