changeset 1181:52bf58630e58 schema-update

Updated model.
author Raimund Renkert <raimund.renkert@intevation.de>
date Wed, 31 Aug 2016 15:54:12 +0200
parents 6d06ae7c553c
children af65544e47e2
files app/model/Messprogramm.js app/model/Messung.js app/model/Probe.js app/model/Probenzusatz.js app/model/Status.js app/model/Zusatzwert.js
diffstat 6 files changed, 15 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/app/model/Messprogramm.js	Fri Jul 08 15:36:17 2016 +0200
+++ b/app/model/Messprogramm.js	Wed Aug 31 15:54:12 2016 +0200
@@ -25,7 +25,8 @@
                 return null;
             }
             return value;
-        }
+        },
+        persist: false
     }, {
         name: 'mstId'
     }, {
--- a/app/model/Messung.js	Fri Jul 08 15:36:17 2016 +0200
+++ b/app/model/Messung.js	Wed Aug 31 15:54:12 2016 +0200
@@ -59,7 +59,7 @@
         name: 'geplant',
         type: 'boolean'
     }, {
-        name: 'messungsIdAlt'
+        name: 'idAlt'
     }, {
         name: 'treeModified',
         serialize: function(value) {
--- a/app/model/Probe.js	Fri Jul 08 15:36:17 2016 +0200
+++ b/app/model/Probe.js	Wed Aug 31 15:54:12 2016 +0200
@@ -20,28 +20,21 @@
         type: 'boolean',
         persist: false
     }, {
-        name: 'probeIdAlt'
+        name: 'idAlt'
     }, {
         name: 'hauptprobenNr'
     }, {
         name: 'test',
         type: 'boolean'
     }, {
-        name: 'netzbetreiberId',
-        serialize: function(value) {
-            if (value === '') {
-                return null;
-            }
-            return value;
-        }
-    }, {
         name: 'mstId'
     }, {
         name: 'laborMstId'
     }, {
         name: 'datenbasisId'
     }, {
-        name: 'baId'
+        name: 'baId',
+        type: 'number'
     }, {
         name: 'probenartId'
     }, {
@@ -90,8 +83,6 @@
     }, {
         name: 'probeNehmerId'
     }, {
-        name: 'mpKat'
-    }, {
         name: 'mplId'
     }, {
         name: 'mprId'
--- a/app/model/Probenzusatz.js	Fri Jul 08 15:36:17 2016 +0200
+++ b/app/model/Probenzusatz.js	Wed Aug 31 15:54:12 2016 +0200
@@ -32,8 +32,7 @@
     }, {
         name: 'beschreibung'
     }, {
-        name: 'mehId',
-        type: 'int'
+        name: 'messEinheitId',
     }, {
         name: 'zusatzwert'
     }, {
--- a/app/model/Status.js	Fri Jul 08 15:36:17 2016 +0200
+++ b/app/model/Status.js	Wed Aug 31 15:54:12 2016 +0200
@@ -26,10 +26,14 @@
     }, {
         name: 'mstId'
     }, {
-        name: 'statusStufe',
+        name: 'statusKombi',
         type: 'int'
     }, {
-        name: 'statusWert'
+        name: 'statusWert',
+        persist: false
+    }, {
+        name: 'statusStufe',
+        persist: false
     }, {
         name: 'treeModified',
         serialize: function(value) {
--- a/app/model/Zusatzwert.js	Fri Jul 08 15:36:17 2016 +0200
+++ b/app/model/Zusatzwert.js	Wed Aug 31 15:54:12 2016 +0200
@@ -16,7 +16,8 @@
         name: 'id'
     }, {
         name: 'owner',
-        type: 'boolean'
+        type: 'boolean',
+        persist: false
     }, {
         name: 'readonly',
         type: 'boolean',

http://lada.wald.intevation.org