Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pdf

Browse Source
This commit is contained in:
Monique
2024-01-25 17:47:59 +01:00
parent 9f086fedd5
commit d2cac0cac1
4 changed files with 90 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/monpas/pages/ijkpunten.php
+32 -21
View File
@@ -199,17 +199,6 @@
<canvas style="display: none" id="ijkpuntencanvas"> <canvas style="display: none" id="ijkpuntencanvas">
</canvas> </canvas>
<!-- <div data-bind="with: selectedSerie()" style="margin-left: 50px;">-->
<!-- <span style="font-weight: bold; "-->
<!-- data-bind="text: 'Versie: ' + naam + ', scoretype: ' + scoreomschrijving ">-->
<!-- </span>-->
<!-- </div>-->
<!-- <table style="margin-top: 5px; margin-left: 50px; " data-bind="foreach: lijsten" >-->
<!-- <tr data-bind="visible: erzijnscores() == true">-->
<!-- <td style="width: 30px; font-weight: bold" data-bind=" text: periodenummer"></td>-->
<!-- <td style="padding-left:10px; "data-bind="text: ': ' + vantm + ', ' + wijik"></td>-->
<!-- </tr>-->
<!-- </table>-->
</div> </div>
<div id="alleIJktabellen" class="row "> <div id="alleIJktabellen" class="row ">
@@ -218,14 +207,19 @@
<table class="tabelitem1pdf"> <table class="tabelitem1pdf">
<thead> <thead>
<tr>
<th style="width:10%"></th>
<th style="width:90%"></th>
</tr>
<tr class="headpdf"> <tr class="headpdf">
<th class="ijkpuntth" <th class="ijkpuntth" style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e; padding-left: 4px;">
style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e; padding-left: 4px;"> <div class="ijkpuntkopje" style="height: 130px; ">nr</div>
<div style="height: 140px; ">nr</div>
</th> </th>
<th class="ijkpuntth" <th class="ijkpuntth"
style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;padding-left: 4px;"><div style="height: 130px; " data-bind="text: label"></div> style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;padding-left: 4px;"><div
class="ijkpuntkopje"
style="height: 130px; " data-bind="text: label"></div>
</th> </th>
</tr> </tr>
@@ -264,6 +258,10 @@
<!-- Nieuwste meting + ijkpunten van school, bestuur en kamer--> <!-- Nieuwste meting + ijkpunten van school, bestuur en kamer-->
<table class="tabelitem" data-bind="visible: $root.isSWV()==false && tooninfo() == true"> <table class="tabelitem" data-bind="visible: $root.isSWV()==false && tooninfo() == true">
<thead> <thead>
<tr>
<th style="width:50%"></th>
<th style="width:50%"></th>
</tr>
<tr class="headpdf " > <tr class="headpdf " >
<th colspan="2" class="ijkpuntth" <th colspan="2" class="ijkpuntth"
style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;"> style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;">
@@ -317,6 +315,10 @@
<table class="tabelitem" data-bind="visible: tooninfo() == false && $root.isSWV() == false && erzijnscores()== true; "> <table class="tabelitem" data-bind="visible: tooninfo() == false && $root.isSWV() == false && erzijnscores()== true; ">
<thead> <thead>
<tr>
<th style="width:50%"></th>
<th style="width:50%"></th>
</tr>
<tr class="headpdf" > <tr class="headpdf" >
<th class="ijkpuntth" colspan="2" <th class="ijkpuntth" colspan="2"
style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e; "> style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e; ">
@@ -367,6 +369,10 @@
<!-- Nieuwste meting + ijkpunten van swv--> <!-- Nieuwste meting + ijkpunten van swv-->
<table class="tabelitem" data-bind="visible: tooninfo()== true && $root.isSWV() == true "> <table class="tabelitem" data-bind="visible: tooninfo()== true && $root.isSWV() == true ">
<thead> <thead>
<tr>
<th style="width:50%"></th>
<th style="width:50%"></th>
</tr>
<tr class="headpdf" > <tr class="headpdf" >
<th class="ijkpuntth" style="border-bottom: 1px solid #a07b8e;"> <th class="ijkpuntth" style="border-bottom: 1px solid #a07b8e;">
<div class="ijkpuntthdiv" data-bind="text: vantm "> <div class="ijkpuntthdiv" data-bind="text: vantm ">
@@ -399,6 +405,10 @@
<!-- Metingen ter vergelijking van swv--> <!-- Metingen ter vergelijking van swv-->
<table class="tabelitem" data-bind="visible: tooninfo() == false && $root.isSWV() == true"> <table class="tabelitem" data-bind="visible: tooninfo() == false && $root.isSWV() == true">
<thead> <thead>
<tr>
<th style="width:50%"></th>
<th style="width:50%"></th>
</tr>
<tr class="headpdf" style=" border-bottom: none"> <tr class="headpdf" style=" border-bottom: none">
<th class="ijkpuntth" style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;" <th class="ijkpuntth" style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;"
><div class="ijkpuntthdiv" data-bind="text: vantm "> ><div class="ijkpuntthdiv" data-bind="text: vantm ">
@@ -437,9 +447,9 @@
</div> </div>
<div class="row" data-bind="visible: erzijnlijsten()== true"> <div id="ijktabellegenda" class="row" data-bind="visible: erzijnlijsten()== true">
<div class="col-xs-12"> <div class="col-xs-12" >
<table id="ijktabellegenda" class="pdflegenda" style=" margin-top: 20px; width: 230px;" data-bind="with: scorekleuren, visible: erzijnlijsten() == true"> <table class="pdflegenda" style=" margin-top: 30px; width: 230px;" data-bind="with: scorekleuren, visible: erzijnlijsten() == true">
<tr data-bind="visible: $root.scoretype != 7 "> <tr data-bind="visible: $root.scoretype != 7 ">
<td style="width: 30px; border-bottom: 1px solid #ebebeb; background-color: #99d6ff"></td> <td style="width: 30px; border-bottom: 1px solid #ebebeb; background-color: #99d6ff"></td>
<td style="padding-left:10px; border-bottom: 1px solid #ebebeb;"data-bind="text: 'score >= ' + grens3 + ' en <= ' + grens4"></td> <td style="padding-left:10px; border-bottom: 1px solid #ebebeb;"data-bind="text: 'score >= ' + grens3 + ' en <= ' + grens4"></td>
@@ -467,13 +477,14 @@
<div data-bind="visible: erzijnlijsten() == true"> <div data-bind="visible: erzijnlijsten() == true">
<div id="ijkambities" class="row"> <div id="ijkambities" class="row">
<div class="col-xs-12"> <div class="col-xs-12" >
<h4 class="h4koppdf" style="margin-top: 30px;">Ambities</h4> <h4 class="h4koppdf" style="margin-top: 30px;">Ambities</h4>
<div class="blokjescontainer" data-bind="foreach: lijsten" > <div class="blokjescontainer" data-bind="foreach: lijsten" >
<!--ko if: $parent.eigenambitie() || $index() == 0 --> <!--ko if: $parent.eigenambitie() || $index() == 0 -->
<div class=" blokjesitempdf"> <div class=" blokjesitempdf">
<!--ko if: $parent.eigenambitie() --> <!--ko if: $parent.eigenambitie() -->
<span style="font-weight: bold; margin-bottom: 10px" data-bind="text: vantm + ':'"></span> <span class="ijkpuntkopje" data-bind="html: vantmresult"></span>
<br>
<br> <br>
<!--/ko--> <!--/ko-->
<span data-bind="text: 'gemiddelde score ' + gemscore + '%' "></span> <span data-bind="text: 'gemiddelde score ' + gemscore + '%' "></span>
@@ -496,7 +507,7 @@
<div class="blokjescontainer" data-bind="foreach: lijsten" > <div class="blokjescontainer" data-bind="foreach: lijsten" >
<!--ko if: metingen > 0 --> <!--ko if: metingen > 0 -->
<div class="blokjesitem" "> <div class="blokjesitem" ">
<div style="font-weight: bold; margin-bottom: 12px; " data-bind="html: vantmresult "></div> <div class="ijkpuntkopje" data-bind="html: vantmresult "></div>
<span data-bind= " text: 'gemiddelde score ' + totgem + ' %, ' "></span> <span data-bind= " text: 'gemiddelde score ' + totgem + ' %, ' "></span>
<br> <br>
application/views/monpas/reports/ijkpuntenchart.php
+47 -20
View File
@@ -27,15 +27,7 @@
.blokjesitempdf{
margin 2px;
padding: 10px 5px 5px 10px;
height: 125px !important;
width: 22%;
font-size:0.8em;
background-color:#f5f0f2 !important;
border-radius: 2px;
}
.h4koppdf{ .h4koppdf{
font-size: 1.5em !important; font-size: 1.5em !important;
@@ -45,6 +37,9 @@
margin-left: 0; margin-left: 0;
padding-left: 0; padding-left: 0;
} }
.blokjescontainer{
width: 100%;
}
.blokjesitem{ .blokjesitem{
background-color:#f5f0f2 !important; background-color:#f5f0f2 !important;
@@ -59,6 +54,24 @@
font-family: Verdana, Geneva, sans-serif !important; font-family: Verdana, Geneva, sans-serif !important;
} }
.blokjesitempdf{
background-color:#f5f0f2 !important;
float:left;
width:22%;
margin 2px;
margin-right:15px;
padding: 10px 5px 5px 10px;
border-radius: 2px;
height: 215px;
font-size:0.8em;
font-weight: normal;
font-family: Verdana, Geneva, sans-serif !important;
}
.tabelcontainer{
width: 100%;
}
.tabelitem{ .tabelitem{
float: left; float: left;
font-size:0.8em; font-size:0.8em;
@@ -77,13 +90,27 @@
} }
.pdflegenda{ .pdflegenda{
font-size:0.8em; font-size:0.7em;
font-family: Verdana, Geneva, sans-serif !important; font-family: Verdana, Geneva, sans-serif !important;
width:35%; width:35%;
height: 150px!important; height: 150px!important;
margin-top: 30px;
margin-top: 5px;
}
.ijkpuntthdiv{
height: 50px;
overflow:hidden;
font-weight: normal;
font-size:0.8em;
}
.ijkpuntth {
vertical-align:top;
padding: 2px;
}
.ijkpuntkopje{
font-weight: 500;
margin-bottom: 10px;
} }
@@ -93,10 +120,10 @@
</head> </head>
<body style="font-size:1.3em; font-family: Verdana, Geneva, sans-serif !important;"> <body style="font-size:1.3em; font-family: Verdana, Geneva, sans-serif !important;">
<div style=" padding: 5px; font-size: 2em; " > <div style=" padding: 5px; font-size: 1.8em; text-align: center " >
<?=$titel?> <?=$titel?>
</div> </div>
<div style="margin-top: 10px; margin-bottom: 20px; page-break-after: always; "> <div style="margin-top: 10px; margin-bottom: 20px; ">
<?php if (isset($chart) ) {?> <?php if (isset($chart) ) {?>
<div > <div >
<img src="<?=$chart?>" <img src="<?=$chart?>"
@@ -104,26 +131,26 @@
<?php }; ?> <?php }; ?>
</div> </div>
<div style="font-family: Verdana, Geneva, sans-serif !important;"> <div style="font-family: Verdana, Geneva, sans-serif !important;page-break-before: always; clear: both;">
<?=$tabellen?> <?=$tabellen?>
</div> </div>
<br> <br>
<br/> <br/>
<p>legenda</p>
<div style=" font-family: Verdana, Geneva, sans-serif !important;">
<div style=" padding-top: 20px; font-family: Verdana, Geneva,sans-serif !important;clear: both; ">
<?=$legenda?> <?=$legenda?>
</div> </div>
<br>
<div style=" font-family: Verdana, Geneva, sans-serif !important;">
<div style=" font-family: Verdana, Geneva, sans-serif !important;page-break-before: always; clear: both">
<?=$ambities?> <?=$ambities?>
</div> </div>
<!-- <div class="eindepagina"></div>-->
<div style=" font-family: Verdana, Geneva, sans-serif !important; page-break-before: always">
<div style="padding-top:20px; font-family: Verdana, Geneva, sans-serif !important; clear: both;">
<?=$resultaten?> <?=$resultaten?>
</div> </div>
public/css/monpas/main.css
+10
View File
@@ -1313,6 +1313,12 @@ z-index: 50;
padding-left: 10px; padding-left: 10px;
border-radius: 2px; border-radius: 2px;
} }
.blokjesitempdf{
background-color:#f5f0f2 !important;
padding: 5px;
padding-left: 10px;
border-radius: 2px;
}
.tabelcontainer{ .tabelcontainer{
display: grid; display: grid;
grid-template-columns: 400px 150px 150px 150px 150px; grid-template-columns: 400px 150px 150px 150px 150px;
@@ -1335,4 +1341,8 @@ z-index: 50;
.ijkpuntth { .ijkpuntth {
vertical-align:top; vertical-align:top;
padding: 2px; padding: 2px;
}
.ijkpuntkopje{
font-weight: bold!important;
margin-bottom: 10px;
} }
public/js/monpas/models/ijkpuntenmodel.js
+1 -1
View File
@@ -858,7 +858,7 @@ ls.initIJkpuntenModel = function(){
var resultaten = document.getElementById("ijkresultaten").outerHTML; var resultaten = document.getElementById("ijkresultaten").outerHTML;
var sd = { var sd = {
chart: chart, chart: GrafiekInfo,
tabellen: tabellen, tabellen: tabellen,
legenda: legenda, legenda: legenda,
ambities: ambities, ambities: ambities,