Merge branch 'feature/robbobswop' into develop
This commit is contained in:
@@ -321,11 +321,8 @@ mh.initCompactSopModel = function(){
|
||||
ko.applyBindings(mh.CompactSopModel, document.getElementById("pagcompactsop"));
|
||||
}
|
||||
$.post("index.php/monpas/compactsop/getorgsoort", function (result){
|
||||
console.log(result)
|
||||
if(result){
|
||||
self.orgsoortnummer(result);
|
||||
console.log(self.orgsoortnummer())
|
||||
console.log(result, "result")
|
||||
switch(result){
|
||||
case '1': self.orgsoort('SWV');
|
||||
self.label('SWOP');
|
||||
@@ -363,6 +360,7 @@ mh.initCompactSopModel = function(){
|
||||
self.paginas.removeAll();
|
||||
|
||||
if(data) {
|
||||
self.druk(true);
|
||||
$.each(data, function (i, s) {
|
||||
self.schooljaren.push(new fAddSchooljaar(s));
|
||||
});//each
|
||||
@@ -378,9 +376,10 @@ mh.initCompactSopModel = function(){
|
||||
var self =mh.CompactSopModel;
|
||||
if (self.druk()) return;
|
||||
if(self.selectedSchooljaar() === undefined){
|
||||
self.druk(true)
|
||||
self.fGetSchooljaren()
|
||||
return
|
||||
return;
|
||||
// self.druk(true)
|
||||
// self.fGetSchooljaren()
|
||||
// return
|
||||
}
|
||||
|
||||
// return;
|
||||
@@ -725,7 +724,6 @@ mh.initCompactSopModel = function(){
|
||||
self.tobemovedOnderdeel(this)
|
||||
}
|
||||
|
||||
console.log(self.tobemovedOnderdeel(),"onderdeel" )
|
||||
},
|
||||
|
||||
fHiernaartoe: function(){
|
||||
@@ -899,7 +897,6 @@ mh.initCompactSopModel = function(){
|
||||
});
|
||||
},
|
||||
filterSelected_NotPlaced: function(onderdelen){
|
||||
console.log(onderdelen(), "onderdelen not placed()")
|
||||
if (! onderdelen()) return false;
|
||||
return onderdelen().filter(function(onderdeel){
|
||||
return ( onderdeel.selected() && ! onderdeel.opA4() );
|
||||
|
||||
Reference in New Issue
Block a user