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

tussenopslag

Browse Source
This commit is contained in:
Monique
2021-10-08 12:52:42 +02:00
parent 129a222506
commit 057d721bd8
11 changed files with 147 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/monpas/models/invulmodel.js
+1 -3
View File
@@ -276,7 +276,7 @@ mh.initInvulModel = function(){
fSaveSO: function(){
var self = mh.InvulModel;
console.log("in functie SO")
var message = false;
if(isNaN(self.laag())){
@@ -315,7 +315,6 @@ mh.initInvulModel = function(){
};
console.log(submitData, "submitData SO")
$.post("index.php/monpas/omvang/saveTlvsSO", submitData, function (result) {
if(result){
if(result.laag) self.laagID(result.laag);
@@ -356,7 +355,6 @@ console.log(submitData, "submitData SO")
'zwaarID' : self.zwaarID(),
'schooljaarnr': self.selectedSchooljaar().nummer,
};
console.log(submitData, "submit")
$.post("index.php/monpas/omvang/saveTlvsSBO", submitData, function (result) {
if(result){
if(result.licht) self.lichtID(result.licht);
public/js/monpas/models/menumodel.js
-2
View File
@@ -95,10 +95,8 @@ ls.initMenuModel = function(){
self.menuitems.removeAll();
$.post("index.php/shared/menu/get_menu",function(data){
self.organisatie(data.organisatie);
console.log(data.organisatie, "data organisatie")
self.menuitems.removeAll();
if (data.menu){
console.log(data.menu, "data menu")
$.each(data.menu, function(i,p){
self.menuitems.push(new fAddMenuitem(p));
public/js/monpas/models/mondiv/diversiteitsmodel.js
+15 -6
View File
@@ -4,9 +4,10 @@ ls.initDiversiteitModel = function(module){
function fAddGroep(p){
var dit = this;
this.id = p.id;
this.naam = p.naam;
this.niveau = p.niveau;
this.id = p.id;
this.naam = p.naam;
this.niveau = p.niveau;
this.ondersteuning = p.ondersteuning;
this.factor = ls.DiversiteitModel.normaantallen()[1];
if (this.niveau.indexOf('1') >= 0 || this.niveau.indexOf('2') >=0) { this.factor = ls.DiversiteitModel.normaantallen()[0]; }
this.totaantal = p.totaantal;
@@ -97,14 +98,15 @@ ls.initDiversiteitModel = function(module){
groepstijden : ko.observableArray([]),
schoolTijd : ko.observable(0),
schoolTijdstring : ko.observable(''),
totGstring : ko.observable(''),
totSstring : ko.observable(''),
totIstring : ko.observable(''),
totGstring : ko.observable(''),
totSstring : ko.observable(''),
totIstring : ko.observable(''),
normaantallen : ko.observableArray([22,24]),
combifactor2 : ko.observable(1.5),
combifactor3 : ko.observable(2.5),
addtoschool : ko.observable(false),
module : ko.observable(),
ondersteuningSchool : ko.observable(true),
initBindings :function(){
var self = ls.DiversiteitModel;
@@ -154,7 +156,9 @@ ls.initDiversiteitModel = function(module){
$.post("index.php/monpas/diversiteit/getgroepen", submitData , function(data){
console.log(data, 'data diversiteit')
self.groepen.removeAll();
self.ondersteuningSchool(true);
self.schooltotaal(0);
self.schoolsom1(0);
self.schoolsom2(0);
@@ -166,6 +170,11 @@ ls.initDiversiteitModel = function(module){
self.ondersteuningsvormen.removeAll();
if (data){
$.each(data, function(i,p){
console.log(p.ondersteuning, "ondersteuning" )
if(p.ondersteuning == 'F'){
self.ondersteuningSchool(false);
}
console.log(self.ondersteuningSchool())
self.groepen.push(new fAddGroep(p));
});//each
var combiwaarde = 0;
public/js/monpas/models/mondiv/monitordiversiteitmodel.js
-1
View File
@@ -86,7 +86,6 @@ ls.initMonDivModel = function(module){
$.post("index.php/monpas/groepen/getlabels/"+ self.module(), function(data){
showAjaxLoader();
console.log(data, "data")
if (data){
self.label1(data.label1)
self.label2(data.label2);
public/js/monpas/models/mondiv/ondersteuningmodel.js
+32 -7
View File
@@ -25,13 +25,14 @@ ls.initOndersteuningModel = function(module){
}
else {
ls.OndersteuningModel = {
schoolid : ko.observable(null),
schooljaarnr : ko.observable(null),
groepen : ko.observableArray([]),
selectedGroep : ko.observable(),
dagen : ko.observableArray([]),
writer : ko.observable(false),
module : ko.observable(),
schoolid : ko.observable(null),
schooljaarnr : ko.observable(null),
groepen : ko.observableArray([]),
selectedGroep : ko.observable(),
dagen : ko.observableArray([]),
writer : ko.observable(false),
module : ko.observable(),
geenOndersteuning : ko.observable(false),
initBindings :function(){
var self = ls.OndersteuningModel;
@@ -65,12 +66,36 @@ ls.initOndersteuningModel = function(module){
if (result){
$.each(result, function(i,p){
self.groepen.push(new fAddGroep(p));
if(p.ondersteuning == 'F') self.geenOndersteuning(true);
});//each
self.selectedGroep(self.groepen()[0]);
// self.fGetUren();
}
},'json');
},
fMeldOndersteuning(){
var self = ls.OndersteuningModel;
self.geenOndersteuning(! self.geenOndersteuning())
var ondersteuning = 'T';
if(self.geenOndersteuning()) ondersteuning = 'F'
var submitData = {
'schoolid' : self.schoolid(),
'schooljaar' : self.schooljaarnr(),
'module' : self.module(),
'ondersteuning' : ondersteuning,
}
console.log(submitData)
$.post("index.php/monpas/ondersteuning/meldondersteuning", submitData , function(result){
console.log(result, "result")
},'json');
},
fGetUren : function(){
var self = ls.OndersteuningModel;
if (!self.selectedGroep()) return;
public/js/monpas/models/sopoverzichtmodel.js
-1
View File
@@ -169,7 +169,6 @@ mh.initSopOverzichtModel = function(){
'orgid' : 0
};
$.post("index.php/monpas/overzichtsop/getoverzicht", submitData , function(data){
console.log(data, "data")
self.toporg('');
if (data.organisatie){
self.orgsoort(data.soort);