[Lada-commits] [PATCH 3 of 4] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1427130228 -3600
# Node ID fe527f380b10550b45ff6d6902af5734e856bb36
# Parent  19d3b1f2613ef9450f240d89df47c99040ad7666
# Parent  08e3e7b80a34592ef6ae3c1b8cd5710d89d07876
merged.

diff -r 19d3b1f2613e -r fe527f380b10 app/model/ProbeList.js
--- a/app/model/ProbeList.js	Thu Mar 19 14:52:20 2015 +0100
+++ b/app/model/ProbeList.js	Mon Mar 23 18:03:48 2015 +0100
@@ -18,14 +18,14 @@
     }],
 
     idProperty: 'id',
-    totalProperty: 'totalCount',
 
     proxy: {
         type: 'rest',
         url: 'lada-server/probe',
         reader: {
             type: 'json',
-            root: 'data'
+            root: 'data',
+            totalProperty: 'totalCount'
         }
     }
 });
diff -r 19d3b1f2613e -r fe527f380b10 app/store/ProbenList.js
--- a/app/store/ProbenList.js	Thu Mar 19 14:52:20 2015 +0100
+++ b/app/store/ProbenList.js	Mon Mar 23 18:03:48 2015 +0100
@@ -12,6 +12,6 @@
 Ext.define('Lada.store.ProbenList', {
     extend: 'Ext.data.Store',
     model: 'Lada.model.ProbeList',
-    pageSize: 5,
+    pageSize: 50,
     remoteSort: true
 });
diff -r 19d3b1f2613e -r fe527f380b10 app/view/form/Location.js
--- a/app/view/form/Location.js	Thu Mar 19 14:52:20 2015 +0100
+++ b/app/view/form/Location.js	Mon Mar 23 18:03:48 2015 +0100
@@ -81,6 +81,7 @@
                     xtype: 'verwaltungseinheit',
                     name: 'verwaltungseinheitId',
                     fieldLabel: 'Gemeinde',
+                    editable: true,
                     width: 280,
                     labelWidth: 80
                 }, {
diff -r 19d3b1f2613e -r fe527f380b10 app/view/form/Probe.js
--- a/app/view/form/Probe.js	Thu Mar 19 14:52:20 2015 +0100
+++ b/app/view/form/Probe.js	Mon Mar 23 18:03:48 2015 +0100
@@ -179,10 +179,14 @@
                             }
                         }, {
                             xtype: 'textfield',
-                            maxLength: 100,
+                            maxLength: 38,
+                            enforceMaxLength: true,
                             name: 'mediaDesk',
                             labelWidth: 125,
                             fieldLabel: 'Deskriptoren',
+                            regex: new RegExp('(?:D: ){1}(?:[0-9]{2} ){11}[0-9]{2}'),
+                            regexText: 'Die Deskriptoren haben das falsche Format.<br />'+
+                            'Richtig wäre: D: 99 99 99 99 99 99 99 99 99 99 99 99',
                             listeners: {
                                 dirtychange: {
                                     fn: this.updateOnChange,