From eb0bd12ac8fbb06b1089e8fef985de849610458c Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Fri, 29 Oct 2021 15:51:19 +0200
Subject: [PATCH] printfunctie bij invullen uitgezet

---
 application/views/monpas/pages/monitor.php    |  8 +++---
 .../views/monpas/reports/printlijst.php       | 27 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/application/views/monpas/pages/monitor.php b/application/views/monpas/pages/monitor.php
index 60bf4ba..8ead46a 100644
--- a/application/views/monpas/pages/monitor.php
+++ b/application/views/monpas/pages/monitor.php
@@ -13,10 +13,10 @@
 								value		: selectedOrgversion,
 								event		: {change: fChangeVersion}">
 			</select>
-			<span style="display: inline-block; float:right"
-                  class="glyphicon glyphicon-print"
-                  data-bind="click: fPrint">
-            </span>
+<!--			<span style="display: inline-block; float:right"-->
+<!--                  class="glyphicon glyphicon-print"-->
+<!--                  data-bind="click: fPrint">-->
+<!--            </span>-->
 
 		</h4>
 		<div class="row">
diff --git a/application/views/monpas/reports/printlijst.php b/application/views/monpas/reports/printlijst.php
index 965a6c5..1e4755e 100644
--- a/application/views/monpas/reports/printlijst.php
+++ b/application/views/monpas/reports/printlijst.php
@@ -41,10 +41,9 @@
 				<table style="width:100%; font-size:0.9em">
 					<thead>	
 						<tr>							
-							<th class="header2" style="width:20px;padding-left: 2px;text-align:right"> nr </th>							
-							<th class="header2" style="width:65%; padding-left: 2px; text-align: left">indicator</th>
-							<th class="header2" style="width:30px;padding-left: 2px;text-align:center">insp.</th>
-							<th class="header2" style="width:150px;padding-left: 2px;text-align:left"> score</th>
+							<th class="header2" style="width:3%;padding-left: 2px;text-align:right"> nr </th>
+							<th class="header2" style="width:60%; padding-left: 2px; text-align: left">indicator</th>
+							<th class="header2" style="width:30%;padding-left: 2px;text-align:left"> score</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -54,26 +53,26 @@
 							
 							<td  class="bb" style="text-align:right;vertical-align:top"><?=$score->nummer?></td>
 							<td  class="bb" style="vertical-align:top"><?=$score->omschrijving?></td>
-							<td class="bb" style="vertical-align:top" data-bind="text: inspectie.length > 0 ? '(' + inspectie + ')' : '' ">
-								<?php if ($score->inspectie) { echo "(".$score->inspectie.")" ;} ;?>
-							</td>
 							<td class="bb">
 								<?php 	if ($score->scoretype == 1){echo $score->score;}; 
 										 if ($score->scoretype == 2){echo $score->score." %";}; 
-										 if ($score->scoretype == 3 ||$score->scoretype == 4 ||$score->scoretype == 5 || $score->scoretype == 6){
+										 if ($score->scoretype == 3 ||$score->scoretype == 4 ||$score->scoretype == 5 ||
+                                             $score->scoretype == 6|| $score->scoretype == 7){
 										 	if ($score->scoretype== 6) {
 										 		$textJa = ' onvol.';
-										 		$textNee = 'vol.';} 
+										 		$textNee = 'vol.';}
 										 	else {
 										 		$textJa ="ja";
 										 		$textNee = 'nee';
 										 	};
 								?>
-										 		
-											<input type='radio' naam='score' value ='1'  <?php if ($score->score ==1) echo "checked"; ?> /><span style="display: inline-block; margin-left:2px; margin-right:5px"><?=$textJa?></span>  
-											<input type='radio' naam='score' value ='2'  <?php if ($score->score ==2) echo "checked"; ?>  /><span style="display: inline-block; margin-left:2px; margin-right:5px"> <?=$textNee?>  </span> 
-											<input type='radio' naam='score' value ='3'  <?php if ($score->score ==3) echo "checked"; ?> /> <span style="display: inline-block; margin-left:2px;" > <?=$score->thirdoptiontext?></span> 
-								<?php } else echo $score->scoretype; ?>
+
+											<input type='radio' naam='score' value ='1'  <?php if ($score->score ==1) echo "checked"; ?> /><span style="display: inline-block; margin-left:2px; margin-right:5px"><?=$textJa?></span>
+											<input type='radio' naam='score' value ='2'  <?php if ($score->score ==2) echo "checked"; ?>  /><span style="display: inline-block; margin-left:2px; margin-right:5px"> <?=$textNee?>  </span>
+											<input type='radio' naam='score' value ='3'  <?php if ($score->score ==3) echo "checked"; ?> /> <span style="display: inline-block; margin-left:2px;" > <?=$score->thirdoptiontext?></span>
+								<?php }
+
+										 else echo $score->scoretype; ?>
 								</div>
 							</td>
 						</tr>