diff app/model/Probe.js @ 488:f7446ebfe5d0

Added and updated models.
author Raimund Renkert <raimund.renkert@intevation.de>
date Fri, 31 Oct 2014 21:10:35 +0100
parents debfcc7713e3
children 850ccfe5f3c4
line wrap: on
line diff
--- a/app/model/Probe.js	Fri Oct 31 21:07:39 2014 +0100
+++ b/app/model/Probe.js	Fri Oct 31 21:10:35 2014 +0100
@@ -9,42 +9,43 @@
 /**
  * A Probe.
  * This class represents and defines the model of a "Probe"
- * */
+ **/
 Ext.define('Lada.model.Probe', {
     extend: 'Lada.model.Base',
     fields: [
-        {name: "probeId"},
+        {name: "id"},
+        {name: "probeIdAlt"},
+        {name: "hauptprobenNr"},
+        {name: "test"},
+        {name: "netzbetreiberId"},
+        {name: "mstId"},
+        {name: "datenbasisId"},
         {name: "baId"},
-        {name: "datenbasisId"},
+        {name: "probenartId"},
+        {name: "mediaDesk"},
+        {name: "media"},
+        {name: "umwId"},
+        {name: "probeentnahmeBeginn", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
+        {name: "probeentnahmeEnde", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
+        {name: "mittelungsdauer"},
+        {name: "letzteAenderung", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
         {name: "erzeugerId"},
-        {name: "hauptprobenNr"},
-        {name: "letzteAenderung", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
-        {name: "media"},
-        {name: "mediaDesk"},
-        {name: "mittelungsdauer"},
+        {name: "probeNehmerId"},
         {name: "mpKat"},
         {name: "mplId"},
         {name: "mprId"},
-        {name: "mstId"},
-        {name: "netzbetreiberId"},
-        {name: "probeNehmerId"},
-        {name: "probeentnahmeBeginn", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
-        {name: "probeentnahmeEnde", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
-        {name: "probenartId"},
         {name: "solldatumBeginn", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
         {name: "solldatumEnde", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
-        {name: "test"},
-        {name: "umwId"},
 
         // Readonly-Flag (sent additionaly by the server, not part of the
         // model)
         {name: "readonly"}
     ],
-    idProperty: "probeId",
+    idProperty: "id",
     proxy: {
         type: 'rest',
         appendId: true, //default
-        url: 'server/rest/proben',
+        url: 'server/rest/probe',
         reader: {
             type: 'json',
             root: 'data'

http://lada.wald.intevation.org