[dss-commits] digitalSTROM web-sources branch, master, updated. e310b9c866f7e990a7d095012812a2fc24fb9bd5

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM web-sources".

The branch, master has been updated
       via  e310b9c866f7e990a7d095012812a2fc24fb9bd5 (commit)
       via  03b2233c52ab1f982b95a617502b70c548d0a8e4 (commit)
      from  fb27215c63a40a3b5ad78d8c2815299e798d7798 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e310b9c866f7e990a7d095012812a2fc24fb9bd5
Author: Matias E. Fernandez <“mfernandez at futurelab.ch”>
Date:   Mon Jan 18 11:21:44 2010 +0100

    Right alignment of dates in grids

commit 03b2233c52ab1f982b95a617502b70c548d0a8e4
Author: Matias E. Fernandez <“mfernandez at futurelab.ch”>
Date:   Mon Jan 18 11:05:29 2010 +0100

    Changed date parsing to work with new date format
    
    * The dSS now return dates in ISO 8601 format, without Timezone
    * The dates are always UTC

-----------------------------------------------------------------------

Changes:
diff --git a/customizing/extjs/resources/css/ds_gui.css b/customizing/extjs/resources/css/ds_gui.css
index fe6066b..eb92cc1 100644
--- a/customizing/extjs/resources/css/ds_gui.css
+++ b/customizing/extjs/resources/css/ds_gui.css
@@ -7014,13 +7014,9 @@ body.x-body-masked .x-window-plain .x-window-mc {
     background-image:url(../images/default/window/icon-error.gif);
 }
 
-/*
-.x-grid3-header .x-grid3-td-dsid, .x-grid3-td-modulator-dsid {
-	text-align: left;
-}
-*/
-
-.x-grid3-cell-inner.x-grid3-col-dsid, .x-grid3-cell-inner.x-grid3-col-modulator-dsid {
+.x-grid3-cell-inner.x-grid3-col-dsid, .x-grid3-cell-inner.x-grid3-col-modulator-dsid,
+.x-grid3-cell-inner.x-grid3-col-firstSeen, .x-grid3-cell-inner.x-grid3-col-lastDiscovered
+{
     text-align: right;
     direction: rtl;
     text-overflow: clip;
diff --git a/dss-setup-interface/dSS/ZoneBrowser.js b/dss-setup-interface/dSS/ZoneBrowser.js
index 684f5e3..7f647ae 100644
--- a/dss-setup-interface/dSS/ZoneBrowser.js
+++ b/dss-setup-interface/dSS/ZoneBrowser.js
@@ -54,8 +54,8 @@ dSS.ZoneBrowser = Ext.extend(Ext.Panel, {
 		Ext.each(structure.apartment.zones, function(zone) {
 			if(zone.id === 0) { // Skip zone 0
 				Ext.each(zone.devices, function(device) {
-					device.firstSeen = Date.parseDate(device.firstSeen, "U");
-					device.lastDiscovered =  Date.parseDate(device.lastDiscovered, "U");
+					device.firstSeen = Date.parseDate(device.firstSeen + "+00:00", "c");
+					device.lastDiscovered =  Date.parseDate(device.lastDiscovered + "+00:00", "c");
 					devices.push(device);
 				});
 			}
@@ -140,4 +140,4 @@ dSS.ZoneBrowser = Ext.extend(Ext.Panel, {
 
 });
 
-Ext.reg('dsszonebrowser', dSS.ZoneBrowser);
\ No newline at end of file
+Ext.reg('dsszonebrowser', dSS.ZoneBrowser);
diff --git a/dss-setup-interface/dSS/grid/DevicePanel.js b/dss-setup-interface/dSS/grid/DevicePanel.js
index ffa9177..476abed 100644
--- a/dss-setup-interface/dSS/grid/DevicePanel.js
+++ b/dss-setup-interface/dSS/grid/DevicePanel.js
@@ -21,8 +21,8 @@ dSS.grid.DevicePanel = Ext.extend(Ext.grid.GridPanel, {
 			{header: "circuit", width: 100, sortable: true, dataIndex: 'circuit' },
 			{header: "modulator", width: 150, sortable: true, dataIndex: 'modulator', id: "modulator-dsid"},
 			{header: "zone", width: 50, sortable: true, dataIndex: 'zone'},
-			{header: "first seen", width: 150, sortable: true, dataIndex: 'firstSeen', xtype: 'datecolumn', format: 'c'},
-			{header: "last discovered", width: 150, sortable: true, dataIndex: 'lastDiscovered', xtype: 'datecolumn', format: 'c'}
+			{header: "first seen", width: 150, sortable: true, dataIndex: 'firstSeen', xtype: 'datecolumn', format: 'Y-m-d\\&\\n\\b\\s\\p\\;H:m:i', id: 'firstSeen'},
+			{header: "last discovered", width: 150, sortable: true, dataIndex: 'lastDiscovered', xtype: 'datecolumn', format: 'Y-m-d\\&\\n\\b\\s\\p\\;H:m:i', id: 'lastDiscovered'}
 		];
 
 		var deviceStore = new dSS.data.DeviceStore();


hooks/post-receive
-- 
digitalSTROM web-sources