# HG changeset patch
# User Torsten Irländer <torsten.irlaender@intevation.de>
# Date 1371552011 -7200
# Node ID e9643b7c103c8f9ea3f917eb72f6903f679ec767
# Parent  3552b0ee45268bfb498f68c03c620c18be4f8c91
[mq]: craftid

diff -r 3552b0ee4526 -r e9643b7c103c app/model/Probe.js
--- a/app/model/Probe.js	Mon Jun 17 16:59:04 2013 +0200
+++ b/app/model/Probe.js	Tue Jun 18 12:40:11 2013 +0200
@@ -1,6 +1,7 @@
 Ext.define('Lada.model.Probe', {
     extend: 'Ext.data.Model',
     fields: [
+        {name: "id", type: "string", convert: buildId},
         {name: "probeId"},
         {name: "baId"},
         {name: "datenbasisId"},
@@ -28,13 +29,11 @@
         {name: "test"},
         {name: "umwId"}
     ],
-    idProperty: "probeId",
+    idProperty: "id",
     proxy: {
         type: 'rest',
         appendId: true, //default
         url: 'server/rest/proben',
-        api: {
-        },
         reader: {
             type: 'json',
             root: 'data'
@@ -42,6 +41,11 @@
     }
 });
 
+function buildId(v, record){
+    var newId = record.get('probeId') + record.get('nebenprobenNr');
+    return newId;
+}
+
 function ts2date(v, record){
     // Converts a timestamp into a date object.
     return new Date(v);