Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/passendOndCompactsop' into develop

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
#	application/libraries/monpas/compactsop/Compactepaginas.php
This commit is contained in:
Monique
2022-01-24 10:58:33 +01:00
parent 2ac4d42a55 f85b2632b5
commit 58707c730a
12 changed files with 528 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/monpas/models/compactsopmodel.js
+3 -3
View File
@@ -37,7 +37,7 @@ mh.initCompactSopModel = function(){
case '5': dit.naamkort2('Exp.Team'); break;
case '6': dit.naamkort2('Tevr. School'); break;
case '7': dit.naamkort2('Middelen'); break;
case '8': dit.naamkort2('Insp. indic.'); break;
case '8': dit.naamkort2('Passend Ond.'); break;
case '9': dit.naamkort2('Exp. SO & SBO'); break;
case '10': dit.naamkort2('Diversiteit'); break;
}
@@ -82,7 +82,7 @@ mh.initCompactSopModel = function(){
this.isBreedBlok = ko.pureComputed(function(){
if (this.groepen() >=9 ) return true
if (this.nummer == 7) return true
if (this.nummer == 8) return true
// if (this.nummer == 8) return true
return false
}, this)
this.infotekst = ko.pureComputed(function(){
@@ -681,7 +681,7 @@ mh.initCompactSopModel = function(){
var aantalOnderdelen =0
$.each(self.onderdelen(), function(x,onderdeel){
if (onderdeel.selected()){
if(onderdeel.nummer === '7' ||parseInt(onderdeel.groepen()) > 8 || onderdeel.nummer === '8' ){
if(onderdeel.nummer === '7' ||parseInt(onderdeel.groepen()) > 8 ){
aantalOnderdelen = parseInt(aantalOnderdelen) + parseInt(2);
} else {
aantalOnderdelen += 1