[Lada-commits] [PATCH 1 of 7] Updated model

Wald Commits scm-commit at wald.intevation.org
Wed Aug 31 16:25:03 CEST 2016


# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1472651652 -7200
# Branch schema-update
# Node ID 52bf58630e5817de6d77bb5030586c5f200723fc
# Parent  6d06ae7c553c22b862241d523c72039b539ce333
Updated model.

diff -r 6d06ae7c553c -r 52bf58630e58 app/model/Messprogramm.js
--- 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'
     }, {
diff -r 6d06ae7c553c -r 52bf58630e58 app/model/Messung.js
--- 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) {
diff -r 6d06ae7c553c -r 52bf58630e58 app/model/Probe.js
--- 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'
diff -r 6d06ae7c553c -r 52bf58630e58 app/model/Probenzusatz.js
--- 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'
     }, {
diff -r 6d06ae7c553c -r 52bf58630e58 app/model/Status.js
--- 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) {
diff -r 6d06ae7c553c -r 52bf58630e58 app/model/Zusatzwert.js
--- 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',


More information about the Lada-commits mailing list