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

vergeten

Browse Source
This commit is contained in:
Monique
2022-09-27 16:02:36 +02:00
parent 609340fefd
commit 44d614d72e
3 changed files with 625 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/monpas/main.css
+298 -97
View File
@@ -226,85 +226,16 @@ button.delete{
box-shadow:none; box-shadow:none;
} }
.handschudden{
background-image: url('/css/images/handshake-simple-solid.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 35px 35px;
background-position:center;
width: 30px;
height: 30px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.vasthouden{
background-image: url('/css/images/hands-holding-child-solid.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 35px 35px;
background-position:center;
width: 30px;
height: 30px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.splitsing{
background-image: url('/css/images/arrows-split-up-and-left-solid.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 35px 35px;
background-position:center;
width: 30px;
height: 30px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.ondersteuning{
background-image: url('/css/images/person-chalkboard-solid.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 35px 35px;
background-position:center;
width: 30px;
height: 30px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.omgevingZwart{
background-image: url('/css/images/omgevingZwart.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 35px 35px;
background-position:center;
width: 30px;
height: 30px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.omgevingGrijs{ .omgevingGrijs{
background-image: url('/css/images/omgevingGrijs.png'); background-image: url('/css/images/omgevingGrijs.png');
margin-right: 1px; margin-right: 1px;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 35px 35px; background-size: 50px 50px;
background-position:center; background-position:center;
width: 30px; width: 50px;
height: 30px; height: 50px;
border: medium none; border: medium none;
cursor: pointer; cursor: pointer;
box-shadow:none; box-shadow:none;
@@ -315,10 +246,10 @@ button.delete{
margin-right: 1px; margin-right: 1px;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 35px 35px; background-size: 50px 50px;
background-position:center; background-position:center;
width: 30px; width: 50px;
height: 30px; height: 50px;
border: medium none; border: medium none;
cursor: pointer; cursor: pointer;
box-shadow:none; box-shadow:none;
@@ -329,10 +260,10 @@ button.delete{
margin-right: 1px; margin-right: 1px;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 35px 35px; background-size: 50px 50px;
background-position:center; background-position:center;
width: 30px; width: 50px;
height: 30px; height: 50px;
border: medium none; border: medium none;
cursor: pointer; cursor: pointer;
box-shadow:none; box-shadow:none;
@@ -342,10 +273,10 @@ button.delete{
margin-right: 1px; margin-right: 1px;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 35px 35px; background-size: 50px 50px;
background-position:center; background-position:center;
width: 30px; width: 50px;
height: 30px; height: 50px;
border: medium none; border: medium none;
cursor: pointer; cursor: pointer;
box-shadow:none; box-shadow:none;
@@ -355,10 +286,148 @@ button.delete{
margin-right: 1px; margin-right: 1px;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 35px 35px; background-size: 50px 50px;
background-position:center; background-position:center;
width: 30px; width: 50px;
height: 30px; height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.acceptGrijs{
background-image: url('/css/images/acceptGrijs.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.acceptRood{
background-image: url('/css/images/acceptRood.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.acceptOranje{
background-image: url('/css/images/acceptOranje.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.acceptGroen{
background-image: url('/css/images/acceptGroen.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.acceptBlauw{
background-image: url('/css/images/acceptBlauw.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.samenGrijs{
background-image: url('/css/images/samenGrijs.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.samenRood{
background-image: url('/css/images/samenRood.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.samenOranje{
background-image: url('/css/images/samenOranje.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.samenGroen{
background-image: url('/css/images/samenGroen.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.samenBlauw{
background-image: url('/css/images/samenBlauw.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none; border: medium none;
cursor: pointer; cursor: pointer;
box-shadow:none; box-shadow:none;
@@ -366,15 +435,154 @@ button.delete{
.extraGrijs{
background-image: url('/css/images/extraGrijs.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.extraRood{
background-image: url('/css/images/extraRood.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: none;
cursor: pointer;
box-shadow:none;
}
.extraOranje{
background-image: url('/css/images/extraOranje.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.extraGroen{
background-image: url('/css/images/extraGroen.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.extraBlauw{
background-image: url('/css/images/extraBlauw.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.diffGrijs{
background-image: url('/css/images/diffGrijs.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.diffRood{
background-image: url('/css/images/diffRood.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.diffOranje{
background-image: url('/css/images/diffOranje.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.diffGroen{
background-image: url('/css/images/diffGroen.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.diffBlauw{
background-image: url('/css/images/diffBlauw.png');
margin-right: 1px;
background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat;
background-size: 50px 50px;
background-position:center;
width: 50px;
height: 50px;
border: medium none;
cursor: pointer;
box-shadow:none;
}
.leeg{ .leeg{
background-image: url('/css/images/leeg.png'); background-image: url('/css/images/leeg.png');
margin-right: 1px; margin-right: 1px;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 35px 35px; background-size: 50px 50px;
background-position:center; background-position:center;
width: 30px; width: 50px;
height: 30px; height: 50px;
border: medium none; border: medium none;
cursor: pointer; cursor: pointer;
box-shadow:none; box-shadow:none;
@@ -1451,9 +1659,9 @@ z-index: 50;
.draggable { .draggable {
display: inline-block; display: inline-block;
width: 160px; width: 19%;
height: 40px; height: 50px;
padding-left: 10px; /*padding-left: 10px;*/
} }
.dragSource{ .dragSource{
@@ -1463,10 +1671,3 @@ z-index: 50;
border-style: dashed; border-style: dashed;
background-color: #f8f8f8; background-color: #f8f8f8;
} }
.trash{
border:1px solid red;
background-color: pink;
text-align:center;
}
public/js/monpas/models/ontwikkelmodel.js
+318 -103
View File
@@ -92,19 +92,21 @@ ls.initOntwikkelModel = function(){
this.ijkpuntid = p.ijkpunt_id; this.ijkpuntid = p.ijkpunt_id;
this.wensid = 0; this.wensid = 0;
// if (p.gewenstid) { this.wensid = p.gewenstid; } if (p.gewenstid) { this.wensid = p.gewenstid; }
this.scoretype = p.scoretype; this.scoretype = p.scoretype;
this.disabled = p.disabled; this.disabled = p.disabled;
this.disablentv = p.disablenvt; this.disablentv = p.disablenvt;
this.huidig = ko.observable(p.huidig); this.huidig = ko.observable(p.huidig);
if (p.disabled == 'T' || p.disablenvt == 'T') this.huidig(5) if (p.disabled == 'T' || p.disablenvt == 'T') this.huidig(5)
// observable is niet nodig maar dit was eerst een computed
this.gewenst = ko.observable(3); this.gewenst = ko.observable(3);
if (p.gewenst) { if (p.gewenst) {
this.gewenst(p.gewenst) this.gewenst(p.gewenst)
} }
; this.advies = ko.computed(function(){
return dit.huidig() < dit.gewenst();
});
if (p.disabled == 'T' || p.disablenvt == 'T') this.gewenst(5) if (p.disabled == 'T' || p.disablenvt == 'T') this.gewenst(5)
this.nummer = p.nummer; this.nummer = p.nummer;
@@ -112,42 +114,8 @@ ls.initOntwikkelModel = function(){
this.toelichting = p.toelichting; this.toelichting = p.toelichting;
this.aantalscholen = p.aantalscholen; this.aantalscholen = p.aantalscholen;
// this.gewenstIcons = ko.observable(0);
// if (p.gewenst) {
// this.gewenstIcons(p.gewenst)
// }
// if(dit.gewenstIcons() == 5) dit.gewenstIcons(0);
//
// this.omgevingen = ko.observableArray();
// this.saveOmgevingen = ko.observableArray([]);
// if (Number(this.nummer) == 5) {
// for (var i = 0; i < 5; i++) {
//
// if (i == Number(dit.gewenstIcons())) {
// dit.omgevingen.push('huisje')
// switch(i){
// case 0: dit.omgevingen.push('omgevingGrijs');
// break;
// case 1: dit.omgevingen.push('omgevingRood');
// break;
// case 2: dit.omgevingen.push('omgevingOranje');
// break;
// case 3: dit.omgevingen.push('omgevingGroen');
// break;
// case 4: dit.omgevingen.push('omgevingBlauw');
// break;
// }
//
// }else {
// dit.omgevingen.push( 'leeg')
// }
// }
// }
} }
// function fAddIcoon(afbeelding){
// this.afbeelding = ko.observable(afbeelding)
// }
function fIcoon(afbeelding) { function fIcoon(afbeelding) {
this.afbeelding = ko.observable(afbeelding); this.afbeelding = ko.observable(afbeelding);
@@ -168,6 +136,7 @@ ls.initOntwikkelModel = function(){
orgversions : ko.observableArray([]), orgversions : ko.observableArray([]),
selectedOrgversion : ko.observable(''), selectedOrgversion : ko.observable(''),
selectedUser : ko.observable(''), selectedUser : ko.observable(''),
instrument : ko.observable(''),
// ijkpunten : ko.observableArray([]), // ijkpunten : ko.observableArray([]),
versieid : ko.observable(), // moet waarschijnlijk orgversie id worden!! versieid : ko.observable(), // moet waarschijnlijk orgversie id worden!!
results : ko.observableArray([]), results : ko.observableArray([]),
@@ -188,6 +157,11 @@ ls.initOntwikkelModel = function(){
drag_target_index3 : ko.observable(0), drag_target_index3 : ko.observable(0),
drag_start_index4 : ko.observable(0), drag_start_index4 : ko.observable(0),
drag_target_index4 : ko.observable(0), drag_target_index4 : ko.observable(0),
selectedAgenda : ko.observable('standaard'),
geentoegang : ko.observable(false),
orgversie : ko.observable(0),
adviezen : ko.observableArray(),
dragging0 : ko.computed(function() { dragging0 : ko.computed(function() {
if(ls.OntwikkelModel) { if(ls.OntwikkelModel) {
@@ -214,8 +188,16 @@ ls.initOntwikkelModel = function(){
return ls.OntwikkelModel.drag_start_index4() >= 0; return ls.OntwikkelModel.drag_start_index4() >= 0;
} }
}), }),
omgevingen : ko.observableArray([new fIcoon("omgevingGrijs"), new fIcoon("leeg"), new fIcoon("leeg"), new fIcoon("leeg"), new fIcoon("leeg")]), basisACC : ko.observableArray([new fIcoon("acceptGrijs"), new fIcoon("acceptRood"), new fIcoon("acceptOranje"), new fIcoon("acceptGroen"), new fIcoon("acceptBlauw")]),
basis : ko.observableArray([new fIcoon("omgevingGrijs"), new fIcoon("omgevingRood"), new fIcoon("omgevingOranje"), new fIcoon("omgevingGroen"), new fIcoon("omgevingBlauw")]), acceptaties : ko.observableArray([new fIcoon("acceptGrijs"), new fIcoon("leeg"), new fIcoon("leeg"), new fIcoon("leeg"), new fIcoon("leeg")]),
basisBTR : ko.observableArray([new fIcoon("samenGrijs"), new fIcoon("samenRood"), new fIcoon("samenOranje"), new fIcoon("samenGroen"), new fIcoon("samenBlauw")]),
betrokkenen : ko.observableArray(),
basisDIF : ko.observableArray([new fIcoon("diffGrijs"), new fIcoon("diffRood"), new fIcoon("diffOranje"), new fIcoon("diffGroen"), new fIcoon("diffBlauw")]),
diffs : ko.observableArray(),
basisEXT : ko.observableArray([new fIcoon("extraGrijs"), new fIcoon("extraRood"), new fIcoon("extraOranje"), new fIcoon("extraGroen"), new fIcoon("extraBlauw")]),
extras : ko.observableArray(),
basisOMG : ko.observableArray([new fIcoon("omgevingGrijs"), new fIcoon("omgevingRood"), new fIcoon("omgevingOranje"), new fIcoon("omgevingGroen"), new fIcoon("omgevingBlauw")]),
omgevingen : ko.observableArray(),
@@ -229,14 +211,20 @@ ls.initOntwikkelModel = function(){
}, },
initModel: function() { initModel: function() {
var self = ls.OntwikkelModel; var self = ls.OntwikkelModel;
$.post("index.php/monpas/rapijkpunten/checkLevel", function(data){ $.post("index.php/monpas/rapijkpunten/checkLevel", function(data){
if(data){ if(data){
if(data === 1) if(data === 1)
self.level123(true); self.level123(true);
} }
self.fGetOrganisaties(); $.post("index.php/monpas/rapontwikkel/getModule", function(result){
if(result){
self.instrument(result);
if(self.instrument() == '730'){
self.selectedAgenda('dragdrop')
}
}
self.fGetOrganisaties();
},'json')
},'json') },'json')
}, },
@@ -285,7 +273,6 @@ ls.initOntwikkelModel = function(){
self.writeOK(result); self.writeOK(result);
if(typeof callback ==='function' && callback()){ if(typeof callback ==='function' && callback()){
callback(); callback();
} }
},'json'); },'json');
@@ -295,6 +282,12 @@ ls.initOntwikkelModel = function(){
fToggleGeopend: function(){ fToggleGeopend: function(){
this.geopend(!this.geopend()); this.geopend(!this.geopend());
}, },
fToggleAgenda(){
var self=ls.OntwikkelModel;
self.selectedAgenda();
},
fUpdateGewenst: function(num){ fUpdateGewenst: function(num){
var self=ls.OntwikkelModel; var self=ls.OntwikkelModel;
if(this.huidig() != 5 ) this.gewenst(num); if(this.huidig() != 5 ) this.gewenst(num);
@@ -351,7 +344,6 @@ ls.initOntwikkelModel = function(){
self.verberg(true); self.verberg(true);
} }
if (self.selectedOrgversion().vorm === '1' && self.writeOK()) self.wijzigRecht(true); if (self.selectedOrgversion().vorm === '1' && self.writeOK()) self.wijzigRecht(true);
if (self.selectedOrgversion().vorm === '2' && self.eigenLijst()) self.wijzigRecht(true); if (self.selectedOrgversion().vorm === '2' && self.eigenLijst()) self.wijzigRecht(true);
if (self.selectedOrgversion().vorm === '2' && self.writeOK() && if (self.selectedOrgversion().vorm === '2' && self.writeOK() &&
@@ -430,64 +422,171 @@ ls.initOntwikkelModel = function(){
fHaalOrgScoresOp: function(){ fHaalOrgScoresOp: function(){
var self = ls.OntwikkelModel; var self = ls.OntwikkelModel;
self.ingevuld(false); self.ingevuld(false);
if(self.geentoegang() && self.orgversie() == self.selectedOrgversion().id ) return;
if (self.selectedOrgversion() == undefined) return; if (self.selectedOrgversion() == undefined) return;
self.orgversie(self.selectedOrgversion().id)
self.geentoegang(true)
var submitData = {orgversieid : self.selectedOrgversion().id, var submitData = {orgversieid : self.selectedOrgversion().id,
orgid : self.selectedOrg().id orgid : self.selectedOrg().id
} }
$.post("index.php/monpas/rapontwikkel/getscores", submitData, function(data){ $.post("index.php/monpas/rapontwikkel/getscores", submitData, function(data){
self.results.removeAll(); self.results.removeAll();
if (data){ if (data){
$.each(data.scores, function(i,p){ $.each(data.scores, function(i,p){
self.results.push(new fAddResult(p)); self.results.push(new fAddResult(p));
self.ingevuld(true); self.ingevuld(true);
}) })
$.each(data.scores, function(z,s){
switch(Number(s.nummer)) {
case 1: self.fVulAcceptaties(s.gewenst);
break;
case 2: self.fVulBetrokkenen(s.gewenst);
break;
case 3: self.fVulDiffs(s.gewenst);
break;
case 4: self.fVulExtras(s.gewenst);
break;
case 5: self.fVulOmgevingen(s.gewenst);
break;
}
})
self.fGetWriteAutorisatie();
// $.each(data.scores, function(i,p){
// if(p.gewenst){
// if (Number(p.gewenst) == 5) self.drag_start_index5(0);
// else{
// self.drag_start_index5(Number(p.gewenst))
// }
// for(var s = 0; s < 5; s++){
// if(s== self.drag_start_index5()){
// switch(s){
// case 0: self.omgevingen.push('omgevingGrijs')
// break;
// case 1: self.omgevingen.push('omgevingRood')
// break;
// case 2: self.omgevingen.push('omgevingOranje');
// break;
// case 3: self.omgevingen.push('omgevingGroen');
// break;
// case 4: self.omgevingen.push('omgevingBlauw');
// break;
// }
//
// }else{ self.omgevingen.push('leeg')
//
// }
// }
//
// }
//
// })
self.fGetWriteAutorisatie();
} }
},'json'); },'json');
}, },
fVulAcceptaties: function(gewenst){
var self = ls.OntwikkelModel;
// self.acceptaties.removeAll();
let streven = gewenst;
if(Number(gewenst) === 5) streven = 0;
switch(Number(streven)){
case 0: self.acceptaties([new fIcoon('acceptGrijs'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 1: self.acceptaties([new fIcoon('leeg'), new fIcoon('acceptRood'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 2: self.acceptaties([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('acceptOranje'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 3: self.acceptaties([new fIcoon('leeg'),new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('acceptGroen'), new fIcoon('leeg')]);
break;
case 4: self.acceptaties([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'),new fIcoon('acceptBlauw')]);
break;
}
},
fVulBetrokkenen: function(gewenst){
var self = ls.OntwikkelModel;
self.betrokkenen.removeAll();
let streven = gewenst;
if(Number(gewenst) === 5) streven = 0;
switch(Number(streven)){
case 0: self.betrokkenen([new fIcoon('samenGrijs'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 1: self.betrokkenen([new fIcoon('leeg'), new fIcoon('samenRood'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 2: self.betrokkenen([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('samenOranje'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 3: self.betrokkenen([new fIcoon('leeg'),new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('samenGroen'), new fIcoon('leeg')]);
break;
case 4: self.betrokkenen([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'),new fIcoon('samenBlauw')]);
break;
}
},
fVulDiffs: function(gewenst){
var self = ls.OntwikkelModel;
self.diffs.removeAll();
let streven = gewenst;
if(Number(gewenst) === 5) streven = 0;
switch(Number(streven)){
case 0: self.diffs([new fIcoon('diffGrijs'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 1: self.diffs([new fIcoon('leeg'), new fIcoon('diffRood'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 2: self.diffs([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('diffOranje'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 3: self.diffs([new fIcoon('leeg'),new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('diffGroen'), new fIcoon('leeg')]);
break;
case 4: self.diffs([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'),new fIcoon('diffBlauw')]);
break;
}
},
fVulExtras: function(gewenst){
var self = ls.OntwikkelModel;
self.extras.removeAll();
let streven = gewenst;
if(Number(gewenst) === 5) streven = 0;
switch(Number(streven)){
case 0: self.extras([new fIcoon('extraGrijs'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 1: self.extras([new fIcoon('leeg'), new fIcoon('extraRood'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 2: self.extras([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('extraOranje'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 3: self.extras([new fIcoon('leeg'),new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('extraGroen'), new fIcoon('leeg')]);
break;
case 4: self.extras([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'),new fIcoon('extraBlauw')]);
break;
}
},
fVulOmgevingen: function(gewenst){
var self = ls.OntwikkelModel;
self.omgevingen.removeAll();
let streven = gewenst;
if(Number(gewenst) === 5) streven = 0;
switch(Number(streven)){
case 0: self.omgevingen([new fIcoon('omgevingGrijs'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 1: self.omgevingen([new fIcoon('leeg'), new fIcoon('omgevingRood'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 2: self.omgevingen([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('omgevingOranje'), new fIcoon('leeg'), new fIcoon('leeg')]);
break;
case 3: self.omgevingen([new fIcoon('leeg'),new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('omgevingGroen'), new fIcoon('leeg')]);
break;
case 4: self.omgevingen([new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'), new fIcoon('leeg'),new fIcoon('omgevingBlauw')]);
break;
}
// for(let i = 0; i< 5; i++){
// if(i=== streven){
// switch(streven){
// case 0: self.omgevingen.push(new fIcoon('omgevingGrijs'));
// break;
// case 1: self.omgevingen.push(new fIcoon('omgevingRood'));
// break;
// case 2: self.omgevingen.push(new fIcoon('omgevingOranje'));
// break;
// case 3: self.omgevingen.push(new fIcoon('omgevingGroen'));
// break;
// case 4: self.omgevingen.push(new fIcoon('omgevingBlauw'));
// break;
//
// }
// }
// else{
// self.omgevingen.push(new fIcoon('leeg'))
// }
// }
},
fGetUserScores: function(){ fGetUserScores: function(){
var self = ls.OntwikkelModel; var self = ls.OntwikkelModel;
self.results.removeAll(); self.results.removeAll();
@@ -512,6 +611,21 @@ ls.initOntwikkelModel = function(){
self.results.push(new fAddResult(p)); self.results.push(new fAddResult(p));
self.ingevuld(true); self.ingevuld(true);
}) })
$.each(data.scores, function(z,s){
switch(Number(s.nummer)) {
case 1: self.fVulAcceptaties(s.gewenst);
break;
case 2: self.fVulBetrokkenen(s.gewenst);
break;
case 3: self.fVulDiffs(s.gewenst);
break;
case 4: self.fVulExtras(s.gewenst);
break;
case 5: self.fVulOmgevingen(s.gewenst);
break;
}
})
} }
self.fCheckEigenLijst(); self.fCheckEigenLijst();
},'json'); },'json');
@@ -549,18 +663,76 @@ ls.initOntwikkelModel = function(){
var self=ls.OntwikkelModel; var self=ls.OntwikkelModel;
var orguserid = 0; var orguserid = 0;
if(self.eigenLijst()){ if(self.eigenLijst()){
orguserid = self.selectedUser().orguserid; orguserid = self.selectedUser().orguserid;
} }
var wensarray = []; var wensarray = [];
$.each(self.results() , function(i,p){
wensarray[i]={ 'ijkpuntid' : p.ijkpuntid, if(self.selectedAgenda()==='standaard') {
'wensid' : p.wensid, $.each(self.results(), function (i, p) {
'gewenst' : p.gewenst() }; wensarray[i] = {
'ijkpuntid': p.ijkpuntid,
'wensid': p.wensid,
'gewenst': p.gewenst()
};
});
}
if(self.selectedAgenda()==='dragdrop') {
$.each(self.results(), function (i, p) {
switch(Number(p.nummer)) {
case 1: $.each(self.acceptaties(), function (x, a) {
console.log(a.afbeelding(), "afbeelding")
if (a.afbeelding() !== 'leeg') {
wensarray.push({'ijkpuntid': p.ijkpuntid,
'wensid': p.wensid,
'gewenst': x})
}
});
break;
case 2: $.each(self.betrokkenen(), function (z, b) {
if (b.afbeelding() !== 'leeg') {
wensarray.push({'ijkpuntid': p.ijkpuntid,
'wensid': p.wensid,
'gewenst': z})
}
});
break;
case 3: $.each(self.diffs(), function (s, d) {
if (d.afbeelding() !== 'leeg') {
wensarray.push({'ijkpuntid': p.ijkpuntid,
'wensid': p.wensid,
'gewenst': s})
}
});
break;
case 4: $.each(self.extras(), function (g, x) {
if (x.afbeelding() !== 'leeg') {
wensarray.push({'ijkpuntid': p.ijkpuntid,
'wensid': p.wensid,
'gewenst': g})
}
});
break;
case 5: $.each(self.omgevingen(), function (f, m) {
if (m.afbeelding() !== 'leeg') {
wensarray.push({'ijkpuntid': p.ijkpuntid,
'wensid': p.wensid,
'gewenst': f})
}
});
break;
}
})
}
//
console.log(wensarray, "wensarray")
// return;
});
var submitData= { 'wensarray' : wensarray, var submitData= { 'wensarray' : wensarray,
'orgid' : self.selectedOrg().id, 'orgid' : self.selectedOrg().id,
'orgversionid' : self.selectedOrgversion().id, 'orgversionid' : self.selectedOrgversion().id,
@@ -570,7 +742,7 @@ ls.initOntwikkelModel = function(){
$.each(self.results(), function(i,p){ $.each(self.results(), function(i,p){
if (p.wensid == 0){ p.wensid = wensids[i]; } if (p.wensid == 0){ p.wensid = wensids[i]; }
}); // each }); // each
ls.MsgAutoFade("Gegevens zijn opgeslagen", 600); ls.MsgAutoFade("Gegevens zijn opgeslagen", 600);
};// If wensids };// If wensids
},'json') ; },'json') ;
}, },
@@ -619,16 +791,16 @@ ls.initOntwikkelModel = function(){
fDragenter: function( event, index, parent){ fDragenter: function( event, index, parent){
var self= ls.OntwikkelModel; var self= ls.OntwikkelModel;
switch(index){ switch(parent){
case 0: self.drag_start_index0(index); case 'ACC': self.drag_target_index0(index);
break; break;
case 1: self.drag_start_index1(index); case 'BTR': self.drag_target_index1(index);
break; break;
case 2: self.drag_start_index2(index); case 'DIF': self.drag_target_index2(index);
break; break;
case 3: self.drag_start_index3(index); case 'EXT': self.drag_target_index3(index);
break; break;
case 4: self.drag_start_index4(index); case 'OMG': self.drag_target_index4(index);
break; break;
} }
@@ -646,24 +818,67 @@ ls.initOntwikkelModel = function(){
event.preventDefault(); event.preventDefault();
}, },
fDrop: function( event, $index){ fDrop: function( event, index, parent){
var self= ls.OntwikkelModel; var self= ls.OntwikkelModel;
$(event.target).removeClass('dragover'); $(event.target).removeClass('dragover');
self.fWissel(self.drag_start_index5(), self.drag_target_index5()) switch(parent){
case 'ACC': self.fWissel(self.drag_start_index0(), self.drag_target_index0(), 'ACC')
break;
case 'BTR': self.fWissel(self.drag_start_index1(), self.drag_target_index1(), 'BTR')
break;
case 'DIF': self.fWissel(self.drag_start_index2(), self.drag_target_index2(), 'DIF')
break;
case 'EXT': self.fWissel(self.drag_start_index3(), self.drag_target_index3(), 'EXT')
break;
case 'OMG': self.fWissel(self.drag_start_index4(), self.drag_target_index4(), 'OMG')
break;
}
}, },
fWissel : function(from, to) { fWissel : function(from, to, parent) {
var self = ls.OntwikkelModel; var self = ls.OntwikkelModel;
if (to > self.omgevingen().length - 1 || to < 0) return;
var fromObj = self.basis()[to];//grisd blokje op 0 switch(parent){
var toObj = self.omgevingen()[to];// leeg blokje op 3 case 'ACC': if (to > self.acceptaties().length - 1 || to < 0) return;
self.omgevingen()[from] = toObj; //wordt leeg blokje op 0 var fromObj = self.basisACC()[to];
self.omgevingen()[to] = fromObj; //wordt grijsblokje op 3 moet worden groen blokje op s var toObj = self.acceptaties()[to];
self.omgevingen.valueHasMutated() self.acceptaties()[from] = toObj;
self.acceptaties()[to] = fromObj;
self.acceptaties.valueHasMutated();
break;
case 'BTR': if (to > self.betrokkenen().length - 1 || to < 0) return;
var fromObj = self.basisBTR()[to];
var toObj = self.betrokkenen()[to];
self.betrokkenen()[from] = toObj;
self.betrokkenen()[to] = fromObj;
self.betrokkenen.valueHasMutated();
break;
case 'DIF': if (to > self.diffs().length - 1 || to < 0) return;
var fromObj = self.basisDIF()[to];
var toObj = self.diffs()[to];
self.diffs()[from] = toObj;
self.diffs()[to] = fromObj;
self.diffs.valueHasMutated();
break;
case 'EXT': if (to > self.extras().length - 1 || to < 0) return;
var fromObj = self.basisEXT()[to];
var toObj = self.extras()[to];
self.extras()[from] = toObj;
self.extras()[to] = fromObj;
self.extras.valueHasMutated();
break;
case 'OMG': if (to > self.omgevingen().length - 1 || to < 0) return;
var fromObj = self.basisOMG()[to];
var toObj = self.omgevingen()[to];
self.omgevingen()[from] = toObj;
self.omgevingen()[to] = fromObj;
self.omgevingen.valueHasMutated();
break;
}
public/js/monpas/models/versiesmodel.js
+9
View File
@@ -112,6 +112,10 @@ $(function(){
fMaakNieuweVersie: function(){ fMaakNieuweVersie: function(){
var self = ls.VersiesModel; var self = ls.VersiesModel;
self.newVersieNaam(''); self.newVersieNaam('');
if(Number(self.selectedModule().sysnr) == 730) apprise("Dit instrument heeft in de ontwikkelagenda iconen voor de ijkpunten: " +
"Acceptatie, Betrokken leerlingen en ouders, Differentiatie, Extra ondersteuning en Fysieke omgeving. " +
"Neem contact op met de helpdesk als andere iconen nodig zijn. ");
$("#modNieuweVersie").modal('show'); $("#modNieuweVersie").modal('show');
}, },
fUpdateVersie: function(){ fUpdateVersie: function(){
@@ -180,6 +184,11 @@ $(function(){
if (i >= 0) { if (i >= 0) {
num = self.ijkpunten()[i].nummer(); num = self.ijkpunten()[i].nummer();
}; };
console.log(self.selectedModule().sysnr, "sysnr")
console.log(Number(self.ijkpunten().length ), "lengte")
if(Number(self.selectedModule().sysnr) == 730 && self.ijkpunten().length > 4){
apprise("Neem contact op met de helpdesk om iconen aan de ontwikkelagenda toe te voegen.");
}
self.newIJkpunt().nummer(parseInt(num)+ 1); self.newIJkpunt().nummer(parseInt(num)+ 1);
self.newIJkpunt().naam(''); self.newIJkpunt().naam('');
self.newIJkpunt().toelichting(''); self.newIJkpunt().toelichting('');