From 8696bc32b663843fcaf9ae0ce5437d32c0d071fd Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Mon, 28 Mar 2022 15:04:56 +0200
Subject: [PATCH] russenopslag

---
 application/views/monpas/mainheader.php       |   2 +
 .../views/monpas/pages/instrumentencp.php     | 248 +-----------------
 public/js/monpas/models/beheermodel.js        |   5 +
 .../js/monpas/models/instrumentencpmodel.js   |  14 +-
 4 files changed, 22 insertions(+), 247 deletions(-)

diff --git a/application/views/monpas/mainheader.php b/application/views/monpas/mainheader.php
index a824c40..7cd3b7d 100644
--- a/application/views/monpas/mainheader.php
+++ b/application/views/monpas/mainheader.php
@@ -70,6 +70,8 @@
             src="<?= base_url() ?>js/monpas/models/swvversiesmodel.js?v=<?= $this->version ?>"></script>
     <script type="text/javascript"
             src="<?= base_url() ?>js/monpas/models/scoresmodel.js?v=<?= $this->version ?>"></script>
+    <script type="text/javascript"
+            src="<?= base_url() ?>js/monpas/models/instrumentencpmodel.js?v=<?= $this->version ?>"></script>
     <script type="text/javascript"
             src="<?= base_url() ?>js/monpas/models/monitormodel.js?v=<?= $this->version ?>"></script>
     <script type="text/javascript"
diff --git a/application/views/monpas/pages/instrumentencp.php b/application/views/monpas/pages/instrumentencp.php
index 78439d8..bbb7b11 100644
--- a/application/views/monpas/pages/instrumentencp.php
+++ b/application/views/monpas/pages/instrumentencp.php
@@ -1,248 +1,16 @@
-<div class="col-sm-12 mainpagina submenupage"  id ="pagVersies">
+<div class="col-sm-12 mainpagina submenupage"  id ="pagInstrumentenCompactSop">
     <div class='row'>
 
         <div class="col-sm-12 col-md-3" style="border:1px solid #f2f2f2">
             <h3>Instrument</h3>
-            <select style="font-size:1em; max-width: 250px;"
-                    data-bind="	options		: modules,
-									optionsText	: 'naam',
-									value		: selectedModule,
-									event		: {change: fChangeModule}">
-            </select>
-            <button data-bind="click: fMaakNieuweVersie" style="margin-left: 0px; margin-top:20px">nieuwe  versie </button>
+<!--            <select style="font-size:1em; max-width: 250px;"-->
+<!--                    data-bind="	options		: modules,-->
+<!--									optionsText	: 'naam',-->
+<!--									value		: selectedModule,-->
+<!--									event		: {change: fChangeModule}">-->
+<!--            </select>-->
+<!--            <button data-bind="click: fMaakNieuweVersie" style="margin-left: 0px; margin-top:20px">nieuwe  versie </button>-->
 
-            <div data-bind= "visible: versies().length > 0">
-                <p> of </p>
-                <p>Selecteer een versie </p>
-                <select data-bind="	options		: versies,
-										optionsText	: 'naam',
-										value		: selectedVersie,
-										event		: {change: fChangeVersie}">
-                </select>
-            </div>
-            <hr />
-            <div data-bind="with: selectedVersie">
-                <h4>Versie-kenmerken</h4>
-                <table>
-                    <tr> <td>naam</td></tr>
-                    <tr>
-                        <td><input data-bind="textInput: naam, event: {input: $parent.fUpdateVersie}" style="width:80%"/>
-                            <button class="delete klikbaar"
-                                    data-bind="click: $parent.fDeleteVersie, visible: deleteok()"></button> </td>
-                    </tr>
-                    <tr> <td>ingangsdatum</td>	</tr>
-                    <tr>
-                        <td> <input class="datum"
-                                    data-bind="datepicker{}, value: ingang, event: {change: $parent.fUpdateVersie}"/>	</td>
-                    </tr>
-                    <tr> <td>streefwaarde</td>	</tr>
-                    <tr>
-                        <td><input class="decimal" data-bind="textInput: systemnorm, event: {input: $parent.fUpdateVersie}"/>%</td>
-                    </tr>
-                </table>
-            </div>
-        </div> <!-- column left -->
-
-        <div class="col-sm-12 col-md-9">
-            <button data-bind="click: fNieuwIJkpunt" style="float:right ; margin-top:10px;margin-bottom: 10px">nieuw ijkpunt </button>
-            <table style="width: 100%">
-                <thead>
-                <tr>
-                    <th  style="width:5%;padding-left:3px">i</th>
-                    <th  style="width:5%"> nr </th>
-                    <th  style="width:25%"> omschrijving</th>
-                    <th style="width: 35%">toelichting</th>
-                    <th  style="width: 4%"> del</th>
-                    <th  style="width: 6%"> disable</th>
-                    <th  style="width: 5%"> add</th>
-                </tr>
-                </thead>
-                <tbody data-bind="foreach: ijkpunten">
-                <tr>
-                    <td 	 style="vertical-align: top">
-                        <button class= " noshow"
-                                data-bind="click: $parent.fToggleIndicatoren, css:{ 'closebutton' : toonindics(), 'openbutton': !toonindics()}"></button>
-                    </td>
-                    <td  style="vertical-align: top">
-                        <input class= 'integer' data-bind="textInput:nummer,
-								                                   event:{input:$parent.fUpdateIJkpunt},
-								                                   style: {color: disabled()? '#d9d9d9' : '#262626' }"/>
-                    </td>
-                    <td><textarea style="width:99%" data-bind="textInput: omschrijving,
-							                                           event:{input: $parent.fUpdateIJkpunt},
-                                                                       style: {color: disabled()? '#d9d9d9' : '#262626' }" ></textarea>
-                    </td>
-                    <td><textarea style="width:99%" data-bind="textInput:toelichting,
-							                                           event:{input: $parent.fUpdateIJkpunt},
-                                                                       style: {color: disabled()? '#d9d9d9' : '#262626' }" ></textarea>
-                    </td>
-                    <td  style="vertical-align: top">
-                        <button class="delete noshow" data-bind="click: $parent.fDeleteIJkpunt, visible: indicatoren().length == 0"></button>
-                    </td>
-                    <td style="vertical-align: top" data-bind="click: $parent.fDisableIJkpunt">
-                        <button class="fa fa-ban noshow" data-bind="style: {color: disabled() ? 'red' : 'black' }"></button>
-                    </td>
-                    <td  style="vertical-align: top"  data-bind="click: $parent.fNieuweIndicator ">
-                        <button class=" noshow  fa fa-plus " data-bind=" style: {color: disabled()? '#d9d9d9' : '#262626' }" ></button>
-                    </td>
-                </tr>
-                <tr data-bind="visible: toonindics() && indicatoren().length > 0">
-                    <td></td>
-                    <td colspan=5>
-                        <table style="width: 100%">
-                            <thead>
-                            <tr>
-                                <th class="header2" style="width4%;padding-left: 2px;text-align:center"> nr </th>
-                                <!--											<th class="header2" style="width:7%;padding-left: 2px;text-align:center">insp.</th>-->
-                                <th class="header2" style="width:6%;padding-left: 2px;text-align:center">w.</th>
-                                <th class="header2" style="width:40%;padding-left: 2px"> schoolvorm</th>
-                                <th class="header2" style="width:40%;padding-left: 2px"> ik-vorm</th>
-                                <th class="header2" style="width: 3%;padding-left: 2px;text-align:center"> del</th>
-                            </tr>
-                            </thead>
-                            <tbody data-bind="foreach: indicatoren">
-                            <tr>
-                                <td style="vertical-align: top">
-                                    <input class= 'integer'
-                                           style="width: 100%"
-                                           data-bind="textInput: nummer,
-														           event:{input: $root.fUpdateIndicator},
-                                                                   style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" /></td>
-                                <!--											<td style="vertical-align: top">-->
-                                <!--												 <input  style="width: 100%"-->
-                                <!--														data-bind="textInput: inspectie, event:{input: $root.fUpdateIndicator}" /></td>-->
-                                <td style="vertical-align: top">
-                                    <input class= 'decimal'
-                                           style="width: 100%"
-                                           data-bind="textInput : gewicht,
-														           event     :{input: $root.fUpdateIndicator},
-                                                                   style     : {color: $parent.disabled()? '#d9d9d9' : '#262626' }" /></td>
-                                <td><textarea data-bind="textInput: omschrijving1,
-											                         event    : {input: $root.fUpdateIndicator},
-                                                                     style    : {color: $parent.disabled()? '#d9d9d9' : '#262626' }"
-                                              style="width:99%">
-												</textarea>
-                                </td>
-                                <td><textarea 	data-bind="textInput : omschrijving2,
-											                           event     :{input: $root.fUpdateIndicator},
-                                                                       style     : {color: $parent.disabled()? '#d9d9d9' : '#262626' }"
-                                                 style="width: 99% ">
-												  </textarea>
-                                </td>
-                                <td style="vertical-align: top">
-                                    <button class="delete" data-bind="click: $root.fDeleteIndicator.bind($data,$parents[0]),  visible: deleteok== true "></button></td>
-                            </tr>
-                            </tbody>
-                            <tr>
-                                <td colspan=6> <hr></td>
-                            </tr>
-                        </table>
-                    </td> <!-- td voor de tabel met indicatoren -->
-
-                </tr>
-                </tbody>
-            </table>
-        </div> <!-- column right -->
-
-    </div><!-- row -->
-    <!-- ********************  popups ************************** -->
-    <div class="modal fade" id="modNieuweVersie" role="dialog" >
-        <div class="modal-dialog ">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 data-bind="with: selectedModule()">Nieuwe versie <span data-bind="text: naam"></span></h4>
-                </div>
-                <div class="modal-body">
-                    <table class="lstable" style="width: 100%" >
-                        <tbody>
-                        <tr>
-                            <td style="width:20%"> naam </td>
-                            <td > <input style="width: 100%" data-bind="textInput: newVersieNaam"></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div class="modal-footer">
-                    <button style="width: 80px;" data-dismiss="modal"  data-bind="click: fSaveVersie, visible: newVersieNaam().length > 3">opslaan</button>
-                    <button style="width: 80px;" data-dismiss="modal" >annuleren</button>
-                </div>
-            </div>
-        </div>
-    </div>	<!-- popup-->
-
-    <!-- ********************  popup nieuw ijkpunt ************************** -->
-    <div class="modal fade" id="modNieuwIJkpunt" role="dialog" >
-        <div class="modal-dialog ">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4>Nieuw ijkpunt</h4>
-                </div>
-                <div class="modal-body">
-                    <table class="lstable" style="width: 100%" >
-                        <tbody>
-                        <tr>
-                            <td style="width:20%"> nummer</td>
-                            <td > <input class="integer" data-bind="textInput: newIJkpunt().nummer"></td>
-                        </tr>
-                        <tr>
-                            <td style="width:20%"> omschrijving </td>
-                            <td > <textarea style="width: 99%; height:50px;" data-bind="textInput: newIJkpunt().naam"></textarea></td>
-                        </tr>
-                        <tr>
-                            <td style="width:20%"> toelichting </td>
-                            <td > <textarea style="width: 99%; height:50px;" data-bind="textInput: newIJkpunt().toelichting"></textarea></td>
-                        </tr>
-                        </tbody>
-                    </table>
-
-                </div>
-                <div class="modal-footer">
-                    <button style="width: 80px;" data-dismiss="modal"  data-bind="click: fSaveIJkpunt, visible: newIJkpunt().naam().length > 3">opslaan</button>
-                    <button style="width: 80px;" data-dismiss="modal" >annuleren</button>
-                </div>
-            </div>
         </div>
     </div>
-
-    <!-- ************   pop nieuw indicator  -->
-    <div class="modal fade" id="modNieuwIndicator" role="dialog" >
-        <div class="modal-dialog modal-lg ">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4>Nieuwe indicator</h4>
-                </div>
-                <div class="modal-body">
-                    <table class="lstable" style="width: 100%" >
-                        <tbody data-bind="with: newIndicator">
-                        <tr >
-                            <td style="width:20%"> volgnummer </td>
-                            <td >  <input class="integer" data-bind="textInput: nummer" /></td>
-                        </tr>
-                        <tr >
-                            <td style="width:20%"> gewicht</td>
-                            <td >  <input class="decimal" data-bind="textInput: gewicht" /></td>
-                        </tr>
-                        <!--							<tr >-->
-                        <!--								<td style="width:20%">inspectie indicator (nummer)</td>-->
-                        <!--								<td >  <input data-bind="textInput: inspectie" /></td>-->
-                        <!--							</tr>-->
-                        <tr>
-                            <td style="width:20%">school omschrijving </td>
-                            <td > <textarea style="width: 100%"  data-bind="textInput: omschrijving1"></textarea></td>
-                        </tr>
-                        <tr>
-                            <td style="width:20%">ik-vorm omschrijving </td>
-                            <td > <textarea style="width: 100%"  data-bind="textInput: omschrijving2"></textarea></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div class="modal-footer">
-                    <button style="width: 80px;" data-dismiss="modal"  data-bind="click: fSaveIndicator">opslaan</button>
-                    <button style="width: 80px;" data-dismiss="modal" >annuleren</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
 </div>
\ No newline at end of file
diff --git a/public/js/monpas/models/beheermodel.js b/public/js/monpas/models/beheermodel.js
index 32c1807..602be1d 100644
--- a/public/js/monpas/models/beheermodel.js
+++ b/public/js/monpas/models/beheermodel.js
@@ -62,6 +62,11 @@ ls.initBeheerModel = function(){
 							mh.initScoresModel();
 							$("#pagScores").hide().show("slide", {direction:"right"} ,200)
 							break;
+					case "instrumentencp":
+						console.log('bij het goede tabblad')
+						mh.initInstrumentenCPModel();
+						$("#pagInstrumentenCompactSop").hide().show("slide", {direction:"right"} ,200)
+						break;
 				}; // switch					
 			},
 		} ; // definition van model
diff --git a/public/js/monpas/models/instrumentencpmodel.js b/public/js/monpas/models/instrumentencpmodel.js
index 3f0792e..912d51f 100644
--- a/public/js/monpas/models/instrumentencpmodel.js
+++ b/public/js/monpas/models/instrumentencpmodel.js
@@ -12,15 +12,15 @@ $(function(){
 			mh.InstrumentenCPModel.initModel();
 		}
 		else {
-			ls.InstrumentenCPModel = {
+			mh.InstrumentenCPModel = {
 				modules		: ko.observableArray([]),
 				selectedModule : ko.observable(''),
 
 				initBindings :function(){
-					var self = ls.VersiesModel;
+					var self = mh.InstrumentenCPModel;
 
 					if (!ko.dataFor(document.getElementById('pagInstrumentenCompactSop')) ) {
-						ko.applyBindings(ls.VersiesModel, document.getElementById("pagInstrumentenCompactSop"));
+						ko.applyBindings(mh.InstrumentenCPModel, document.getElementById("pagInstrumentenCompactSop"));
 					}
 
 					$.post("index.php/monpas/beheer/getmodules", function(result){
@@ -31,7 +31,7 @@ $(function(){
 								self.modules.push(new fAddModule(p));
 							});
 							self.selectedModule(self.modules[0]);
-						}; // if rsult
+						} // if rsult
 						self.initModel();
 					},'json');
 				},
@@ -40,7 +40,7 @@ $(function(){
 				},
 
 			} ; // definition van model
-			mh.initInstrumentenCPModel().initBindings();
-		}; // else
-	}// function initVersiesModel
+			mh.InstrumentenCPModel().initBindings();
+		} // else
+	}// function initInstrumentenCPModel
 });
\ No newline at end of file