Skip to content

Commit 2ab57db

Browse files
committed
TimeZoneConvertion Fixes
1 parent 8298264 commit 2ab57db

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

docs/js/subscription_app.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ App = {
6969
}).watch(function (error, event) {
7070

7171
if (error === null) {
72-
//console.log(App.subscriptionIndexCount, event.args._subscriptionIndex.toNumber())
72+
console.log(App.subscriptionIndexCount, event.args._subscriptionIndex.toNumber())
7373
if(App.subscriptionIndexCount < event.args._subscriptionIndex.toNumber()){
74-
//console.log("["+ event.event+"]","Previous:", App.subscriptionIndexCount,", Current:", event.args._subscriptionIndex.toNumber());
74+
console.log("["+ event.event+"]","Previous:", App.subscriptionIndexCount,", Current:", event.args._subscriptionIndex.toNumber());
7575
if(App.subscriptionLoadingComplete){
7676
App.subscriptionLoadingComplete = false;
7777
App.GetAllSubscriptions();
@@ -154,7 +154,7 @@ App = {
154154
App.contracts.Subscription.deployed().then(function (instance) {
155155
subscriptionInstance = instance;
156156
let closingTime = App.ReturnUTCTime() + (1000 * 60 * App.subscriptionTimeInMin);
157-
console.log("-NowInGMT-", App.FormatDateTime(App.ReturnUTCTime()), "-TimeForEVM-", App.FormatDateTime(closingTime))
157+
console.log("-NowInGMT-", App.FormatDateTime(App.ReturnUTCTime()), "-TimeForEVM-", App.FormatDateTime(closingTime), "--RAW--", closingTime);
158158
return subscriptionInstance.putSubscriptions(closingTime, { from: App.account, value: web3.toWei(value, 'ether') });
159159
}).then((receipt) => {
160160
console.log(receipt);
@@ -200,18 +200,19 @@ App = {
200200
subscriptionInstance.subscriptions(i)
201201
.then((subscribe) => {
202202
let subscriberDt = subscribe[2].toNumber();
203-
console.log(i, subscribe[1], "TimeImMilliSeconds", subscriberDt, "Time(EVM)", App.FormatDateTime(subscriberDt), "-NowInGMT-", App.FormatDateTime(App.ReturnUTCTime()) );
203+
console.log(i, subscribe[1], "TimeImMilliSeconds", subscriberDt , "Time(EVM)", App.FormatDateTime(subscriberDt), "-NowInGMT-", App.FormatDateTime(App.ReturnUTCTime()) );
204+
console.log("[::Verify::]", App.ReturnUTCTime(), subscriberDt, (App.ReturnUTCTime() <= subscriberDt));
204205
/*let dt = new Date();
205206
let offset = Math.round(subscriberDt - dt.getTimezoneOffset()*60*1000)
206207
console.log("Offset: InMilliseconds", offset, "-ii-", App.FormatDateTime(offset))*/
207208

208-
if (App.ReturnUTCTime() <= subscribe[2].toNumber()) {
209+
if (App.ReturnUTCTime() <= subscriberDt) {
209210
console.log("Subscription On!", )
210211

211212
App.subscriptionArray.push({
212213
'index': subscribe[0].toNumber(),
213214
'creator': subscribe[1],
214-
'endDT': subscribe[2].toNumber()
215+
'endDT': subscriberDt
215216
})
216217

217218
// User exist in the list of subscribers

0 commit comments

Comments
 (0)