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

compact sop: periodecheck, lege lijsten, pdf los van app.monpas.nl

Browse Source 
- checkperiode: losse komma uit SQL, vergelijk op orgversie_id i.p.v. FV.id,
  lijst telt mee in het schooljaar waarin geldigtm valt
- Compacteversies: checkperiode per filledversie i.p.v. laatste versie
- Compacteonderdelen: lijstblok zonder gekozen versie overslaan
- Compactepaginas: schoolgegevens doorgeven aan paginacompact
- paginacompact: jQuery van eigen server laden
- sopcompact: bootstrap en OpenSans ingesloten in de pdf-html

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Monique
2026-10-22 10:49:58 +02:00
co-authored by Claude Opus 5.5
parent 172fcf566c
commit fcc26ca952
6 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/monpas/compactsop/Compacteonderdelen.php
+5
View File
@@ -371,6 +371,11 @@ class Compacteonderdelen
private function setIJkpunten()
{
// geen lijst gekozen voor dit blok: overslaan (anders query met lege orgversie_id)
if(!$this->onderdeel['orgversieid']) {
$this->data = false;
return;
}
$this->setScorevorm();
$this->setSelecties();
$this->setLijsten();
application/libraries/monpas/compactsop/Compactepaginas.php
+2 -1
View File
@@ -226,7 +226,8 @@ class Compactepaginas
private function setHtml()
{
if (!$this->blokjeshtml) return;
$data = ['schooljaar' => $this->schooljaar];
$data = ['schooljaar' => $this->schooljaar,
'schoolgegevens' => $this->orgGegevens];
$html = $this->CI->load->view("monpas/compactsop/paginacompact", $data, true);
$this->html = str_replace('##PLACEHOLDER##', $this->blokjeshtml, $html);
}
application/libraries/monpas/compactsop/Compacteversies.php
+1 -1
View File
@@ -308,7 +308,7 @@ class Compacteversies
$this->onderdeel->gegevens = "T";
foreach($this->onderdeel->filledversies as $index => $this->filledversie) {
$this->filledversie->selected = 'F';
$valterin = $this->CI->Filledversions_model->checkperiode($this->versie->id,$this->schooljaar->start,
$valterin = $this->CI->Filledversions_model->checkperiode($this->filledversie->id,$this->schooljaar->start,
$this->schooljaar->eind );
if($valterin){
$this->filledversie->selected = 'T';
application/models/monpas/Filledversions_model.php
+5 -5
View File
@@ -205,13 +205,13 @@ class Filledversions_model extends MY_Model{
function checkperiode($fvid, $van, $tm){
$this->sql = "SELECT DISTINCT(FV.orgversie_id) as id,
function checkperiode($orgversieid, $van, $tm){
$this->sql = "SELECT DISTINCT(FV.orgversie_id) as id
FROM tb_filledversions FV
JOIN tb_orgversies OV ON OV.id = FV.orgversie_id
WHERE FV.id ={$fvid}
AND OV.geldigvanaf >= '{$van}'
AND OV.geldigtm <= '{$tm}' ";
WHERE FV.orgversie_id ={$orgversieid}
AND OV.geldigtm >= '{$van}'
AND OV.geldigtm <= '{$tm}' "; // lijst telt mee in de periode waarin geldigtm valt
return $this->get_query_result();
}
application/views/monpas/compactsop/paginacompact.php
+1 -1
View File
@@ -2,7 +2,7 @@
<html>
<head>
<title>Compact Sop</title>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url_secure'); ?>/js_lib/jquery.min.js?v=1.17.26"></script>
<script type="text/javascript" src="<?php echo $this->config->item('base_url'); ?>/js_lib/jquery.min.js?v=1.17.26"></script>
<!-- <script src="--><?php //echo $this->config->item('vendor_url'); ?><!--/js_lib/Highcharts/code/highcharts.js"></script>-->
<script type="text/javascript">
application/views/monpas/compactsop/sopcompact.php
+6 -3
View File
@@ -9,7 +9,8 @@
font-family : 'OpenSans';
font-style : normal;
font-weight : normal;
src : url( http://app.monpas.nl/fonts/opensans-regular-webfont-webfont.ttf);
/* font ingesloten zodat de pdf niet afhangt van app.monpas.nl */
src : url( data:font/truetype;base64,<?php echo base64_encode(file_get_contents(FCPATH.'fonts/opensans-regular-webfont-webfont.ttf')); ?>) format('truetype');
}
body {
@@ -261,8 +262,10 @@
</style>
<link rel="stylesheet"
href="<?php echo $this->config->item('vendor_url');?>/css_lib/bootstrap-3.3.2-dist/css/bootstrap.css" crossorigin="anonymous" />
<!-- bootstrap ingesloten zodat de pdf niet afhangt van app.monpas.nl -->
<style>
<?php echo file_get_contents(FCPATH.'css_lib/bootstrap-3.3.2-dist/css/bootstrap.min.css'); ?>
</style>
<script type="text/javascript"
src="<?php echo $this->config->item('vendor_url');?>/css_lib/bootstrap-3.3.2-dist/js/bootstrap.min.js"></script>