diff --git a/.gitignore b/.gitignore index 92f2a90..bfd81ae 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,23 @@ public/tmp/ documents/compactsops/ /.vscode +/public/css/images/acceptRood.png +/public/css/images/diffBlauw.png +/public/css/images/diffGrijs.png +/public/css/images/diffGroen.png +/public/css/images/diffOranje.png +/public/css/images/diffRood.png +/public/css/images/extraBlauw.png +/public/css/images/extraGrijs.png +/public/css/images/extraGroen.png +/public/css/images/extraOranje.png +/public/css/images/extraRood.png +/public/css/images/samenBlauw.png +/public/css/images/samenGrijs.png +/public/css/images/samenGroen.png +/public/css/images/samenOranje.png +/public/css/images/samenRood.png +/public/css/images/acceptBlauw.png +/public/css/images/acceptGrijs.png +/public/css/images/acceptGroen.png +/public/css/images/acceptOranje.png diff --git a/application/controllers/monpas/Compactsop.php b/application/controllers/monpas/Compactsop.php index cb6503c..cb1a4da 100644 --- a/application/controllers/monpas/Compactsop.php +++ b/application/controllers/monpas/Compactsop.php @@ -27,6 +27,7 @@ class Compactsop extends MY_Controller{ "shared/Schooljaren_model", "monfin2/Finbestemmingen_model", "monpas/Versies_model", + "Phantom_model", "monpas/Scores_model", "monpas/Sop_model", diff --git a/application/controllers/monpas/Rapijkpunten.php b/application/controllers/monpas/Rapijkpunten.php index 38f9d6c..1dc0c86 100644 --- a/application/controllers/monpas/Rapijkpunten.php +++ b/application/controllers/monpas/Rapijkpunten.php @@ -85,9 +85,10 @@ class Rapijkpunten extends MY_Controller{ function checkLevel(){ if (!$this->userid) die; - $soort = $this->Organisaties_model->get_fieldvalue(array("id"=>$this->globorgid), 'soort' ); + $soort = $this->Organisaties_model->get_fieldvalue(array("id"=>$this->globorgid), 'soort' ); $werkter = $this->Orgusers_model->get_fieldvalue(array("user_id"=>$this->userid, "organisatie_id"=>$this->globorgid),"id"); - $level = 0; + + $level = 0; if ($soort < 4 && $werkter) { $level = 1; @@ -96,6 +97,8 @@ class Rapijkpunten extends MY_Controller{ echo json_encode($level); } + + function checkLevelInspectie(){ if (!$this->userid) die; $soort = $this->Organisaties_model->get_fieldvalue(array("id"=>$this->globorgid), 'soort' ); diff --git a/application/controllers/monpas/Rapontwikkel.php b/application/controllers/monpas/Rapontwikkel.php index 4735447..c9ef071 100644 --- a/application/controllers/monpas/Rapontwikkel.php +++ b/application/controllers/monpas/Rapontwikkel.php @@ -25,6 +25,12 @@ class Rapontwikkel extends MY_Controller { };// if } + function getModule(){ + $module = $this->session->userdata('module'); + + echo json_encode($module); + } + function savegewenst() { //TODO clean input diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 582dbc7..88bc88d 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -76,7 +76,7 @@ class MY_Controller extends CI_Controller{ // 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.05';// fout schoolgegevens compactsop + public $version = '1.18.05';// drag and drop diff --git a/application/libraries/monpas/Schoolafbeeldingen.php b/application/libraries/monpas/Schoolafbeeldingen.php index b0e0adb..f67c7be 100644 --- a/application/libraries/monpas/Schoolafbeeldingen.php +++ b/application/libraries/monpas/Schoolafbeeldingen.php @@ -265,6 +265,7 @@ class Schoolafbeeldingen { private function setScoreKleuren($scoretype){ + $kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($scoretype, $this->score->gem); $kleur = $kleur->kleurcode; if(!$kleur) $kleur = '#ffffff'; diff --git a/application/views/monpas/pages/ontwikkel.php b/application/views/monpas/pages/ontwikkel.php index 0427db7..af349c2 100644 --- a/application/views/monpas/pages/ontwikkel.php +++ b/application/views/monpas/pages/ontwikkel.php @@ -1,3 +1,4 @@ +
De geselecteerde lijst is (nog) niet ingevuld.
@@ -168,10 +169,35 @@

-
+
+

Legenda

+ + + + + + + + + + + + + + + + + + + + + +
zwak
onvoldoende
voldoende
goed
nvt
+
@@ -182,68 +208,37 @@ value : selectedOrgversion, event : {change: fChangeVersion2}"> - + + +
+
toon drag and drop agenda
+
toon standaard agenda
+
+ + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+
+ load->view("monpas/pages/partials/_tabel_agenda"); ?> +
+
+ load->view("monpas/pages/partials/_draganddrop_agenda"); ?> +
+ +
- - - - - - - - -
huidige situatie
 		 gewenste situatie
 
1 2 3 4 1 2 3 4
- - - (Uitgezet.) - (Niet van toepassing.) -
-
+ + + + + + diff --git a/application/views/monpas/pages/partials/_draganddrop_agenda.php b/application/views/monpas/pages/partials/_draganddrop_agenda.php new file mode 100644 index 0000000..99ae74f --- /dev/null +++ b/application/views/monpas/pages/partials/_draganddrop_agenda.php @@ -0,0 +1,171 @@ +
+ +

Huidige situatie

+
+ + + + + + + + + + + + + + + + + + + + + +
nr. 1 2 3 4
+ + + (Uitgezet.) + (Niet van toepassing.) + +
+
+
+ + +
+ +

Gewenste situatie

+
+ + + + + + + + + + + + + +
nr. + +
+ + + (Uitgezet.) + (Niet van toepassing.) + +
+
+
+ + +
 
+
1
+
2
+
3
+
4
+ + +
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+ + +
+
+ +
+
+ +
diff --git a/application/views/monpas/pages/partials/_tabel_agenda.php b/application/views/monpas/pages/partials/_tabel_agenda.php new file mode 100644 index 0000000..f3d2f5a --- /dev/null +++ b/application/views/monpas/pages/partials/_tabel_agenda.php @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
huidige situatie
 		 gewenste situatie
 
1 2 3 4 1 2 3 4
+ + + (Uitgezet.) + (Niet van toepassing.) + +
\ No newline at end of file diff --git a/public/css/images/leeg.png b/public/css/images/leeg.png new file mode 100644 index 0000000..2534ee8 Binary files /dev/null and b/public/css/images/leeg.png differ diff --git a/public/css/images/omgevingBlauw.png b/public/css/images/omgevingBlauw.png new file mode 100644 index 0000000..1c0175f Binary files /dev/null and b/public/css/images/omgevingBlauw.png differ diff --git a/public/css/images/omgevingGrijs.png b/public/css/images/omgevingGrijs.png new file mode 100644 index 0000000..51cd27b Binary files /dev/null and b/public/css/images/omgevingGrijs.png differ diff --git a/public/css/images/omgevingGroen.png b/public/css/images/omgevingGroen.png new file mode 100644 index 0000000..a7c27ce Binary files /dev/null and b/public/css/images/omgevingGroen.png differ diff --git a/public/css/images/omgevingOranje.png b/public/css/images/omgevingOranje.png new file mode 100644 index 0000000..911432f Binary files /dev/null and b/public/css/images/omgevingOranje.png differ diff --git a/public/css/images/omgevingRood.png b/public/css/images/omgevingRood.png new file mode 100644 index 0000000..4646f63 Binary files /dev/null and b/public/css/images/omgevingRood.png differ diff --git a/public/css/images/omgevingZwart.png b/public/css/images/omgevingZwart.png new file mode 100644 index 0000000..3f8a3f9 Binary files /dev/null and b/public/css/images/omgevingZwart.png differ diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index 5861019..f7c37a3 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -210,6 +210,384 @@ button.delete{ cursor: pointer; box-shadow:none; } + + +.school{ + background-image: url('/css/images/school-flag-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; +} + + +.omgevingGrijs{ + background-image: url('/css/images/omgevingGrijs.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; +} + +.omgevingRood{ + background-image: url('/css/images/omgevingRood.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; +} + +.omgevingOranje{ + background-image: url('/css/images/omgevingOranje.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; +} +.omgevingGroen{ + background-image: url('/css/images/omgevingGroen.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; +} +.omgevingBlauw{ + background-image: url('/css/images/omgevingBlauw.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; +} + + +.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; + cursor: pointer; + box-shadow:none; +} + + + +.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{ + background-image: url('/css/images/leeg.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; +} + .mainpagina{ display:none; } @@ -1278,3 +1656,18 @@ z-index: 50; box-shadow: none; } + +.draggable { + display: inline-block; + width: 19%; + height: 50px; + /*padding-left: 10px;*/ + +} +.dragSource{ + opacity : .4; +} +.dragover{ + border-style: dashed; + background-color: #f8f8f8; +} diff --git a/public/images/logos/TDu3YrEcwjmVK1v.png b/public/images/logos/TDu3YrEcwjmVK1v.png new file mode 100644 index 0000000..70c4378 Binary files /dev/null and b/public/images/logos/TDu3YrEcwjmVK1v.png differ diff --git a/public/images/logos/yDa7dR6FkUXCgzK.png b/public/images/logos/yDa7dR6FkUXCgzK.png new file mode 100644 index 0000000..fd185d3 Binary files /dev/null and b/public/images/logos/yDa7dR6FkUXCgzK.png differ diff --git a/public/js/monpas/models/modulebalkmodel.js b/public/js/monpas/models/modulebalkmodel.js index cb266cb..3439c52 100644 --- a/public/js/monpas/models/modulebalkmodel.js +++ b/public/js/monpas/models/modulebalkmodel.js @@ -34,7 +34,6 @@ ls.initModulebalkModel = function(){ selectedSchooljaar : ko.observableArray([]), initBindings :function(){ - var self = ls.ModulebalkModel; if (!ko.dataFor(document.getElementById('modulebalk')) ) { ko.applyBindings(ls.ModulebalkModel, document.getElementById("modulebalk")); @@ -74,6 +73,7 @@ ls.initModulebalkModel = function(){ self.schooljaren.push(new fAddSchooljaar(p)); }); // each $.each(self.schooljaren(), function (j, k) { + if (vandaag >= new Date(k.start + "T00:00:00") && vandaag <= new Date(k.eind + "T00:00:00")) { self.selectedSchooljaar(k); diff --git a/public/js/monpas/models/ontwikkelmodel.js b/public/js/monpas/models/ontwikkelmodel.js index 2ecf3f5..629754f 100644 --- a/public/js/monpas/models/ontwikkelmodel.js +++ b/public/js/monpas/models/ontwikkelmodel.js @@ -87,32 +87,40 @@ ls.initOntwikkelModel = function(){ } ,this) } - function fAddResult(p){ + function fAddResult(p) { var dit = this; - this.ijkpuntid = p.ijkpunt_id; - this.wensid = 0; - - // if (p.gewenstid) { this.wensid = p.gewenstid; } - this.scoretype = p.scoretype; - this.disabled = p.disabled; - this.disablentv = p.disablenvt; - this.huidig = ko.observable( p.huidig); - if(p.disabled == 'T' || p.disablenvt == 'T') this.huidig(5) + this.ijkpuntid = p.ijkpunt_id; + this.wensid = 0; + if (p.gewenstid) { this.wensid = p.gewenstid; } + this.scoretype = p.scoretype; + this.disabled = p.disabled; + this.disablentv = p.disablenvt; + this.huidig = ko.observable(p.huidig); + if (p.disabled == 'T' || p.disablenvt == 'T') this.huidig(5) + this.gewenst = ko.observable(3); + if (p.gewenst) { + this.gewenst(p.gewenst) + } + if (p.disabled == 'T' || p.disablenvt == 'T') this.gewenst(5) - // observable is niet nodig maar dit was eerst een computed - this.gewenst = ko.observable(3); - if (p.gewenst) {this.gewenst(p.gewenst)}; - if(p.disabled == 'T' || p.disablenvt == 'T') this.gewenst(5) - - this.nummer = p.nummer; - this.omschrijving = p.omschrijving; - this.toelichting = p.toelichting; - this.aantalscholen = p.aantalscholen; - + this.nummer = p.nummer; + this.omschrijving = p.omschrijving; + this.toelichting = p.toelichting; + this.aantalscholen = p.aantalscholen; } + function fAddAdvies(a) { + this.nummer = a.nummer; + this.omschrijving = a.omschrijving; + } + + function fIcoon(afbeelding) { + this.afbeelding = ko.observable(afbeelding); + } + + if (ls.OntwikkelModel !== undefined){ ls.OntwikkelModel.initModel(); @@ -127,6 +135,7 @@ ls.initOntwikkelModel = function(){ orgversions : ko.observableArray([]), selectedOrgversion : ko.observable(''), selectedUser : ko.observable(''), + instrument : ko.observable(''), // ijkpunten : ko.observableArray([]), versieid : ko.observable(), // moet waarschijnlijk orgversie id worden!! results : ko.observableArray([]), @@ -137,6 +146,60 @@ ls.initOntwikkelModel = function(){ ingevuld : ko.observable(false), bezig : ko.observable(false), verberg : ko.observable(false), + drag_start_index0 : ko.observable(0), + drag_target_index0 : ko.observable(0), + drag_start_index1 : ko.observable(0), + drag_target_index1 : ko.observable(0), + drag_start_index2 : ko.observable(0), + drag_target_index2 : ko.observable(0), + drag_start_index3 : ko.observable(0), + drag_target_index3 : ko.observable(0), + drag_start_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() { + if(ls.OntwikkelModel) { + return ls.OntwikkelModel.drag_start_index0() >= 0; + } + }), + dragging1 : ko.computed(function() { + if(ls.OntwikkelModel) { + return ls.OntwikkelModel.drag_start_index1() >= 0; + } + }), + dragging2 : ko.computed(function() { + if(ls.OntwikkelModel) { + return ls.OntwikkelModel.drag_start_index2() >= 0; + } + }), + dragging3 : ko.computed(function() { + if(ls.OntwikkelModel) { + return ls.OntwikkelModel.drag_start_index3() >= 0; + } + }), + dragging4 : ko.computed(function() { + if(ls.OntwikkelModel) { + return ls.OntwikkelModel.drag_start_index4() >= 0; + } + }), + basisACC : ko.observableArray([new fIcoon("acceptGrijs"), new fIcoon("acceptRood"), new fIcoon("acceptOranje"), new fIcoon("acceptGroen"), new fIcoon("acceptBlauw")]), + 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(), + + + initBindings :function(){ var self = ls.OntwikkelModel; @@ -147,13 +210,20 @@ ls.initOntwikkelModel = function(){ }, initModel: function() { var self = ls.OntwikkelModel; - $.post("index.php/monpas/rapijkpunten/checkLevel", function(data){ if(data){ if(data === 1) 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') }, @@ -202,7 +272,6 @@ ls.initOntwikkelModel = function(){ self.writeOK(result); if(typeof callback ==='function' && callback()){ callback(); - } },'json'); @@ -212,6 +281,8 @@ ls.initOntwikkelModel = function(){ fToggleGeopend: function(){ this.geopend(!this.geopend()); }, + + fUpdateGewenst: function(num){ var self=ls.OntwikkelModel; if(this.huidig() != 5 ) this.gewenst(num); @@ -261,14 +332,13 @@ ls.initOntwikkelModel = function(){ self.selectedOrgversion("") } - if(self.selectedOrgversion().soort == '4' && self.selectedOrgversion().vorm == '2' && self. usernivo() <= 1){ + if(self.orgsoort()== '4' && self.selectedOrgversion().vorm == '2' && self. usernivo() <= 1){ self.verberg(false); } else{ self.verberg(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.writeOK() && @@ -347,29 +417,179 @@ ls.initOntwikkelModel = function(){ fHaalOrgScoresOp: function(){ var self = ls.OntwikkelModel; self.ingevuld(false); + if(self.geentoegang() && self.orgversie() == self.selectedOrgversion().id ) return; if (self.selectedOrgversion() == undefined) return; + self.orgversie(self.selectedOrgversion().id) + self.geentoegang(true) + var submitData = {orgversieid : self.selectedOrgversion().id, orgid : self.selectedOrg().id } $.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); }) - self.fGetWriteAutorisatie(); + + $.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(self.results(), function(i,p){ + if(p.gewenst() && p.huidig() < p.gewenst()) { + self.adviezen.push( new fAddAdvies(p)); + } + }) } },'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(){ var self = ls.OntwikkelModel; self.results.removeAll(); @@ -389,13 +609,34 @@ 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)); 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(); + $.each(self.results(), function(i,p){ + if(p.gewenst() && p.huidig() < p.gewenst()) { + self.adviezen.push( new fAddAdvies(p)); + } + }) },'json'); } else { @@ -431,31 +672,245 @@ ls.initOntwikkelModel = function(){ var self=ls.OntwikkelModel; var orguserid = 0; - if(self.eigenLijst()){ orguserid = self.selectedUser().orguserid; } var wensarray = []; - $.each(self.results() , function(i,p){ - wensarray[i]={ 'ijkpuntid' : p.ijkpuntid, - 'wensid' : p.wensid, - 'gewenst' : p.gewenst() }; + + if(self.selectedAgenda()==='standaard') { + $.each(self.results(), function (i, p) { + 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) { + 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; + + + } + }) + } + // + // return; - }); var submitData= { 'wensarray' : wensarray, 'orgid' : self.selectedOrg().id, '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 - ls.MsgAutoFade("Gegevens zijn opgeslagen", 600); - };// If wensids - },'json') ; + + 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') }, + + fDragstart: function( event, index, parent){ + var self= ls.OntwikkelModel; + $(event.target).addClass('dragSource') + switch(parent){ + + 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': if(self.results()[1] && self.results()[1].disabled=== 'T') { + apprise("Dit ijkpunt is uitgezet."); + return;} + else self.drag_start_index1(index); + break; + 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': if(self.results()[3] && self.results()[3].disabled=== 'T') { + apprise("Dit ijkpunt is uitgezet."); + return;} + else self.drag_start_index3(index); + break; + case 'OMG': if(self.results()[4] && self.results()[4].disabled=== 'T') { + apprise("Dit ijkpunt is uitgezet."); + return;} + else self.drag_start_index4(index); + break; + } + + return $(event.target).hasClass('draggable'); + }, + + fDragend: function( event, index, parent){ + var self= ls.OntwikkelModel; + switch(parent){ + case 'ACC': self.drag_start_index0(-1); + break; + case 'BTR': self.drag_start_index1(-1); + break; + case 'DIF': self.drag_start_index2(-1); + break; + case 'EXT': self.drag_start_index3(-1); + break; + case 'OMG': self.drag_start_index4(-1); + break; + } + $(event.target).removeClass('dragSource') + return true; + }, + fDragover: function( event){ + event.preventDefault(); + }, + + fDragenter: function( event, index, parent){ + var self= ls.OntwikkelModel; + switch(parent){ + case 'ACC': self.drag_target_index0(index); + break; + case 'BTR': self.drag_target_index1(index); + break; + case 'DIF': self.drag_target_index2(index); + break; + case 'EXT': self.drag_target_index3(index); + break; + case 'OMG': self.drag_target_index4(index); + break; + } + + var element = $(event.target) + if(element.hasClass('draggable')) + element.toggleClass('dragover'); + event.preventDefault(); + }, + + fDragleave: function( event){ + var element = $(event.target) + + if(element.hasClass('draggable')) + element.toggleClass('dragover'); + event.preventDefault(); + }, + + fDrop: function( event, index, parent){ + var self= ls.OntwikkelModel; + + $(event.target).removeClass('dragover'); + 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, parent) { + var self = ls.OntwikkelModel; + + switch(parent){ + case 'ACC': if (to > self.acceptaties().length - 1 || to < 0) return; + var fromObj = self.basisACC()[to]; + var toObj = self.acceptaties()[to]; + 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; + } + + + + + }, + + + fPrintOntwikkelmatrix: function(){ var self = ls.OntwikkelModel; var orgid = self.selectedOrg().id; diff --git a/public/js/monpas/models/versiesmodel.js b/public/js/monpas/models/versiesmodel.js index a26a998..297b040 100644 --- a/public/js/monpas/models/versiesmodel.js +++ b/public/js/monpas/models/versiesmodel.js @@ -112,6 +112,10 @@ $(function(){ fMaakNieuweVersie: function(){ var self = ls.VersiesModel; 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'); }, fUpdateVersie: function(){ @@ -180,6 +184,10 @@ $(function(){ if (i >= 0) { num = self.ijkpunten()[i].nummer(); }; + + 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().naam(''); self.newIJkpunt().toelichting('');