From 90faa2ec4fb8740e7259ba3836421b1d8250b594 Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Thu, 9 Sep 2021 19:48:20 +0200
Subject: [PATCH] tonen swvoverzicht sop

---
 .../monpas/compactsop/overzicht/_swv.php      |  4 +-
 .../views/monpas/pages/sopoverzicht.php       | 53 ++++++-------------
 public/js/monpas/models/menumodel.js          |  9 ++--
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/application/views/monpas/compactsop/overzicht/_swv.php b/application/views/monpas/compactsop/overzicht/_swv.php
index 6077143..2a35d66 100644
--- a/application/views/monpas/compactsop/overzicht/_swv.php
+++ b/application/views/monpas/compactsop/overzicht/_swv.php
@@ -18,14 +18,12 @@
         <th style="padding: 5px; color: white; background-color: #a07b8e; ">SWOP</th>
         <th style="padding: 5px; color: white; background-color: #a07b8e;" data-bind="text: naam">
         </th>
-
-
     </tr>
     </thead>
 
 
     <tbody >
-    <!-- ko forach: kamers -->
+    <!-- ko foreach: kamers -->
     <tr style="border-bottom: 1px solid #A28A29;">
         <td style="background-color: #ded0d7">
             <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
diff --git a/application/views/monpas/pages/sopoverzicht.php b/application/views/monpas/pages/sopoverzicht.php
index 27ee751..304e191 100644
--- a/application/views/monpas/pages/sopoverzicht.php
+++ b/application/views/monpas/pages/sopoverzicht.php
@@ -3,7 +3,9 @@
         <div class="col-xs-3"></div>
 
         <div class="col-xs-6 " >
-            <h3>Compacte Ontwikkelingsplannen</h3>
+
+            <h3 data-bind="text: orgsoort() == 4 ? 'Compact Ondersteuningsprofiel' : 'Compacte Ondersteuningsprofielen' ">
+            </h3>
 
             <p>Selecteer een schooljaar:</p>
             <select data-bind="     options: schooljaren,
@@ -12,49 +14,24 @@
                                     event: {change: fChangeSchooljaar}">
             </select>
 
-<!--            <div class="col-sm-5" >-->
-
-<!--                <p style="margin-top: 8px;">Ordening</p>-->
-<!--if orgsoort = 1 of 2-->
-<!--                    <p>-->
-<!--                        <i class="fa fa-check-square"-->
-<!--                           style="color: #A28A29;"-->
-<!--                           data-bind="click: $root.fToggleOrdening"></i>-->
-<!--                        <span data-bind="click: $root.fToggleOrdening">per bestuur-->
-<!--                        </span>-->
-<!--                    </p>-->
-<!--                    <p>-->
-<!--                        <i class="fa fa-square"-->
-<!--                           style="color: #A28A29;"-->
-<!--                           data-bind="click: $root.fToggleOrdening"-->
-<!--                        ></i>-->
-<!--                        <span data-bind="click: $root.fToggleOrdening">alfabetisch-->
-<!--                        </span>-->
-<!--                    </p>-->
-<!---->
-<!--            </div>-->
-
-
-            <div class="row" data-bind="visible: orgsoort()== 4 ">
-                <?php $this->load->view("monpas/compactsop/overzicht/_school"); ?>
-            </div>
+            <!-- ko if: orgsoort() == 4 -->
+            <?php $this->load->view("monpas/compactsop/overzicht/_school"); ?>
+            <!--/ko -->
 
             <!-- ko if: orgsoort() == 3 -->
-            <div class="row"  ">
-                <?php $this->load->view("monpas/compactsop/overzicht/_bestuur"); ?>
-            </div>
-           <!--/ko -->
-            <div class="row"  data-bind="visible: orgsoort()== 2 ">
-                <?php $this->load->view("monpas/compactsop/overzicht/_regio"); ?>
-            </div>
-            <div class="row"  data-bind="visible: orgsoort()== 1 ">
-                <?php $this->load->view("monpas/compactsop/overzicht/_swv"); ?>
-            </div>
+            <?php $this->load->view("monpas/compactsop/overzicht/_bestuur"); ?>
+            <!--/ko -->
 
+            <!-- ko if: orgsoort() == 2 -->
+            <?php $this->load->view("monpas/compactsop/overzicht/_regio"); ?>
+            <!--/ko -->
+            <!-- ko if: orgsoort() == 1 -->
+            <?php $this->load->view("monpas/compactsop/overzicht/_swv"); ?>
+            <!--/ko -->
 
         </div>
 
 
-    </div>
 </div>
 
+
diff --git a/public/js/monpas/models/menumodel.js b/public/js/monpas/models/menumodel.js
index fff3652..8c619ab 100644
--- a/public/js/monpas/models/menumodel.js
+++ b/public/js/monpas/models/menumodel.js
@@ -94,16 +94,20 @@ ls.initMenuModel = function(){
 				var self = ls.MenuModel;
 				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));
 						}); // foreach
 						if (self.menuitems()[0]){
 							self.menuitems()[0].gekozen(true);
 						}
 						self.user(data.user);
-						self.organisatie(data.organisatie);
+
 						self.module(data.module);
 						if(self.module() == 90 || self.module() == 610 ) self.logo("logokokoklein.png")
 					};
@@ -250,9 +254,8 @@ ls.initMenuModel = function(){
                $.each(self.menuitems(), function (i, m){
                		m.gekozen(false);
 					$.each(m.subpaginas(), function (x, s){
-
 						s.subgekozen(false);
-						if(that.id === s.id){
+						if(that.id === s.id  ){
 							s.subgekozen(true);
 							m.gekozen(true);