[Lada-commits] [PATCH 6 of 6] Merge
Wald Commits
scm-commit at wald.intevation.org
Tue Dec 16 18:22:16 CET 2014
# HG changeset patch
# User Roland Geider <roland.geider at intevation.de>
# Date 1418750524 -3600
# Node ID 381066c87ba8144bd0b82367cc7f939b62e08a9a
# Parent 16fbbad55589052fede6b51b9a45e86e5ec11d5f
# Parent 5960189e4461ecd7730d391ff98fa6da7a5e2235
Merge
diff -r 16fbbad55589 -r 381066c87ba8 app/controller/MKommentare.js
--- a/app/controller/MKommentare.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/controller/MKommentare.js Tue Dec 16 18:22:04 2014 +0100
@@ -30,9 +30,9 @@
addListeners: function() {
this.control({
- 'mkommentarelist': {
- itemdblclick: this.editItem
- },
+ //'mkommentarelist': {
+ // itemdblclick: this.editItem
+ //},
'mkommentarelist toolbar button[action=add]': {
click: this.addItem
},
diff -r 16fbbad55589 -r 381066c87ba8 app/controller/Messwert.js
--- a/app/controller/Messwert.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/controller/Messwert.js Tue Dec 16 18:22:04 2014 +0100
@@ -28,9 +28,9 @@
addListeners: function() {
this.control({
- 'messwertelist': {
- itemdblclick: this.editItem
- },
+ //'messwertelist': {
+ // itemdblclick: this.editItem
+ //},
'messwertelist toolbar button[action=add]': {
click: this.addItem
},
diff -r 16fbbad55589 -r 381066c87ba8 app/controller/Orte.js
--- a/app/controller/Orte.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/controller/Orte.js Tue Dec 16 18:22:04 2014 +0100
@@ -32,9 +32,9 @@
addListeners: function() {
this.control({
- //'ortelist': {
- // itemdblclick: this.editItem
- //},
+ 'ortelist toolbar button[action=open]': {
+ click: this.editItem
+ },
'ortelist toolbar button[action=add]': {
click: this.addItem
},
@@ -145,7 +145,12 @@
});
},
- editItem: function(grid, record) {
+ editItem: function(button) {
+ var grid = button.up('grid');
+ var selection = grid.getView().getSelectionModel().getSelection()[0];
+ var ortId = selection.getId();
+ var record = selection.store.getById(ortId);
+
record.getAuthInfo(this.initEditWindow);
},
diff -r 16fbbad55589 -r 381066c87ba8 app/controller/Status.js
--- a/app/controller/Status.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/controller/Status.js Tue Dec 16 18:22:04 2014 +0100
@@ -23,9 +23,9 @@
addListeners: function() {
this.control({
- 'statuslist': {
- itemdblclick: this.editItem
- },
+ //'statuslist': {
+ // itemdblclick: this.editItem
+ //},
'statuslist toolbar button[action=add]': {
click: this.addItem
},
diff -r 16fbbad55589 -r 381066c87ba8 app/view/messungen/List.js
--- a/app/view/messungen/List.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/view/messungen/List.js Tue Dec 16 18:22:04 2014 +0100
@@ -35,6 +35,10 @@
xtype: 'toolbar',
dock: 'bottom',
items: ['->', {
+ text: 'Details',
+ icon: 'gfx/document-open.png',
+ action: 'open'
+ }, {
text: 'Hinzufügen',
icon: 'gfx/list-add.png',
action: 'add',
@@ -43,10 +47,6 @@
text: 'Löschen',
icon: 'gfx/list-remove.png',
action: 'delete'
- }, {
- text: 'Öffnen',
- icon: 'gfx/document-open.png',
- action: 'open'
}]
}];
this.columns = [{
diff -r 16fbbad55589 -r 381066c87ba8 app/view/messwerte/List.js
--- a/app/view/messwerte/List.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/view/messwerte/List.js Tue Dec 16 18:22:04 2014 +0100
@@ -27,6 +27,13 @@
parentId: null,
initComponent: function() {
+ var rowEditing = Ext.create('Ext.grid.plugin.RowEditing', {
+ clicksToMoveEditor: 1,
+ autoCancel: false
+ });
+
+ this.plugins = [rowEditing];
+
this.dockedItems = [{
xtype: 'toolbar',
dock: 'bottom',
@@ -44,19 +51,34 @@
}];
this.columns = [{
header: '<NWG',
- dataIndex: 'messwertNwg'
+ dataIndex: 'messwertNwg',
+ editor: {
+ allowBlank: false
+ }
}, {
header: 'Messwert',
- dataIndex: 'messwert'
+ dataIndex: 'messwert',
+ editor: {
+ xtype: 'numberfield',
+ allowBlank: false
+ }
}, {
header: 'Messfehler',
- dataIndex: 'messfehler'
+ dataIndex: 'messfehler',
+ editor: {
+ xtype: 'numberfield',
+ allowBlank: false
+ }
}, {
header: 'Messgröße',
dataIndex: 'messgroesseId',
renderer: function(value) {
var store = Ext.data.StoreManager.get('staMessgroessen');
return store.findRecord('id', value).get('messgroesse');
+ },
+ editor: {
+ xtype: 'messgroesse',
+ allowBlank: false
}
}, {
header: 'Messeinheit',
@@ -64,6 +86,10 @@
renderer: function(value) {
var store = Ext.data.StoreManager.get('staMesseinheiten');
return store.findRecord('id', value).get('einheit');
+ },
+ editor: {
+ xtype: 'messeinheit',
+ allowBlank: false
}
}, {
header: 'Grenzwertüberschreitung',
@@ -74,6 +100,9 @@
return 'Ja';
}
return 'Nein';
+ },
+ editor: {
+ xtype: 'checkboxfield'
}
}];
this.callParent(arguments);
diff -r 16fbbad55589 -r 381066c87ba8 app/view/mkommentare/List.js
--- a/app/view/mkommentare/List.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/view/mkommentare/List.js Tue Dec 16 18:22:04 2014 +0100
@@ -27,6 +27,13 @@
parentId: null,
initComponent: function() {
+ var rowEditing = Ext.create('Ext.grid.plugin.RowEditing', {
+ clicksToMoveEditor: 1,
+ autoCancel: false
+ });
+
+ this.plugins = [rowEditing];
+
this.dockedItems = [{
xtype: 'toolbar',
dock: 'bottom',
@@ -44,14 +51,26 @@
}];
this.columns = [{
header: 'Erzeuger',
- dataIndex: 'erzeuger'
+ dataIndex: 'erzeuger',
+ editor: {
+ allowBlank: false
+ }
}, {
header: 'Datum',
- dataIndex: 'datum'
+ dataIndex: 'datum',
+ editor: {
+ xtype: 'datefield',
+ allowBlank: false,
+ format: 'd.m.Y',
+ maxValue: Ext.Date.format(new Date(), 'd.m.Y')
+ }
}, {
header: 'Text',
dataIndex: 'text',
- flex: 1
+ flex: 1,
+ editor: {
+ allowBlank: false
+ }
}];
this.callParent(arguments);
}
diff -r 16fbbad55589 -r 381066c87ba8 app/view/orte/List.js
--- a/app/view/orte/List.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/view/orte/List.js Tue Dec 16 18:22:04 2014 +0100
@@ -38,6 +38,10 @@
xtype: 'toolbar',
dock: 'bottom',
items: ['->', {
+ text: 'Details',
+ icon: 'gfx/document-open.png',
+ action: 'open'
+ }, {
text: 'Hinzufügen',
icon: 'gfx/list-add.png',
action: 'add',
diff -r 16fbbad55589 -r 381066c87ba8 app/view/status/List.js
--- a/app/view/status/List.js Tue Dec 16 18:16:25 2014 +0100
+++ b/app/view/status/List.js Tue Dec 16 18:22:04 2014 +0100
@@ -27,6 +27,11 @@
probeId: null,
initComponent: function() {
+ var rowEditing = Ext.create('Ext.grid.plugin.RowEditing', {
+ clicksToMoveEditor: 1,
+ autoCancel: false
+ });
+ this.plugins = [rowEditing];
this.dockedItems = [{
xtype: 'toolbar',
dock: 'bottom',
@@ -44,17 +49,32 @@
}];
this.columns = [{
header: 'Erzeuger',
- dataIndex: 'erzeuger'
+ dataIndex: 'erzeuger',
+ editor: {
+ allowBlank: false
+ }
}, {
header: 'Status',
- dataIndex: 'status'
+ dataIndex: 'status',
+ editor: {
+ allowBlank: false
+ }
}, {
header: 'Datum',
- dataIndex: 'datum'
+ dataIndex: 'datum',
+ editor: {
+ xtype: 'datefield',
+ allowBlank: false,
+ format: 'd.m.Y',
+ maxValue: Ext.Date.format(new Date(), 'd.m.Y')
+ }
}, {
header: 'Text',
dataIndex: 'kommentar',
- flex: 1
+ flex: 1,
+ editor: {
+ allowBlank: true
+ }
}];
this.callParent(arguments);
}
More information about the Lada-commits
mailing list