Commit 88994978f2bc579192a1ae9a8fa680ec48a2d62d

  • avatar
  • Sergey 'Jin' Bostandzhyan <jin @deve…per.digitalstrom.org>
  • Sun Aug 08 18:08:38 CEST 2010
Update related to local time changes

Sync for issue #388
webroot/js/dss/dss-setup-interface/dSS/util/DSMStatisticsWindow.js
(1 / 1)
  
3939 return n < 10 ? '0' + n: n
4040 }
4141
42 param_time = "time=" + d.getUTCFullYear() + pad(d.getUTCMonth() + 1) + pad(d.getUTCDate()) + 'T' + pad(d.getUTCHours()) + pad(d.getUTCMinutes()) + pad(d.getUTCSeconds()) + 'Z' + ";";
42 param_time = "time=" + d.getFullYear() + pad(d.getMonth() + 1) + pad(d.getDate()) + 'T' + pad(d.getHours()) + pad(d.getMinutes()) + pad(d.getSeconds()) + (d.getTimezoneOffset() / 60) + ";";
4343 }
4444
4545 var param = param_time + "delay=" + this.form.getForm().getValues().delay + ";repeat=" + this.form.getForm().getValues().repeat + ";dsm=" + this.dsm;
webroot/js/dss/dss-setup-interface/dSS/util/DeviceStatisticsWindow.js
(1 / 1)
  
3939 return n < 10 ? '0' + n: n
4040 }
4141
42 param_time = "time=" + d.getUTCFullYear() + pad(d.getUTCMonth() + 1) + pad(d.getUTCDate()) + 'T' + pad(d.getUTCHours()) + pad(d.getUTCMinutes()) + pad(d.getUTCSeconds()) + 'Z' + ";";
42 param_time = "time=" + d.getFullYear() + pad(d.getMonth() + 1) + pad(d.getDate()) + 'T' + pad(d.getHours()) + pad(d.getMinutes()) + pad(d.getSeconds()) + (d.getTimezoneOffset() / 60) + ";";
4343 }
4444
4545 var param = param_time + "delay=" + this.form.getForm().getValues().delay + ";repeat=" + this.form.getForm().getValues().repeat + ";dsid=" + this.dsids;
webroot/js/dss/dss-setup-interface/dSS/util/ExtendedPingWindow.js
(1 / 2)
  
2222 var param_time = "";
2323
2424 if (this.form.getForm().getValues().time != undefined) {
25
2625 var current = new Date();
2726 var d = new Date();
2827 var hours = parseInt(this.form.getForm().getValues().time.split(':')[0]);
3838 return n < 10 ? '0' + n: n
3939 }
4040
41 param_time = "time=" + d.getUTCFullYear() + pad(d.getUTCMonth() + 1) + pad(d.getUTCDate()) + 'T' + pad(d.getUTCHours()) + pad(d.getUTCMinutes()) + pad(d.getUTCSeconds()) + 'Z' + ";";
41 param_time = "time=" + d.getFullYear() + pad(d.getMonth() + 1) + pad(d.getDate()) + 'T' + pad(d.getHours()) + pad(d.getMinutes()) + pad(d.getSeconds()) + (d.getTimezoneOffset() / 60) + ";";
4242 }
4343
4444 var param = param_time + "delay=" + this.form.getForm().getValues().delay + ";repeat=" + this.form.getForm().getValues().repeat + ";dsid=" + this.dsids;
webroot/js/dss/dss-setup-interface/dSS/util/TimeInfo.js
(9 / 13)
  
1function dateprint(date, month, year, hour, minute
2/*, second */
3) {
1Ext.namespace('dSS', 'dSS.time');
2
3dSS.time.dateprint = function(date, month, year, hour, minute) {
44 switch (month) {
55 case 0:
66 month = "Jan";
4646 if (hour < 10) hour = ('0' + hour);
4747
4848 if (minute < 10) minute = ('0' + minute);
49 /*
50 if (second < 10)
51 second = ('0' + second);
52 */
53 return month + ' ' + date + ' ' + hour + ':' + minute + ', ' + year; // + '.' + second;
49
50 return month + ' ' + date + ' ' + hour + ':' + minute + ', ' + year;
5451}
5552
56function updateDSSTime() {
57 var t = new Date(new Date().getTime() - dSS.config.dSSTimeDiff);
58 Ext.get('dssTime').update(dateprint(t.getUTCDate(), t.getUTCMonth(), t.getUTCFullYear(), t.getUTCHours(), t.getUTCMinutes()
59 /*, t.getUTCSeconds() */
53dSS.time.update = function() {
54 var t = new Date(Date.now() - dSS.config.dSSTimeDiff);
55 Ext.get('dssTime').update(dSS.time.dateprint(t.getDate(), t.getMonth(), t.getFullYear(), t.getHours(), t.getMinutes()
6056 ));
61 setTimeout('updateDSSTime()', 1000);
57 setTimeout('dSS.time.update', 1000);
6258}
webroot/js/dss/dss-setup-interface/dss-overview-page.js
(2 / 2)
  
5454 if (data.ok === false) {
5555 throw new Ext.Error(_("Could not get dSS time!"), data.error);
5656 }
57 dSS.config.dSSTimeDiff = (new Date().getTime() - (parseInt(data.message, 10) * 1000));
58 updateDSSTime();
57 dSS.config.dSSTimeDiff = (Date.now() - (parseInt(data.message, 10) * 1000));
58 dSS.time.update();
5959
6060 } catch(error) {}
6161 },
webroot/js/dss/dss-setup-interface/dss-setup-interface.js
(3 / 2)
  
1212
1313Ext.onReady(function() {
1414 Ext.get('start').remove();
15 dSS.config.dSSTimeDiff = 0;
1516
1617 var viewport = new Ext.Viewport({
1718 layout: 'border',
8686 if (data.ok === false) {
8787 throw new Ext.Error(_("Could not get dSS time!"), data.error);
8888 }
89 dSS.config.dSSTimeDiff = (new Date().getTime() - (parseInt(data.message, 10) * 1000));
90 updateDSSTime();
89 dSS.config.dSSTimeDiff = (Date.now() - (parseInt(data.message, 10) * 1000));
90 dSS.time.update();
9191
9292 } catch(error) {}
9393 },