[Lada-commits] [PATCH 1 of 2] Add MPL to Messprogramm

[Wald Commits]

# HG changeset patch
# User Evi Huber <ehuber at bfs.de>
# Date 1480065862 -3600
# Node ID 4ee336c65ab3bb72b52a453fc687086daf868846
# Parent  3c24d33bf0dbebb7e67df7c36724776b3bc4e583
Add MPL to Messprogramm

diff -r 3c24d33bf0db -r 4ee336c65ab3 db_schema/lada_data.sql
--- a/db_schema/lada_data.sql	Mon Nov 21 14:54:09 2016 +0100
+++ b/db_schema/lada_data.sql	Fri Nov 25 10:24:22 2016 +0100
@@ -250,7 +250,7 @@
 
 ALTER TABLE messprogramm DISABLE TRIGGER ALL;
 
-COPY messprogramm (id, test, mst_id, labor_mst_id, datenbasis_id, ba_id, gem_id, ort_id, media_desk, umw_id, probenart_id, probenintervall, teilintervall_von, teilintervall_bis, intervall_offset, gueltig_von, gueltig_bis, probe_nehmer_id, probe_kommentar, letzte_aenderung) FROM stdin;
+COPY messprogramm (id, test, mst_id, labor_mst_id, datenbasis_id, ba_id, gem_id, ort_id, media_desk, mpl_Id, umw_id, probenart_id, probenintervall, teilintervall_von, teilintervall_bis, intervall_offset, gueltig_von, gueltig_bis, probe_nehmer_id, probe_kommentar, letzte_aenderung) FROM stdin;
 \.
 
 
diff -r 3c24d33bf0db -r 4ee336c65ab3 db_schema/lada_schema.sql
--- a/db_schema/lada_schema.sql	Mon Nov 21 14:54:09 2016 +0100
+++ b/db_schema/lada_schema.sql	Fri Nov 25 10:24:22 2016 +0100
@@ -162,6 +162,7 @@
     gueltig_von integer NOT NULL CHECK(gueltig_von BETWEEN 1 AND 365),
     gueltig_bis integer NOT NULL CHECK(gueltig_bis BETWEEN 1 AND 365),
     probe_nehmer_id integer REFERENCES stammdaten.probenehmer,
+    mpl_id integer REFERENCES stammdaten.messprogramm_kategorie,
     probe_kommentar character varying(80),
     letzte_aenderung timestamp without time zone DEFAULT now() NOT NULL,
     CHECK (probenintervall = 'J'
diff -r 3c24d33bf0db -r 4ee336c65ab3 src/main/java/de/intevation/lada/model/land/Messprogramm.java
--- a/src/main/java/de/intevation/lada/model/land/Messprogramm.java	Mon Nov 21 14:54:09 2016 +0100
+++ b/src/main/java/de/intevation/lada/model/land/Messprogramm.java	Fri Nov 25 10:24:22 2016 +0100
@@ -77,6 +77,9 @@
     @Column(name="ort_id")
     private Integer ortId;
 
+    @Column(name="mpl_id")
+    private Integer mplId;
+
     @Column(name="probe_kommentar")
     private String probeKommentar;
 
@@ -206,6 +209,14 @@
         this.ortId = ortId;
     }
 
+    public Integer getMplId() {
+        return this.mplId;
+    }
+
+    public void setMplId(Integer mplId) {
+        this.mplId = mplId;
+    }
+
     public String getProbeKommentar() {
         return this.probeKommentar;
     }
diff -r 3c24d33bf0db -r 4ee336c65ab3 src/main/java/de/intevation/lada/rest/MessprogrammService.java
--- a/src/main/java/de/intevation/lada/rest/MessprogrammService.java	Mon Nov 21 14:54:09 2016 +0100
+++ b/src/main/java/de/intevation/lada/rest/MessprogrammService.java	Fri Nov 25 10:24:22 2016 +0100
@@ -63,6 +63,7 @@
  *      "letzteAenderung": [timestamp],
  *      "mediaDesk": [string],
  *      "mstId": [string],
+ *      "mplId": [number],
  *      "name": [string],
  *      "netzbetreiberId": [string],
  *      "ortId": [string],
@@ -209,6 +210,7 @@
      *  "gemId": [string],
      *  "ortId": [string],
      *  "mediaDesk": [string],
+     *  "mplId": [number],
      *  "umwId": [string],
      *  "probenartId": [number],
      *  "probenintervall": [string],
@@ -277,6 +279,7 @@
      *  "datenbasisId": [number],
      *  "baId": [string],
      *  "gemId": [string],
+     *  "mplId": [number],
      *  "ortId": [string],
      *  "mediaDesk": [string],
      *  "umwId": [string],
diff -r 3c24d33bf0db -r 4ee336c65ab3 src/test/resources/datasets/messprogramm.json
--- a/src/test/resources/datasets/messprogramm.json	Mon Nov 21 14:54:09 2016 +0100
+++ b/src/test/resources/datasets/messprogramm.json	Fri Nov 25 10:24:22 2016 +0100
@@ -10,6 +10,7 @@
     "mstId": "06010",
     "laborMstId": "06010",
     "name": "Test 1",
+    "mplId": null,
     "ortId": null,
     "probeKommentar": null,
     "probeNehmerId": null,