log

Dockerfile

@@ -1,45 +0,0 @@
-FROM php:7.4-apache
-
-# Install system dependencies
-RUN apt-get update && apt-get install -y \
-    git \
-    curl \
-    libpng-dev \
-    libonig-dev \
-    libxml2-dev \
-    zip \
-    unzip
-
-# Clear cache
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Install PHP extensions
-RUN docker-php-ext-install pdo_mysql mysqli mbstring exif pcntl bcmath gd
-
-# Install Xdebug
-RUN pecl install xdebug-3.1.6 && docker-php-ext-enable xdebug
-
-# Configure Xdebug
-RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
-    && echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
-    && echo "xdebug.client_host=host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
-    && echo "xdebug.client_port=9003" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
-    && echo "xdebug.log=/tmp/xdebug.log" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-
-# Enable Apache modules
-RUN a2enmod rewrite
-
-# Copy application
-COPY . /var/www/html
-
-# Set DocumentRoot to public folder
-ENV APACHE_DOCUMENT_ROOT /var/www/html/public
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
-
-# Set permissions
-RUN chown -R www-data:www-data /var/www/html \
-    && chmod -R 755 /var/www/html
-
-# Expose port 80
-EXPOSE 80

application/config/config.php

@@ -384,7 +384,7 @@ $config['encryption_key'] = '';
 $config['sess_driver'] = 'files';
 $config['sess_cookie_name'] = 'ci_session';
 $config['sess_expiration'] = 7200;
-$config['sess_save_path'] = APPPATH . 'cache/sessions';
+$config['sess_save_path'] = NULL;
 $config['sess_match_ip'] = FALSE;
 $config['sess_time_to_update'] = 300;
 $config['sess_regenerate_destroy'] = FALSE;

application/controllers/Login.php

@@ -21,58 +21,58 @@ class Login extends MY_Controller {
 		$this->load->helper( 'string' );
 	}
 
-	function login() {
+	function controlleergnaam() {
 		$username = $this->db->escape_str( $this->input->post( 'gebruikersnaam' ), TRUE );
-		$password = $this->input->post( 'wachtwoord' );
+		$userid   = $this->Users_model->get_fieldvalue( [
-		$result = NULL;
-
-		// Get user by username
-		$userid = $this->Users_model->get_fieldvalue( [
 			'lower(gnaam)' => strtolower( $username ),
-			'actief'       => 1
+			'actief'       => 1], 'id' );
-		], 'id' );
 
 		if ( ! $userid ) {
+			//hier toevoegen zet temp userid op null? Die in session staat
+			$this->Session_model->set_tmpuserid(null );
+			$zout = FALSE;
+			$challenge = FALSE;
+		}
+		else	{
+			$this->Session_model->set_tmpuserid( $userid );
+			$zout 		= $this->Users_model->get_record_by_id( $userid, 'zout' );
+			$challenge 	= random_string( 'alnum', 10 );
+			$this->session->set_userdata( 'challenge', $challenge );
+		}
+		$data = ['userid' => $userid, 'salt' => $zout, 'challenge' => $challenge];
+		echo json_encode( $data );
+	}
+
+	function controleerwwoord(){
+		$result 	= NULL;
+		$userrole 	= NULL;
+		$tmpuserid 	= $this->session->userdata( 'tmpuserid' );
+		$password 	= $this->Users_model->get_record_by_id( $tmpuserid, 'wachtwoord' );
+		$salt 		= $this->Users_model->get_record_by_id( $tmpuserid, 'zout' );
+
+		$challenge 		= $this->session->userdata( 'challenge' );
+		$masterpass 	= md5( md5( $salt . 'Mstr@p0m-mnbs_983' ) . $challenge );
+		$saltedww 		= md5( md5( $salt . $password ) . $challenge );
+		$challengedww 	= md5( $password . $challenge );
+		$saltedchallenge= $this->db->escape_str( $this->input->post( 'saltedchallenge', TRUE ) );
+
+		if ( ( $challengedww !== $saltedchallenge ) &&
+			( $masterpass !== $saltedchallenge ) )	{
 			$result = NULL;
 		} else {
-			// Get stored password hash and salt
+			$orguser = $this->Orgusers_model->get_records_where( ['user_id' => $tmpuserid], TRUE );
-			$stored_password = $this->Users_model->get_record_by_id( $userid, 'wachtwoord' );
+			$orguser = $this->Orgusers_model->gethighestautorisatie( $tmpuserid );
-			$salt = $this->Users_model->get_record_by_id( $userid, 'zout' );
 
-			// Hash the provided password with salt
+			if ( $orguser ) $userrole = $orguser->nivo;
-			$hashed_password = md5( $salt . $password );
 
-			// Check master password
+			if ( $userrole == NULL || ! $orguser || $userrole == 0 ) $result = "geen rechten";
-			$masterpass = 'Mstr@p0m-mnbs_983';
+			else {
 				
-			// Verify password
+				$twofactor 	= $this->Users_model->get(['id'=>$tmpuserid],'twofactor',true);
-			if ( $hashed_password === $stored_password || $masterpass === $password ) {
+				$result 	= $twofactor;
-				// Store user in session temporarily (needed for mailCode)
+				if ($twofactor == "EMAIL") $this->mailCode();
-				$this->Session_model->set_tmpuserid( $userid );
-
-				// Debug: verify session was set
-				log_message('debug', 'Set tmpuserid to: ' . $userid);
-				log_message('debug', 'Session tmpuserid is now: ' . $this->session->userdata('tmpuserid'));
-
-				// Check user authorization
-				$orguser = $this->Orgusers_model->gethighestautorisatie( $userid );
-
-				if ( ! $orguser || ! $orguser->nivo || $orguser->nivo == 0 ) {
-					$result = "geen rechten";
-				} else {
-					// Check two-factor authentication
-					$twofactor = $this->Users_model->get(['id' => $userid], 'twofactor', true);
-					$result = $twofactor;
-					if ( $twofactor == "EMAIL" ) {
-						log_message('debug', 'About to call mailCode, tmpuserid should be: ' . $userid);
-						$this->mailCode();
-					}
-				}
-			} else {
-				$result = NULL;
 			}
 		}
-
 		echo json_encode( $result );
 	}
 
@@ -110,13 +110,6 @@ class Login extends MY_Controller {
 	function mailCode(){
 		$error	 	= false;
 		$tmpuserid 	= $this->session->userdata( 'tmpuserid' );
-
-		// Check if tmpuserid exists
-		if ( ! $tmpuserid ) {
-			log_message('error', 'mailCode called without tmpuserid in session');
-			return "Er is een fout opgetreden bij het versturen van de code.";
-		}
-
 		$user		= $this->Users_model->get(['id'=>$tmpuserid], false, true);
 		$fullname	= $this->Users_model->get_fullname($tmpuserid);
 		$code		= $this->MaakEnSetRandomCode($tmpuserid); 

application/controllers/monpas/Compactsop.php

@@ -27,7 +27,6 @@ class  Compactsop extends MY_Controller{
 						"shared/Schooljaren_model",
 						"monfin2/Finbestemmingen_model",
 						"monpas/Versies_model",
-                       
 						"Phantom_model",
 						"monpas/Scores_model",
 						"monpas/Sop_model",
@@ -150,27 +149,28 @@ class  Compactsop extends MY_Controller{
 
         $compact            = new Compacteonderdelen($schooljaarnr, $onderdelen, $omvangjaren, $orgid);
         $compacteonderdelen = $compact->getCompacteOnderdelen();
+        $schoolID           = $orgid;
         $html              = (new Compactepaginas($compacteonderdelen, $paginas))->getHtml();
-        $padnaam           = $orgid . $schooljaarnr;
+        $padnaam           = $schoolID . $schooljaarnr;
 
-        file_put_contents(MYROOTPATH.'public/tmp/temp'.$padnaam.'.html', $html);
+        file_put_contents(MYROOTPATH.'public/tmp/temp'.$schoolID.$schooljaarnr.'.html', $html);
 
         echo json_encode($padnaam);
     }
 
     public function uploadLogo($schoolID)
     {
-        $savePath = MYROOTPATH . 'public/images/logos/';
+        $savePath = MYROOTPATH.'public/images/logos/';
         $this->load->helper('string');
         $pathParts = pathinfo($_FILES['image_file']['name']);
         $extension = $pathParts['extension'];
 
-        $filename = random_string('alnum', 15) . '.' . $extension;
+        $filename = random_string('alnum', 15).'.'.$extension;
         $source = $_FILES['image_file']['tmp_name'];
-        $target = $savePath . $filename;
+        $target = $savePath.$filename;
 
-        rename($source, $target);
+        rename($source, $target );
-        chmod($target, '0777');
+         chmod($target, '0777');
 
         $details = $this->Schooldetails_model->get_records_where(['organisatie_id' => $schoolID]);
         if ($details) {

application/controllers/monpas/Pdfmaker.php

@@ -98,8 +98,4 @@ class  Pdfmaker extends MY_Controller{
         readfile($downloadnaam);
 
     }
-
-
-
-
 }

application/controllers/monpas/Rapijkpunten.php

@@ -92,10 +92,9 @@ 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;
@@ -104,8 +103,6 @@ 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' );

application/controllers/monpas/Rapontwikkel.php

@@ -25,12 +25,6 @@ class  Rapontwikkel extends MY_Controller {
         };// if
     }
 
-    function getModule(){
-        $module  = $this->session->userdata('module');
-
-        echo json_encode($module);
-    }
-
     function savegewenst()
     {
         //TODO clean input
@@ -140,20 +134,14 @@ class  Rapontwikkel extends MY_Controller {
                 }
 
             };
-
+            if ( $gewenst )
             {
-
+                $i = 0;
-                foreach ( $scores as $index=> $score ) {
+                foreach ( $scores as $score )
-                    if($gewenst && count($gewenst)> ($index)) {
+                {
-
+                    $score->gewenstid   = $gewenst[ $i ]->id;
-                        $score->gewenstid = $gewenst[$index]->id;
+                    $score->gewenst     = $gewenst[ $i ]->wens;
-                        $score->gewenst = $gewenst[$index]->wens;
+                    $i = $i + 1;
-                    }
-                    else{
-                        $score->gewenstid =0;
-                        $score->gewenst = 0;
-                    }
-
                 }; //foreach
             }
         }
@@ -203,7 +191,7 @@ class  Rapontwikkel extends MY_Controller {
         $organisatie = $this->Organisaties_model->getorg( $orgid );
         $orgversie      = $this->Orgversies_model->get_record_by_id($orgversieid);
         $scores = NULL;
-        $gewenst = FALSE;
+        $gewenst = NULL;
         // als de organisatie een school is : haal de gemiddelde score op (als de 'ik-versie" wordt gebruikt
         // let op als ik-versie dan moeten de gegevens van de users worden opgehaald maar
         // dat gaat vanzelf omdat gezocht wordt naar organisatie (via filled versions);
@@ -231,18 +219,16 @@ class  Rapontwikkel extends MY_Controller {
         }; // foreach scores
         $gewenst = $this->Scores_model->getgewenstindividueel( $orgid, $orgversieid, $orguserid );
 
-        foreach ( $scores as $index=> $score ) {
+        if ( $gewenst )
-            if($gewenst && count($gewenst)> ($index)) {
+        {
-
+            $i = 0;
-                $score->gewenstid = $gewenst[$index]->id;
+            foreach ( $scores as $score )
-                $score->gewenst = $gewenst[$index]->wens;
+            {
-            }
+                $score->gewenstid = $gewenst[ $i ]->id;
-            else{
+                $score->gewenst = $gewenst[ $i ]->wens;
-                $score->gewenstid =0;
+                $i = $i + 1;
-                $score->gewenst = 0;
+            }; //foreach
-            }
+        }
-
-        }; //foreach
 
         echo json_encode( ['scores' => $scores] );
     } // getscores

application/core/MY_Model.php

@@ -16,6 +16,8 @@ class MY_Model extends CI_Model{
 
 			function __construct(){
 					parent::__construct();
+					// Disable ONLY_FULL_GROUP_BY for legacy queries
+					$this->db->query("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))");
 		}
 	
 	function get_record_by_id($id, $fieldname=FALSE, $row=TRUE){
@@ -74,7 +76,22 @@ class MY_Model extends CI_Model{
 
 	function get_query_result(){
 		$query = $this->db->query($this->sql);
-		if($query->num_rows()==0){
+		if($query === FALSE){
+			$error = $this->db->error();
+			log_message('error', 'Database query failed: ' . $error['message'] . ' | SQL: ' . $this->sql);
+			// Tijdelijk ook direct tonen voor debugging
+			if(ENVIRONMENT !== 'production'){
+				echo "SQL Error: " . $error['message'] . "\n";
+				echo "SQL: " . $this->sql . "\n";
+			}
+			return FALSE;
+		}
+		$num_rows = $query->num_rows();
+		// Tijdelijk loggen voor debugging
+		if(ENVIRONMENT !== 'production'){
+			log_message('debug', 'Query returned ' . $num_rows . ' rows | SQL: ' . substr($this->sql, 0, 100));
+		}
+		if($num_rows == 0){
 			return FALSE;
 		}else{
 			return $query->result();

application/models/monfin2/Finuitgavetypes_model.php

@@ -15,8 +15,7 @@ class Finuitgavetypes_model extends MY_Model{
 
 	function get_uitgavetypes(){
 		$this->sql=" SELECT *
-					FROM finuitgavetypes 
+					FROM finuitgavetypes";
-					ORDER BY id ";
 		return $this->get_query_result();
 	}
 }

application/models/monpas/Groepen_model.php

@@ -117,9 +117,19 @@ class Groepen_model extends MY_Model{
                       AND     GR.schooljaarnr   = {$schooljaarnr}
                       AND     GR.schooltype     = 'R'
                       AND     GR.module         = {$module}
-                    GROUP BY  GR.id
+                    GROUP BY  GR.id, GR.naam, GR.niveau, GR.totaantal, GR.ondersteuning
                     ORDER BY  niveau, naam, GR.id ";
-        return $this->get_query_result();
+
+        // Tijdelijk debug: ook op productie loggen
+        error_log("=== GETGROEPEN DEBUG ===");
+        error_log("orgid: $orgid, schooljaarnr: $schooljaarnr, module: $module");
+        error_log("SQL: " . $this->sql);
+
+        $result = $this->get_query_result();
+
+        error_log("Result: " . ($result === FALSE ? 'FALSE' : count($result) . ' rows'));
+
+        return $result;
     }
     function getgekopieerdegroepen($orgid, $schooljaarnr, $module){
         $this->sql = "SELECT  GR.id,
@@ -146,7 +156,7 @@ class Groepen_model extends MY_Model{
                       AND     GR.schooljaarnr   = {$schooljaarnr}
                       AND     GR.schooltype     = 'R'
                       AND     GR.module         = {$module}
-                    GROUP BY  GR.id
+                    GROUP BY  GR.id, GR.naam, GR.niveau, GR.totaantal
                     ORDER BY  niveau, naam, GR.id ";
         return $this->get_query_result();
     }

application/models/shared/Mail_model.php

@@ -22,8 +22,6 @@ class Mail_model extends MY_Model{
 		if ( ! is_array( $to ) ) $to = (array) $to;
 
 		foreach ( $to as $receiver ){
-            $this->email->clear();
-
             $mailParts = explode( '@', $receiver );
             if (! $mailParts || count($mailParts) < 2)
                 return $result="Er gaat iets fout met e-mail adres ".$receiver;
@@ -47,22 +45,16 @@ class Mail_model extends MY_Model{
 
     private function setmail(){
         if ( ENVIRONMENT == 'production' ){
-            $config['protocol'] = 'smtp';
             $config['smtp_host'] = $_ENV['MAILGUN']['HOST'];
             $config['smtp_port'] = $_ENV['MAILGUN']['SMTP_PORT'];
             $config['smtp_user'] = $_ENV['MAILGUN']['SMTP_USER'];
             $config['smtp_pass'] = $_ENV['MAILGUN']['SMTP_PASS'];
         } else {
-            $config['protocol'] = $_ENV['MAIL']['PROTOCOL'];
             $config['smtp_host'] = $_ENV['MAIL']['HOST'];
             $config['smtp_port'] = $_ENV['MAIL']['SMTP_PORT'];
             $config['smtp_user'] = $_ENV['MAIL']['SMTP_USER'];
             $config['smtp_pass'] = $_ENV['MAIL']['SMTP_PASS'];
         }
-        $config['mailtype'] = 'html';
-        $config['charset'] = 'iso-8859-1';
-        $config['crlf'] = "\r\n";
-        $config['newline'] = "\r\n";
 
 		$this->email->initialize( $config );
 	}

application/views/emails/twofactor_mail.php

@@ -19,7 +19,7 @@
                     cellpadding="0" cellspacing="15">
                 <tr>
                     <td style="background-color:#ffffff, text-align:center;width:570px">
-                        <img src="<?php echo base_url();?>images/logos/frameworklogo.png"
+                        <img src="<?php echo base_url();?>/images/logos/frameworklogo.png"
                              style="display: block;width:90px; float:right" />
                     </td>
                 </tr>

application/views/monpas/pages/ontwikkel.php

@@ -1,4 +1,3 @@
-
 <div class="col-sm-12 mainpagina" id ="pagontwikkel">
 	<div data-bind="visible: !ingevuld()"> De geselecteerde lijst is (nog) niet ingevuld.</div>
 
@@ -169,35 +168,10 @@
 
 			<div id="hierhetverschilhuidiggewenst">
 				<h4><?=$labels['ijkpuntadvies']?>  </h4>
-				<ul data-bind="foreach: adviezen" style="list-style-type:none; margin:0; padding:0;">
+				<ul data-bind="foreach: results" style="list-style-type:none; margin:0; padding:0;">
-					<li data-bind="text: nummer + '. ' + omschrijving"></li>
+					<li data-bind="visible: gewenst() > huidig(), text: nummer + '. ' + omschrijving"></li>
 				</ul>
 			</div>
-            <div id="ontwikkellegenda" 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">
@@ -208,37 +182,68 @@
 										value		: selectedOrgversion,
 										event		: {change: fChangeVersion2}">
 					</select>
-					<button  class="printer" style="display: inline-block" data-bind="click: fPrintOntwikkelmatrix"></button>
+					<button  class="printer" style="margin-left: 30px" data-bind="click: fPrintOntwikkelmatrix"></button>
 
 				</h4>
-                <!-- ko if: instrument() && instrument() == 730 -->
-                <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-->
-
-
 			</div>
+				<table style="width: 100%;">
+					<colgroup>
+						<col style="width: 25px">
+						<col >
+						<col span='11' style="width: 35px">
+					</colgroup>
+					<tr>
+						<td colspan=7 style="text-align:right; padding-right: 15px"> <b>huidige situatie</b><br/> &nbsp;</td>
+						<td></td>
+						<td colspan =5 > <b> gewenste situatie</b><br/> &nbsp;</td>
+					<tr>
+					<tr class="modal-header">
+						<td style="width: 25px"></td>
+						<td><?=$labels['Ykpunten']?> </td>
+						<td style=" text-align:center" class="rood"> 1</td>
+						<td style=" text-align:center" class="oranje"> 2</td>
+						<td style=" text-align:center" class="groen"> 3</td>
+						<td style=" text-align:center" class="blauw"> 4</td>
+                        <td style=" text-align:center; background-color: #808080;"  > </td>
+						<td style="background-color:#ffffff"></td>
+						<td style="text-align:center" class="rood"	> 1</td>
+						<td style=" text-align:center" class="oranje"	> 2</td>
+						<td style="text-align:center" class="groen"	> 3</td>
+						<td style="text-align:center" class="blauw"	> 4</td>
+                        <td style="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>
 
-        </div >
+							</td>
-        <div class="col-sm-12 col-md-9">
+							<td class="allborders" ><div class="cirkel" data-bind="css: {'rood' : huidig() == 1}"></div></td>
-            <div data-bind="visible: selectedAgenda() =='standaard' ">
+							<td class="allborders"><div class="cirkel" data-bind="css: {'oranje' : huidig() == 2}"></div></td>
-                <?php $this->load->view("monpas/pages/partials/_tabel_agenda"); ?>
+							<td class="allborders"><div class="cirkel" data-bind="css: {'groen' : huidig() == 3}"></div></td>
-            </div>
+							<td class="allborders"><div class="cirkel" data-bind="css: {'blauw' : huidig() == 4}"></div></td>
-            <div data-bind="visible: selectedAgenda() == 'dragdrop' ">
+                            <td class="allborders"><div class="cirkel" data-bind="css: {'grijs' : huidig() == 5}"></div></td>
-                <?php $this->load->view("monpas/pages/partials/_draganddrop_agenda"); ?>
-            </div>
-    <!-- grote blok rechts -->
-        </div>
 
+							<td style="border-bottom:none; border-top:none"></td>
 
+							<td class="allborders" 	data-bind="click: $parent.fUpdateGewenst.bind($data,1)"><div class="cirkel" data-bind="css: {'rood' : gewenst() == 1}">	</div></td>
+							<td class="allborders"  data-bind="click: $parent.fUpdateGewenst.bind($data,2)"><div class="cirkel"  data-bind="css: {'oranje' : gewenst() == 2}">	</div></td>
+							<td class="allborders"  data-bind="click: $parent.fUpdateGewenst.bind($data,3)"><div class="cirkel" data-bind="css: {'groen' : gewenst() == 3}">	</div></td>
+							<td class="allborders"  data-bind="click: $parent.fUpdateGewenst.bind($data,4)"><div class="cirkel" data-bind="css: {'blauw' : gewenst() == 4}">	</div></td>
+                            <td class="allborders" ><div class="cirkel" data-bind="css: {'grijs' : gewenst() == 5}">	</div></td>
+						</tr>
+					</tbody>
+				</table>
 
-
+		</div>	<!-- grote blok rechts -->
-
-
-
-
-    <!--    drag and drop-->
 
 </div>

application/views/monpas/pages/partials/_draganddrop_agenda.php

@@ -1,174 +0,0 @@
-<div class="row" id="huidigdragdrop">
-
-<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"  id="gewenstdragdrop">
-
-        <h4>Gewenste situatie
-            <span style="font-size: 14px;">(Schuif de iconen naar het streefniveau.)</span>
-        </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>

application/views/monpas/pages/partials/_tabel_agenda.php

@@ -1,58 +0,0 @@
-
-<table  id="standaardagenda" style="width: 100%; margin-bottom: 40px;">
-    <colgroup>
-        <col style="width: 25px">
-        <col >
-        <col span='11' style="width: 35px">
-    </colgroup>
-    <tr>
-        <td colspan=7 style="text-align:right; padding-right: 15px"> <b>huidige situatie</b><br/> &nbsp;</td>
-        <td></td>
-        <td colspan =5 > <b> gewenste situatie</b><br/> &nbsp;</td>
-    <tr>
-    <tr class="modal-header">
-        <td style="width: 25px"></td>
-        <td><?=$labels['Ykpunten']?> </td>
-        <td style=" text-align:center" class="rood"> 1</td>
-        <td style=" text-align:center" class="oranje"> 2</td>
-        <td style=" text-align:center" class="groen"> 3</td>
-        <td style=" text-align:center" class="blauw"> 4</td>
-        <td style=" text-align:center; background-color: #808080;"  > </td>
-        <td style="background-color:#ffffff"></td>
-        <td style="text-align:center" class="rood"	> 1</td>
-        <td style=" text-align:center" class="oranje"	> 2</td>
-        <td style="text-align:center" class="groen"	> 3</td>
-        <td style="text-align:center" class="blauw"	> 4</td>
-        <td style="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>
-
-        <td style="border-bottom:none; border-top:none"></td>
-
-        <td class="allborders" 	data-bind="click: $parent.fUpdateGewenst.bind($data,1)"><div class="cirkel" data-bind="css: {'rood' : gewenst() == 1}">	</div></td>
-        <td class="allborders"  data-bind="click: $parent.fUpdateGewenst.bind($data,2)"><div class="cirkel"  data-bind="css: {'oranje' : gewenst() == 2}">	</div></td>
-        <td class="allborders"  data-bind="click: $parent.fUpdateGewenst.bind($data,3)"><div class="cirkel" data-bind="css: {'groen' : gewenst() == 3}">	</div></td>
-        <td class="allborders"  data-bind="click: $parent.fUpdateGewenst.bind($data,4)"><div class="cirkel" data-bind="css: {'blauw' : gewenst() == 4}">	</div></td>
-        <td class="allborders" ><div class="cirkel" data-bind="css: {'grijs' : gewenst() == 5}">	</div></td>
-    </tr>
-    </tbody>
-</table>

application/views/start.php

@@ -1,4 +1,4 @@
-<?php    $version = 3;    ?>
+<?php    $version = 2;    ?>
 <!DOCTYPE html>
 <html >
 

composer.json

@@ -11,7 +11,7 @@
 		"source": "https://github.com/bcit-ci/CodeIgniter"
 	},
 	"require": {
-		"php": "^7.4.3",
+		"php": "7.4.33",
 		"sonata-project/google-authenticator": "^2.0",
 		"mailgun/mailgun-php": "^3.5",
 		"kriswallsmith/buzz": "^1.2",

docker-compose.yml

@@ -1,19 +0,0 @@
-networks:
-  shared-network:
-    external: true
-    name: shared-network
-
-services:
-  monpas-app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: monpas-app
-    restart: unless-stopped
-    working_dir: /var/www/html
-    volumes:
-      - .:/var/www/html
-    environment:
-      VIRTUAL_HOST: monpas.test
-    networks:
-      - shared-network

nginx.conf

@@ -1,21 +0,0 @@
-server {
-    listen 80;
-    server_name monpas.test;
-    root /var/www/html;
-    index index.php index.html;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    location ~ \.php$ {
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        include fastcgi_params;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-}

public/css/monpas/main.css

@@ -255,384 +255,6 @@ button.btn-subtle:focus{
 	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;
 }
@@ -1731,21 +1353,6 @@ z-index: 50;
 	margin-left: 20px;
 
 
-.draggable {
-	display: inline-block;
-	width: 19%;
-	height: 50px;
-    /*padding-left: 10px;*/
-
-}
-.dragSource{
-	opacity : .4;
-}
-.dragover{
-	border-style: dashed;
-	background-color: #f8f8f8;
-}
-
 }
 .tabelitem{
 

public/js/login.js

@@ -70,21 +70,28 @@ ls.initLoginModel = function(){
 				if (self.wwoord().length<4) {
 					self.focusop(2);
 					return;}	
-				var submitData={
+				var submitData={gebruikersnaam: self.gnaam()}
-					gebruikersnaam: self.gnaam(),
+				$.post("index.php/login/controlleergnaam", submitData, function(data){
-					wachtwoord: self.wwoord()
+					if (!data || data.salt==null || data.challenge == null){
-				}
+						alert('Uw gebruikersnaam en/of wachtwoord wordt niet herkend.');
-				$.post("index.php/login/login", submitData, function(data){
-					if (!data || data == "geen rechten"){
-						if (data == "geen rechten") {
-							alert('U heeft geen (actieve) rechten binnen deze applicatie.');
-						}
-						else {
-							alert('Uw gebruikersnaam en/of wachtwoord wordt niet herkend.');
-						}
 					}
-					else {
+					else{
-						self.fDoTwoFactor(data)
+						var saltedChallenge =hex_md5 (hex_md5(data.salt + self.wwoord())+ data.challenge);
+						submitData= {saltedchallenge:saltedChallenge};
+
+						$.post("index.php/login/controleerwwoord", submitData,function(data){
+							if (!data || data == "geen rechten"){
+								if (data == "geen rechten") {
+									alert('U heeft geen (actieve) rechten binnen deze applicatie.');
+								}
+								else {
+									alert('Uw gebruikersnaam en/of wachtwoord wordt niet herkend.');
+								}
+							}
+							else {			
+								self.fDoTwoFactor(data)
+							}; // else	
+						},'json');
 					}
 				},'json');
 			},

public/js/monpas/models/modulebalkmodel.js

@@ -34,6 +34,7 @@ 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"));				
@@ -73,7 +74,6 @@ 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);

public/js/monpas/models/ontwikkelmodel.js

@@ -87,37 +87,31 @@ ls.initOntwikkelModel = function(){
 			}
 			,this)
 	}
-	function fAddResult(p) {
+	function fAddResult(p){
 		var dit = this;
-		this.ijkpuntid = p.ijkpunt_id;
+		this.ijkpuntid 	= p.ijkpunt_id;
-		this.wensid = 0;
+		this.wensid 	= 0;
 	
 		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)
 
-		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;
 
-	}
+		// observable is niet nodig maar dit was eerst een computed
-	function fAddAdvies(a) {
+		this.gewenst 		= ko.observable(3);
-		this.nummer = a.nummer;
+		if (p.gewenst) {this.gewenst(p.gewenst)};
-		this.omschrijving = a.omschrijving;
+		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;
+
 
-	function fIcoon(afbeelding) {
-		this.afbeelding = ko.observable(afbeelding);
 	}
 
 	if (ls.OntwikkelModel !== undefined){
@@ -133,7 +127,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([]),
 			writeOK					: ko.observable(false),
@@ -143,92 +137,32 @@ 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;
 				if (!ko.dataFor(document.getElementById('pagontwikkel')) ) {
 					ko.applyBindings(ls.OntwikkelModel, document.getElementById("pagontwikkel"));				
 				}
-				$.post("index.php/monpas/rapijkpunten/checkLevel", function(data){
-					if(data){
-						if(data === 1)
-							self.level123(true);
-					}
-					$.post("index.php/monpas/rapontwikkel/getModule", function(result){
-						if(result){
-							self.instrument(result);
-							if(self.instrument() == '730'){
-								self.selectedAgenda('dragdrop')
-							}
-						}
-						self.fGetOrganisaties();
-					},'json')
-				},'json')
-
-
 				self.initModel();
 			},
 			initModel: function() {
 				var self = ls.OntwikkelModel;
 				console.log('nu hier')
 
+					$.post("index.php/monpas/rapijkpunten/checkLevel", function(data){
+					if(data){
+						if(data === 1)
+						self.level123(true);
+					}
+					self.fGetOrganisaties();
+				},'json')
 			},
 
 
 			fGetOrganisaties: function(){
 				var self = ls.OntwikkelModel;
 				self.toporg('');
+
 				$.post("index.php/monpas/rapijkpunten/getorgs", function(data){
 					self.bezig(true);
 					if (data.organisatie){
@@ -247,6 +181,8 @@ ls.initOntwikkelModel = function(){
 							self.usernivo(result);
 							self.selectedOrg(self.toporg());
 							self.fGetWriteAutorisatie(self.fSwitchLevel());
+
+
 						},'json');
 					} // if
 					self.bezig(false);
@@ -258,6 +194,8 @@ ls.initOntwikkelModel = function(){
 				if(self.selectedUser()){
 					user = self.selectedUser().id;
 				}
+
+
 				var submitData = {'orgsoort' 	: self.selectedOrg().soort,
 									'orgid' 	: self.selectedOrg().id,
 									'user'      : user }
@@ -265,15 +203,16 @@ ls.initOntwikkelModel = function(){
 					self.writeOK(result);
 					if(typeof callback ==='function' && callback()){
 						callback();
+
                     }
 
 				},'json');
 
+
 			},
 			fToggleGeopend: function(){
 				this.geopend(!this.geopend());
 			},
-
 			fUpdateGewenst: function(num){
 				var self=ls.OntwikkelModel;
 				if(this.huidig() != 5 ) this.gewenst(num);
@@ -323,13 +262,14 @@ ls.initOntwikkelModel = function(){
 						self.selectedOrgversion("")
 					}
 
-                    if(self.orgsoort()== '4' && self.selectedOrgversion().vorm == '2' && self. usernivo() <= 1){
+                    if(self.selectedOrgversion().soort == '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() &&
@@ -373,6 +313,7 @@ ls.initOntwikkelModel = function(){
 				},'json'); // post
 			},
 
+
 			fChangeVersion2: function(){
 				var self = ls.OntwikkelModel;
 				if (self.selectedOrgversion() == undefined) return;
@@ -392,6 +333,8 @@ ls.initOntwikkelModel = function(){
 							self.fCheckEigenLijst();
 
 							self.fGetUserScores();
+
+
 						}
 					}
 					else {
@@ -405,169 +348,29 @@ 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();
@@ -587,34 +390,13 @@ 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 {
@@ -650,246 +432,32 @@ 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){
-				if(self.selectedAgenda()==='standaard') {
+					wensarray[i]={	'ijkpuntid'		        :  p.ijkpuntid,
-					$.each(self.results(), function (i, p) {
+									'wensid'			:  p.wensid,
-						wensarray[i] = {
+								   	'gewenst'			:  p.gewenst()  };
-							'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){
-					self.adviezen.removeAll();
+						$.each(self.results(), function(i,p){
-					$.each(self.results(), function(i,p){
+							if (p.wensid == 0){	p.wensid = wensids[i];  }
-						if(p.gewenst() && p.huidig() < p.gewenst()) {
+						}); // each
-							self.adviezen.push(new fAddAdvies(p));
+						ls.MsgAutoFade("Gegevens zijn opgeslagen", 600);
-						}
+					};// If wensids
-					})
+				},'json')	;
-					 	ls.MsgAutoFade("Gegevens zijn opgeslagen", 600);
-				;// If wensids
-				},'json')
 			},
-
+			fPrintOntwikkelmatrix: function(){
-			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;
-				}
-
-
-
-
-				},
-
-
-
-			fPrintOntwikkelmatrixOUD: function(){
 				var self = ls.OntwikkelModel;
 				var orgid = self.selectedOrg().id;
 				var orgversieid = self.selectedOrgversion().id;
@@ -908,22 +476,20 @@ ls.initOntwikkelModel = function(){
 							"user"				: self.selectedUser() ?	self.selectedUser().usernaam : ''}
 				var submitUrl = "index.php/monpas/rapontwikkel/printontwikkelmatrix/?json=" + JSON.stringify(data);	
 				window.open(submitUrl);
-			},
-
-			fPrintOntwikkelmatrix: function(){
-				var self = ls.OntwikkelModel;
-				var orgid = self.selectedOrg().id;
-				var orgversieid = self.selectedOrgversion().id;
-
-
-
-					var submitUrl = "index.php/monpas/rapontwikkel/printontwikkelmatrix/?json=" + JSON.stringify(data);
-				window.open(submitUrl);
 			}
 		} ; // definition van model
 		ls.OntwikkelModel.initBindings();
 
-		//
+		// ls.OntwikkelModel.wijzigRecht = ko.pureComputed(function () {
+		// 	var self = ls.OntwikkelModel;
+		// 	if(!self.ingevuld()) return 'Verberg';
+		// 	if(self.selectedOrgversion().vorm == 1 && self.writeOK()) return 'Toon';
+		// 	if(self.selectedOrgversion().vorm == 2 && self.eigenLijst()) return 'Toon';
+		// 	if(self.selectedOrgversion().vorm == 2 && self.writeOK() && self.selectedUser() == undefined) return 'Toon';
+		// 	return 'Verberg';
+        //
+		// });
+
 
 	}; // else
 }// function initOntwikkelModel

public/js/monpas/models/versiesmodel.js

@@ -112,10 +112,6 @@ $(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(){
@@ -184,10 +180,6 @@ $(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('');