Mercurial > lada > lada-client

changeset 431:2375e7247523

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with @
author Torsten Irländer <torsten.irlaender@intevation.de>
date Fri, 08 Nov 2013 12:47:19 +0100
parents 4206cb30138c (current diff) f0f6ae3aae52 (diff)
children f4185f2d1a7c
files app/controller/Sql.js app/store/Verwaltungseinheiten.js
diffstat 30 files changed, 61 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/app.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app.js	Fri Nov 08 12:47:19 2013 +0100
@@ -1,3 +1,13 @@
+Ext.Loader.setConfig({
+    enabled: true,
+    paths: {
+        'Ext.ux.form.DateTimeField': 'resources/datetime/UX_DateTimeField.js',
+        'Ext.ux.DateTimeMenu': 'resources/datetime/UX_DateTimeMenu.js',
+        'Ext.ux.DateTimePicker': 'resources/datetime/UX_DateTimePicker.js',
+        'Ext.ux.form.TimePickerField': 'resources/datetime/UX_TimePickerField.js'
+    }
+});
+
 Ext.application({
 
     // Name of the application. Do not change as this name is used in
--- a/app/controller/Sql.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/controller/Sql.js	Fri Nov 08 12:47:19 2013 +0100
@@ -10,7 +10,7 @@
         'Proben',    // List of found Proben
         'ProbenList',    // List of found Proben
         'Queries',
-        'Info',
+        'Info'
     ],
     requires: [
         'Lada.view.widgets.Mst',
--- a/app/controller/Status.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/controller/Status.js	Fri Nov 08 12:47:19 2013 +0100
@@ -67,5 +67,5 @@
         store.reload();
         var win = form.up('window');
         win.close();
-    },
+    }
 });
--- a/app/model/Query.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/model/Query.js	Fri Nov 08 12:47:19 2013 +0100
@@ -9,7 +9,7 @@
         {name: "description"},
         {name: "sql"},
         {name: "results"},
-        {name: "filters"},
+        {name: "filters"}
     ],
     proxy: {
         type: 'rest',
--- a/app/store/Ortedetails.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/store/Ortedetails.js	Fri Nov 08 12:47:19 2013 +0100
@@ -5,7 +5,7 @@
     extend: 'Ext.data.Store',
     model: 'Lada.model.Ortdetail',
     sorters: [{
-        property: 'bezeichnung',
+        property: 'bezeichnung'
     }],
     autoLoad: true
 });
--- a/app/store/Probenzusatzwerte.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/store/Probenzusatzwerte.js	Fri Nov 08 12:47:19 2013 +0100
@@ -4,7 +4,7 @@
 Ext.define('Lada.store.Probenzusatzwerte', {
     extend: 'Ext.data.Store',
     sorters: [{
-        property: 'beschreibung',
+        property: 'beschreibung'
     }],
     autoLoad: true,
     model: 'Lada.model.Probenzusatzwert'
--- a/app/store/Queries.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/store/Queries.js	Fri Nov 08 12:47:19 2013 +0100
@@ -4,5 +4,5 @@
 Ext.define('Lada.store.Queries', {
     extend: 'Ext.data.Store',
     autoLoad: true,
-    model: 'Lada.model.Query',
+    model: 'Lada.model.Query'
 });
--- a/app/store/Staaten.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/store/Staaten.js	Fri Nov 08 12:47:19 2013 +0100
@@ -4,7 +4,7 @@
 Ext.define('Lada.store.Staaten', {
     extend: 'Ext.data.Store',
     sorters: [{
-        property: 'staat',
+        property: 'staat'
     }],
     model: 'Lada.model.Staat',
     autoLoad: true,
--- a/app/store/Verwaltungseinheiten.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/store/Verwaltungseinheiten.js	Fri Nov 08 12:47:19 2013 +0100
@@ -5,7 +5,7 @@
     extend: 'Ext.data.Store',
     fields: ['gemId', 'bezeichnung'],
     sorters: [{
-        property: 'bezeichnung',
+        property: 'bezeichnung'
     }],
     autoLoad: false,
     proxy: {
--- a/app/view/About.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/About.js	Fri Nov 08 12:47:19 2013 +0100
@@ -22,13 +22,13 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         this.items = [ 
             { html: "<h1>Lada</h1>Server version: " + sver + "<br>Client version: " + cver }
         ];
         this.callParent();
-    },
+    }
 });
 
--- a/app/view/kommentare/Create.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/kommentare/Create.js	Fri Nov 08 12:47:19 2013 +0100
@@ -25,7 +25,7 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.kommentare.CreateForm', this.initialConfig);
--- a/app/view/messungen/Create.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/messungen/Create.js	Fri Nov 08 12:47:19 2013 +0100
@@ -25,7 +25,7 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.messungen.CreateForm', this.initialConfig);
--- a/app/view/messungen/Edit.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/messungen/Edit.js	Fri Nov 08 12:47:19 2013 +0100
@@ -25,7 +25,7 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.messungen.EditForm', this.initialConfig);
--- a/app/view/messwerte/Create.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/messwerte/Create.js	Fri Nov 08 12:47:19 2013 +0100
@@ -20,7 +20,7 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.messwerte.CreateForm', this.initialConfig);
--- a/app/view/messwerte/List.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/messwerte/List.js	Fri Nov 08 12:47:19 2013 +0100
@@ -37,7 +37,21 @@
             }
         ];
         this.columns = [
-            {header: 'Messwert', dataIndex: 'messwert'},
+            {
+                header: 'Messwert',
+                dataIndex: 'messwert',
+                renderer: function(value, row) {
+                    // the seconds argument here is not documented in JQuery
+                    // but it has the current rendererd row and this
+                    // referenced the record.
+                    var nwg = row.record.get('nwgZuMesswert');
+                    if (value < nwg) {
+                        return "<"+value;
+                    } else {
+                        return value;
+                    }
+                }
+            },
             {header: 'Messfehler', dataIndex: 'messfehler'},
             {
                 header: 'Messgröße',
--- a/app/view/mkommentare/Create.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/mkommentare/Create.js	Fri Nov 08 12:47:19 2013 +0100
@@ -25,7 +25,7 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.mkommentare.CreateForm', this.initialConfig);
--- a/app/view/orte/Create.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/orte/Create.js	Fri Nov 08 12:47:19 2013 +0100
@@ -23,7 +23,7 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.orte.CreateForm', this.initialConfig);
--- a/app/view/proben/Create.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/proben/Create.js	Fri Nov 08 12:47:19 2013 +0100
@@ -17,12 +17,12 @@
         this.buttons = [
             {
                 text: 'Speichern',
-                action: 'save',
+                action: 'save'
             },
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.proben.CreateForm');
--- a/app/view/proben/Edit.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/proben/Edit.js	Fri Nov 08 12:47:19 2013 +0100
@@ -18,12 +18,12 @@
         this.buttons = [
             {
                 text: 'Speichern',
-                action: 'save',
+                action: 'save'
             },
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         // InitialConfig is the config object passed to the constructor on
@@ -32,6 +32,6 @@
         var form = Ext.create('Lada.view.proben.EditForm', this.initialConfig);
         this.items = [form];
         this.callParent();
-    },
+    }
 });
 
--- a/app/view/proben/Import.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/proben/Import.js	Fri Nov 08 12:47:19 2013 +0100
@@ -13,12 +13,12 @@
         this.buttons = [
             {
                 text: 'Speichern',
-                action: 'save',
+                action: 'save'
             },
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.proben.ImportForm');
--- a/app/view/status/Create.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/status/Create.js	Fri Nov 08 12:47:19 2013 +0100
@@ -20,7 +20,7 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.status.CreateForm', this.initialConfig);
--- a/app/view/widgets/Datenbasis.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/widgets/Datenbasis.js	Fri Nov 08 12:47:19 2013 +0100
@@ -1,7 +1,7 @@
 var datenbasisStore = Ext.create('Ext.data.Store', {
     fields: ['datenbasisId', 'beschreibung', 'datenbasis'],
     sorters: [{
-        property: 'datenbasis',
+        property: 'datenbasis'
     }],
     autoLoad: true,
     proxy: {
--- a/app/view/widgets/Messgroesse.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/widgets/Messgroesse.js	Fri Nov 08 12:47:19 2013 +0100
@@ -1,7 +1,7 @@
 /**
  * Combobox for Messgroesse
  */
-Ext.define('Lada.view.widgets.Messegroesse' ,{
+Ext.define('Lada.view.widgets.Messgroesse' ,{
         extend: 'Ext.form.ComboBox',
         alias: 'widget.messgroesse',
         store: 'Messgroessen',
--- a/app/view/widgets/Messmethode.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/widgets/Messmethode.js	Fri Nov 08 12:47:19 2013 +0100
@@ -1,7 +1,7 @@
 var mmtStore = Ext.create('Ext.data.Store', {
     fields: ['mmtId', 'messmethhode'],
     sorters: [{
-        property: 'mmtId',
+        property: 'mmtId'
     }],
     autoLoad: true,
     proxy: {
--- a/app/view/widgets/Mst.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/widgets/Mst.js	Fri Nov 08 12:47:19 2013 +0100
@@ -1,7 +1,7 @@
 var mstStore = Ext.create('Ext.data.Store', {
     fields: ['mstId', 'messStelle'],
     sorters: [{
-        property: 'messStelle',
+        property: 'messStelle'
     }],
     autoLoad: true,
     proxy: {
--- a/app/view/widgets/Netzbetreiber.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/widgets/Netzbetreiber.js	Fri Nov 08 12:47:19 2013 +0100
@@ -1,7 +1,7 @@
 var netzbetreiberStore = Ext.create('Ext.data.Store', {
     fields: ['netzbetreiberId', 'netzbetreiber'],
     sorters: [{
-        property: 'netzbetreiber',
+        property: 'netzbetreiber'
     }],
     autoLoad: true,
     proxy: {
--- a/app/view/widgets/Probenzusatzwert.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/widgets/Probenzusatzwert.js	Fri Nov 08 12:47:19 2013 +0100
@@ -1,7 +1,7 @@
 /**
  * Combobox for Zusatzwert
  */
-Ext.define('Lada.view.widgets.Zusatzwert' ,{
+Ext.define('Lada.view.widgets.Probenzusatzwert' ,{
         extend: 'Ext.form.ComboBox',
         alias: 'widget.probenzusatzwert',
         store: 'Probenzusatzwerte',
--- a/app/view/widgets/Uwb.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/widgets/Uwb.js	Fri Nov 08 12:47:19 2013 +0100
@@ -1,7 +1,7 @@
 var uwbStore = Ext.create('Ext.data.Store', {
     fields: ['umwId', 'umweltBereich'],
     sorters: [{
-        property: 'umwId',
+        property: 'umwId'
     }],
     autoLoad: true,
     proxy: {
--- a/app/view/zusatzwerte/Create.js	Fri Nov 08 12:46:36 2013 +0100
+++ b/app/view/zusatzwerte/Create.js	Fri Nov 08 12:47:19 2013 +0100
@@ -20,7 +20,7 @@
             {
                 text: 'Abbrechen',
                 scope: this,
-                handler: this.close,
+                handler: this.close
             }
         ];
         var form = Ext.create('Lada.view.zusatzwerte.CreateForm', this.initialConfig);
--- a/index.html	Fri Nov 08 12:46:36 2013 +0100
+++ b/index.html	Fri Nov 08 12:47:19 2013 +0100
@@ -4,12 +4,12 @@
     <title>Lada</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all-gray.css">
+    <!-- <x-compile> -->
+    <!-- <x-bootstrap> -->
     <script type="text/javascript" src="extjs/ext-all-debug.js"></script>
-    <script type="text/javascript" src="resources/datetime/UX_TimePickerField.js"></script>
-    <script type="text/javascript" src="resources/datetime/UX_DateTimePicker.js"></script>
-    <script type="text/javascript" src="resources/datetime/UX_DateTimeField.js"></script>
-    <script type="text/javascript" src="resources/datetime/UX_DateTimeMenu.js"></script>
+    <!-- </x-bootstrap> -->
     <script type="text/javascript" src="app.js"></script>
+    <!-- </x-compile> -->
 </head>
 <body></body>
 </html>
http://lada.wald.intevation.org