# HG changeset patch # User Michael Stanko # Date 1461920479 -7200 # Node ID b0873dfcef1d4d31257283005e16d132619bcfef # Parent 61cc583c3649ab09abe2f7c8a0ac4b0647a93fea# Parent 3c42c06e3a3634be49dcce4af96f360244228130 Messprogramm form redesign diff -r 61cc583c3649 -r b0873dfcef1d app.js --- a/app.js Fri Apr 29 10:20:05 2016 +0200 +++ b/app.js Fri Apr 29 11:01:19 2016 +0200 @@ -157,6 +157,9 @@ for (var i = 0; i < mstLabor.length; i++) { var item = store.getById(mstLabor[i].messstelle); var itemLabor = store.getById(mstLabor[i].labor); + if (!itemLabor) { + continue; + } mstLaborStore.add({ id: i, messStelle: mstLabor[i].messstelle, diff -r 61cc583c3649 -r b0873dfcef1d app/controller/form/Probe.js --- a/app/controller/form/Probe.js Fri Apr 29 10:20:05 2016 +0200 +++ b/app/controller/form/Probe.js Fri Apr 29 11:01:19 2016 +0200 @@ -231,8 +231,8 @@ var media = field.up('probeform').down('textfield[name="mediaDesk"]'); var current = media.getValue().split(' '); - if (current.length < 13) { - for (var i = 0; i <= 12; i++) { + if (current.length < 12) { + for (var i = 0; i < 12; i++) { if (i === 0) { current.push('D:'); } @@ -261,7 +261,7 @@ } current[desk.layer + 1] = value; if (desk.layer < 2) { - for (var i = desk.layer + 2; i < 13; i++) { + for (var i = desk.layer + 2; i < 12; i++) { current[i] = '00'; } this.clearChildDesk(desk);