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

disabled ijkpunten, consolelogs, versie

Browse Source
This commit is contained in:
Monique
2022-09-29 10:38:13 +02:00
parent 44d614d72e
commit 56013513b1
8 changed files with 249 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+2 -1
View File
@@ -75,7 +75,8 @@ class MY_Controller extends CI_Controller{
// public $version = '1.17.99';// instrumenten ook voor leerlingen
// public $version = '1.18.00';// alle instrumenten in het compact sop
// public $version = '1.18.02';// fout in resultaatmatrix
public $version = '1.18.04';// invul status
// public $version = '1.18.04';// invul status
public $version = '1.18.05';// drag and drop
application/views/monpas/pages/ontwikkel.php
+28 -3
View File
@@ -169,10 +169,35 @@
<div id="hierhetverschilhuidiggewenst">
<h4><?=$labels['ijkpuntadvies']?> </h4>
<ul data-bind="foreach: results" style="list-style-type:none; margin:0; padding:0;">
<li data-bind="visible: advies(), text: nummer + '. ' + omschrijving"></li>
<ul data-bind="foreach: adviezen" style="list-style-type:none; margin:0; padding:0;">
<li data-bind="text: nummer + '. ' + omschrijving"></li>
</ul>
</div>
<div style="margin-top: 50px;">
<h4>Legenda</h4>
<table>
<tr>
<td style="width: 75px; background-color: #e08885; "></td>
<td style="padding: 3px;"> zwak</td>
</tr>
<tr>
<td style="width: 75px; background-color: #ffcc80 "></td>
<td style="padding: 3px;"> onvoldoende</td>
</tr>
<tr>
<td style="width: 75px; background-color: #9fdf9f; "></td>
<td style="padding: 3px;"> voldoende</td>
</tr>
<tr>
<td style="width: 75px; background-color: #99d6ff; "></td>
<td style="padding: 3px;"> goed</td>
</tr>
<tr>
<td style="width: 75px; background-color:#808080 "></td>
<td style="padding: 3px;"> nvt</td>
</tr>
</table>
</div>
</div> <!-- col md 4 -->
<div class="col-sm-12 col-md-9">
<div data-bind = "visible: orgversions().length > 0">
@@ -188,7 +213,7 @@
</h4>
<!-- ko if: instrument() && instrument() == 730 -->
<div >
<div><input type="radio" name="DragDrop" value="dragdrop" data-bind="checked: selectedAgenda "/> toon drag and drop agenda</div>
<div><input type="radio" name="DragDrop" value="dragdrop" data-bind="checked: selectedAgenda, click: "/> toon drag and drop agenda</div>
<div><input type="radio" name="DragDrop" value="standaard" data-bind="checked: selectedAgenda"/> toon standaard agenda</div>
</div>
<!--/ko-->
application/views/monpas/pages/partials/_draganddrop_agenda.php
+171 -1
View File
@@ -1 +1,171 @@
<?php
<div class="row">
<h4>Huidige situatie</h4>
<div class="col-xs-12">
<table style=" margin-bottom: 40px; width: 100%">
<tr class="modal-header">
<td style="width: 5%">nr.</td>
<td style="width:70%;"><?=$labels['Ykpunten']?> </td>
<td style="width: 5%; text-align:center" class="rood"> 1</td>
<td style="width: 5%; text-align:center" class="oranje"> 2</td>
<td style=";width: 5% text-align:center" class="groen"> 3</td>
<td style="width: 5% text-align:center" class="blauw"> 4</td>
<td style="width: 5%; text-align:center; background-color: #808080;" > </td>
</tr>
<tbody data-bind="foreach : results">
<tr class=" fixedH" >
<td class="allborders"
data-bind="text: nummer, style: {backgroundColor: disabled == 'T' || disablentv == 'T' ? '#cccccc' : ''}"
style="text-align:right; padding-right:3px; vertical-align:top">
</td>
<td style="vertical-align:top; "
class="allborders fixedH clickable"
data-bind=" click: $parent.fToonToelichting, style: {backgroundColor: disabled == 'T' || disablentv == 'T' ? '#cccccc' : ''}">
<span data-bind="text: omschrijving"></span>
<span data-bind="visible: disabled == 'T'" > (Uitgezet.)</span>
<span data-bind="visible: disabled == 'F' && disablentv == 'T'" > (Niet van toepassing.)</span>
</td>
<td class="allborders" ><div class="cirkel" data-bind="css: {'rood' : huidig() == 1}"></div></td>
<td class="allborders"><div class="cirkel" data-bind="css: {'oranje' : huidig() == 2}"></div></td>
<td class="allborders"><div class="cirkel" data-bind="css: {'groen' : huidig() == 3}"></div></td>
<td class="allborders"><div class="cirkel" data-bind="css: {'blauw' : huidig() == 4}"></div></td>
<td class="allborders"><div class="cirkel" data-bind="css: {'grijs' : huidig() == 5}"></div></td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row" >
<h4>Gewenste situatie</h4>
<div class="col-xs-5" >
<table style="width: 100%; ">
<tr>
<td class="allborders"
style="width: 12%; padding: 2px; height: 20px; vertical-align: top;
background-color: #6F0B3D; color:#f1f4f7; border-right: none; "
>nr.
</td>
<td class="allborders"
style=" width: 90%; vertical-align: top; padding: 2px; height: 20px;background-color: #6F0B3D;
color:#f1f4f7; border-left: none; "
> <?=$labels['Ykpunten']?>
</td>
</tr>
<!-- ko foreach: results -->
<tr>
<td class="allborders"
style="width: 10%; text-align: right; padding: 3px; height: 56px; vertical-align: top"
data-bind="text: nummer, style: {backgroundColor: disabled == 'T' || disablentv == 'T' ? '#cccccc' : ''}">
</td>
<td class="allborders clickable "
style=" width: 90%; vertical-align: top; padding: 3px; height: 56px; "
data-bind="click: $parent.fToonToelichting, style: {backgroundColor: disabled == 'T' || disablentv == 'T' ? '#cccccc' : ''} ">
<span data-bind="text: omschrijving"></span>
<span data-bind="visible: disabled == 'T'" > (Uitgezet.)</span>
<span data-bind="visible: disabled == 'F' && disablentv == 'T'" > (Niet van toepassing.)</span>
</td>
</tr>
<!--/ko-->
</table>
</div>
<div class="col-xs-7" >
<div style=" height: 27px; width:19%; background-color: #808080; color:#f1f4f7; text-align: center; display: inline-block;">&nbsp</div>
<div style=" height: 27px; width:19%; display: inline-block; background-color: #e08885; color:#f1f4f7; text-align: center">1</div>
<div style=" height: 27px; width:19%; display: inline-block; background-color: #ffcc80;color:#f1f4f7;text-align: center">2</div>
<div style=" height: 27px; width:19%; display: inline-block; background-color: #9fdf9f;color:#f1f4f7;text-align: center">3</div>
<div style=" height: 27px; width:19%; display: inline-block; background-color: #99d6ff;color:#f1f4f7;text-align: center">4</div>
<div id="acceptatie" data-bind=" foreach: acceptaties ">
<div class="draggable" draggable="true"
data-bind="event:{
dragstart : $root.fDragstart.bind($data, event, $index(), 'ACC'),
dragend : $root.fDragend.bind($data, event, $index()),
dragover : $root.fDragover.bind($data, event ),
dragenter : $root.fDragenter.bind($data, event, $index(), 'ACC'),
dragleave : $root.fDragleave.bind($data, event),
drop : $root.fDrop.bind($data, event, $index(), 'ACC' )
}">
<!-- <div data-bind="text: afbeelding"></div>-->
<div data-bind='attr: {class: afbeelding}'></div>
</div>
</div>
<div id="betrokken" data-bind=" foreach: betrokkenen ">
<div class="draggable" draggable="true"
data-bind="event:{
dragstart : $root.fDragstart.bind($data, event, $index(), 'BTR'),
dragend : $root.fDragend.bind($data, event, $index()),
dragover : $root.fDragover.bind($data, event ),
dragenter : $root.fDragenter.bind($data, event, $index(), 'BTR'),
dragleave : $root.fDragleave.bind($data, event),
drop : $root.fDrop.bind($data, event, $index(), 'BTR' )
}">
<!-- <div data-bind="text: afbeelding"></div>-->
<div data-bind='attr: {class: afbeelding}'></div>
</div>
</div>
<div id="differentiatie" data-bind=" foreach: diffs ">
<div class="draggable" draggable="true"
data-bind="event:{
dragstart : $root.fDragstart.bind($data, event, $index(), 'DIF'),
dragend : $root.fDragend.bind($data, event, $index()),
dragover : $root.fDragover.bind($data, event ),
dragenter : $root.fDragenter.bind($data, event, $index(), 'DIF'),
dragleave : $root.fDragleave.bind($data, event),
drop : $root.fDrop.bind($data, event, $index(), 'DIF' )
}">
<!-- <div data-bind="text: afbeelding"></div>-->
<div data-bind='attr: {class: afbeelding}'></div>
</div>
</div>
<div id="extra" data-bind=" foreach: extras ">
<div class="draggable" draggable="true"
data-bind="event:{
dragstart : $root.fDragstart.bind($data, event, $index(), 'EXT'),
dragend : $root.fDragend.bind($data, event, $index()),
dragover : $root.fDragover.bind($data, event ),
dragenter : $root.fDragenter.bind($data, event, $index(), 'EXT'),
dragleave : $root.fDragleave.bind($data, event),
drop : $root.fDrop.bind($data, event, $index(), 'EXT' )
}">
<!-- <div data-bind="text: afbeelding"></div>-->
<div data-bind='attr: {class: afbeelding}'></div>
</div>
</div>
<div id="omgeving" data-bind=" foreach: omgevingen ">
<div class="draggable" draggable="true"
data-bind="event:{
dragstart : $root.fDragstart.bind($data, event, $index(), 'OMG'),
dragend : $root.fDragend.bind($data, event, $index()),
dragover : $root.fDragover.bind($data, event ),
dragenter : $root.fDragenter.bind($data, event, $index(), 'OMG'),
dragleave : $root.fDragleave.bind($data, event),
drop : $root.fDrop.bind($data, event, $index(), 'OMG' )
}">
<!-- <div data-bind="text: afbeelding"></div>-->
<div data-bind='attr: {class: afbeelding}'></div>
</div>
</div>
</div>
</div>
public/images/logos/TDu3YrEcwjmVK1v.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

public/images/logos/yDa7dR6FkUXCgzK.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 693 B

public/js/monpas/models/modulebalkmodel.js
-2
View File
@@ -34,8 +34,6 @@ ls.initModulebalkModel = function(){
selectedSchooljaar : ko.observableArray([]),
initBindings :function(){
console.log(vandaag, "vandaag")
var self = ls.ModulebalkModel;
if (!ko.dataFor(document.getElementById('modulebalk')) ) {
ko.applyBindings(ls.ModulebalkModel, document.getElementById("modulebalk"));
public/js/monpas/models/ontwikkelmodel.js
+47 -23
View File
@@ -103,10 +103,6 @@ ls.initOntwikkelModel = function(){
if (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)
this.nummer = p.nummer;
@@ -115,7 +111,10 @@ ls.initOntwikkelModel = function(){
this.aantalscholen = p.aantalscholen;
}
function fAddAdvies(a) {
this.nummer = a.nummer;
this.omschrijving = a.omschrijving;
}
function fIcoon(afbeelding) {
this.afbeelding = ko.observable(afbeelding);
@@ -283,11 +282,7 @@ ls.initOntwikkelModel = function(){
this.geopend(!this.geopend());
},
fToggleAgenda(){
var self=ls.OntwikkelModel;
self.selectedAgenda();
},
fUpdateGewenst: function(num){
var self=ls.OntwikkelModel;
if(this.huidig() != 5 ) this.gewenst(num);
@@ -434,11 +429,13 @@ ls.initOntwikkelModel = function(){
}
$.post("index.php/monpas/rapontwikkel/getscores", submitData, function(data){
self.results.removeAll();
self.adviezen.removeAll();
if (data){
$.each(data.scores, function(i,p){
self.results.push(new fAddResult(p));
self.ingevuld(true);
})
$.each(data.scores, function(z,s){
switch(Number(s.nummer)) {
case 1: self.fVulAcceptaties(s.gewenst);
@@ -456,6 +453,12 @@ ls.initOntwikkelModel = function(){
})
self.fGetWriteAutorisatie();
$.each(self.results(), function(i,p){
if(p.gewenst() && p.huidig() < p.gewenst()) {
self.adviezen.push( new fAddAdvies(p));
}
})
}
},'json');
@@ -606,6 +609,7 @@ ls.initOntwikkelModel = function(){
orgid : self.selectedOrg().id,
orgversie : self.selectedOrgversion().id}
$.post("index.php/monpas/rapontwikkel/scoresindividueel" , submitData, function(data){
self.adviezen.removeAll();
if (data){
$.each(data.scores, function(i,p){
self.results.push(new fAddResult(p));
@@ -628,6 +632,11 @@ ls.initOntwikkelModel = function(){
})
}
self.fCheckEigenLijst();
$.each(self.results(), function(i,p){
if(p.gewenst() && p.huidig() < p.gewenst()) {
self.adviezen.push( new fAddAdvies(p));
}
})
},'json');
}
else {
@@ -683,7 +692,6 @@ ls.initOntwikkelModel = function(){
$.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,
@@ -729,7 +737,6 @@ ls.initOntwikkelModel = function(){
})
}
//
console.log(wensarray, "wensarray")
// return;
@@ -738,30 +745,47 @@ ls.initOntwikkelModel = function(){
'orgversionid' : self.selectedOrgversion().id,
'orguserid' : orguserid}
$.post("index.php/monpas/rapontwikkel/savegewenst", submitData, function(wensids){
if (wensids){
$.each(self.results(), function(i,p){
if (p.wensid == 0){ p.wensid = wensids[i]; }
}); // each
self.adviezen.removeAll();
$.each(self.results(), function(i,p){
if(p.gewenst() && p.huidig() < p.gewenst()) {
self.adviezen.push(new fAddAdvies(p));
}
})
ls.MsgAutoFade("Gegevens zijn opgeslagen", 600);
};// If wensids
},'json') ;
;// If wensids
},'json')
},
fDragstart: function( event, index, parent){
var self= ls.OntwikkelModel;
$(event.target).addClass('dragSource')
switch(parent){
case 'ACC': self.drag_start_index0(index);
case 'ACC': if(self.results()[0] && self.results()[0].disabled=== 'T') {
apprise("Dit ijkpunt is uitgezet.");
return;}
else self.drag_start_index0(index);
break;
case 'BTR': self.drag_start_index1(index);
case 'BTR': if(self.results()[1] && self.results()[1].disabled=== 'T') {
apprise("Dit ijkpunt is uitgezet.");
return;}
else self.drag_start_index1(index);
break;
case 'DIF': self.drag_start_index2(index);
case 'DIF': if(self.results()[2] && self.results()[2].disabled=== 'T') {
apprise("Dit ijkpunt is uitgezet.");
return;}
else self.drag_start_index2(index);
break;
case 'EXT': self.drag_start_index3(index);
case 'EXT': if(self.results()[3] && self.results()[3].disabled=== 'T') {
apprise("Dit ijkpunt is uitgezet.");
return;}
else self.drag_start_index3(index);
break;
case 'OMG' : self.drag_start_index4(index);
case 'OMG': if(self.results()[4] && self.results()[4].disabled=== 'T') {
apprise("Dit ijkpunt is uitgezet.");
return;}
else self.drag_start_index4(index);
break;
}
public/js/monpas/models/versiesmodel.js
+1 -2
View File
@@ -184,8 +184,7 @@ $(function(){
if (i >= 0) {
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.");
}