From e46a23920611fad22167361f53a5c196277b179d Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 25 Jan 2024 11:03:38 +0100 Subject: [PATCH] tussenstand --- .../controllers/monpas/Rapijkpunten.php | 45 ++++++ .../libraries/monpas/ijkpunten/Lijsten.php | 5 + application/models/monpas/Modules_model.php | 8 ++ application/views/monpas/pages/ijkpunten.php | 130 +++++++++-------- .../views/monpas/reports/ijkpuntenbar.php | 10 +- .../views/monpas/reports/ijkpuntenchart.php | 131 ++++++++++++++++++ public/css/monpas/main.css | 31 +++++ public/js/monpas/models/ijkpuntenmodel.js | 27 +++- 8 files changed, 321 insertions(+), 66 deletions(-) create mode 100644 application/views/monpas/reports/ijkpuntenchart.php diff --git a/application/controllers/monpas/Rapijkpunten.php b/application/controllers/monpas/Rapijkpunten.php index b8937da..d164aa9 100644 --- a/application/controllers/monpas/Rapijkpunten.php +++ b/application/controllers/monpas/Rapijkpunten.php @@ -496,6 +496,51 @@ $lijsten[0]->vorm=2; $this->Phantom_model->create_pdf($html, $filenaam, FALSE, FALSE, FALSE); } + function ijkpuntenpdf(){ + + $inputstring = $this->input->post('data'); + $input = json_decode($inputstring); + $versieID = $input->versie; + $titel = $this->Modules_model->get_module_bij_versie($versieID); + $data= []; + $datum = new DateTime(); + $datum = $datum->format('Y-m-d H:i:s'); + $filenaam = preg_replace('/\s+/', '', $titel)."_". preg_replace('/\s+/', '', $datum); + + $data['titel'] = $titel; + $data['chart'] = $input->chart; + $data['tabellen'] = $input->tabellen; + $data['legenda'] = $input->legenda; + $data['ambities'] = $input->ambities; + $data['resultaten'] = $input->resultaten; + + + + + $logo = []; + + $html = $this->load->view("monpas/reports/ijkpuntenchart", $data, true); + + $filenaam="ijkpunten"; + $orientatie = 'landscape'; + + $this->Phantom_model->create_pdf($html, $filenaam, FALSE, FALSE, FALSE, $orientatie); + + +// $this->Phantom_model->create_pdf($html, $filenaam, FALSE, TRUE, FALSE, 'portrait'); +// $pdf = $this->Phantom_model->create_and_get_pdf($html, $filenaam, FALSE, TRUE, FALSE, 'portrait'); +// $pdf = $pdf.'pdf'; +// $fileNameRapport = '../documents/tmp/'.random_string('alnum', 40).'.pdf'; +// file_put_contents($fileNameRapport, $pdf); +// +// header( 'Cache-Control: public' ); +// header( 'Content-type: application/pdf' ); +// header( 'Content-Disposition: inline; filename=" ' . $filenaam . ' ".pdf" ' ); +// header( 'Content-Length: ' . filesize( $fileNameRapport ) ); +// readfile($fileNameRapport ); +// unlink($fileNameRapport); + } + function maakijkpuntenpdf(){ //TODO clean input diff --git a/application/libraries/monpas/ijkpunten/Lijsten.php b/application/libraries/monpas/ijkpunten/Lijsten.php index 0e2542d..3c2c747 100644 --- a/application/libraries/monpas/ijkpunten/Lijsten.php +++ b/application/libraries/monpas/ijkpunten/Lijsten.php @@ -228,8 +228,10 @@ class Lijsten if(intval($this->lijst->aantalorgs) == 1) $scholen = ' school'; $toevoeging = ''; $versie = ', schoolversie'; + $versie2 = 'schoolversie'; if(intval($this->lijst->vorm) == 2) { $versie = ', ind. versie'; + $versie2 = 'individuele versie'; $metingen =' metingen'; if(intval($this->lijst->metingen) == 1) $metingen = ' meting'; $toevoeging = ', '. $this->lijst->metingen. $metingen; @@ -239,6 +241,9 @@ class Lijsten $this->lijst->vantm = "p. " . $this->lijst->orgversie->periodenummer . " van " . mysql2date($this->lijst->orgversie->geldigvanaf) . " t/m " . mysql2date($this->lijst->orgversie->geldigtm) . $versie . $toevoeging; + $this->lijst->vantmresult = " periode ". $this->lijst->orgversie->periodenummer ."
". + mysql2date($this->lijst->orgversie->geldigvanaf)." t/m " . mysql2date($this->lijst->orgversie->geldigtm) . + "
".$versie2 . $toevoeging.""; } private function setLijsten(){ diff --git a/application/models/monpas/Modules_model.php b/application/models/monpas/Modules_model.php index 0541478..54d58bc 100644 --- a/application/models/monpas/Modules_model.php +++ b/application/models/monpas/Modules_model.php @@ -125,6 +125,14 @@ class Modules_model extends MY_Model{ return $this->get_query_row("pad"); } + function get_module_bij_versie($versieID){ + $this->sql = "SELECT M.naam + FROM tb_modules M + JOIN tb_versies V ON M.sysnr = V.modulenr + WHERE V.id = {$versieID}"; + return $this->get_query_row("naam"); + } + diff --git a/application/views/monpas/pages/ijkpunten.php b/application/views/monpas/pages/ijkpunten.php index bed9766..c13cfc5 100644 --- a/application/views/monpas/pages/ijkpunten.php +++ b/application/views/monpas/pages/ijkpunten.php @@ -212,18 +212,19 @@ -
-
+
+
+
- +
- + @@ -255,34 +256,34 @@
+ style="border-right: 1px solid white; padding-left: 10px;vertical-align: top; border-bottom: none"> nr
-
-
+ + - +
- + - + - + - @@ -302,31 +303,31 @@
- +
- + - + - + @@ -348,19 +349,19 @@
- +
- - - + - + @@ -377,21 +378,21 @@
+
- +
- - - + - - @@ -405,14 +406,18 @@
+
+
-
+ +
+ +
- +
+
@@ -435,16 +440,16 @@
+
-
-
-
-

Ambities

- -
+
+
+
+

Ambities

+
-
+

@@ -457,33 +462,38 @@
- -
+
+
-
-

Resultaten

-
-
-

-

+

+

Resultaten

+
+ +
+
+ + +
+ -

-

-

-

-
-
+

+ +
-
-
+
+
+ diff --git a/application/views/monpas/reports/ijkpuntenbar.php b/application/views/monpas/reports/ijkpuntenbar.php index f1cfe89..9429145 100644 --- a/application/views/monpas/reports/ijkpuntenbar.php +++ b/application/views/monpas/reports/ijkpuntenbar.php @@ -257,14 +257,15 @@ }; ?>
-
+

Resultaten

-
-

Periode: vantm?> +

+
+

Periode: vantmresult?>

Betreft: metingen?>metingen ==1 ) {echo " meting"; } else {echo "metingen";}; ?>

@@ -280,7 +281,8 @@ met een score van laagstescore?>.

-
+
+
diff --git a/application/views/monpas/reports/ijkpuntenchart.php b/application/views/monpas/reports/ijkpuntenchart.php new file mode 100644 index 0000000..b1acd0d --- /dev/null +++ b/application/views/monpas/reports/ijkpuntenchart.php @@ -0,0 +1,131 @@ + + + + + + + +config->item('vendor_url');?> + + +config->item('vendor_url_secure');?> + + + + + + + + + + +
+ +
+
+ +
+ + +
+ +
+ +
+
+
+

legenda

+ +
+ +
+ +
+ +
+ +
+ + + +
+ +
+ + + diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index 53db3aa..b38a48d 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -1296,3 +1296,34 @@ z-index: 50; box-shadow: none; } +.blokjescontainer{ + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr; + grid-gap: 4px; +} +.blokjesitempdf{ + background-color:#f5f0f2 !important; + padding: 5px; + padding-left: 10px; + border-radius: 2px; +} +.blokjesitem{ + background-color:#f5f0f2 !important; + padding: 5px; + padding-left: 10px; + border-radius: 2px; +} +.tabelcontainer{ + display: grid; + grid-template-columns: 300px 150px 150px 150px 150px; + grid-gap: 0; + margin-left: 20px; + + +} +.tabelitem{ + +} +.h4koppdf{ + +} diff --git a/public/js/monpas/models/ijkpuntenmodel.js b/public/js/monpas/models/ijkpuntenmodel.js index 8ba16ce..eb56246 100644 --- a/public/js/monpas/models/ijkpuntenmodel.js +++ b/public/js/monpas/models/ijkpuntenmodel.js @@ -125,10 +125,12 @@ ls.initIJkpuntenModel = function(){ this.metingen = l.metingen; this.metingenV = l.metingenV; this.vantm = l.vantm; + this.vantmresult = l.vantmresult; this.periodenummer = l.orgversie.periodenummer this.jaartal = l.jaartal; this.label = l.label; + this.label2 = l.label2; this.gemscore = l.ambities.gemscore; this.ijkpunten = l.ambities.xijkpunten; this.zprocent = l.ambities.zprocent; @@ -396,7 +398,6 @@ ls.initIJkpuntenModel = function(){ var orgversie = {'orgversieid': p.orgversieid, 'vorm' : p.vorm }; - self.selectie.push(orgversie); } @@ -848,8 +849,30 @@ ls.initIJkpuntenModel = function(){ }, + fPrint: function () { + var self = ls.IJkpuntenModel; + var chart = document.getElementById("hc-chart1").outerHTML; + var tabellen = document.getElementById("alleIJktabellen").outerHTML; + var legenda = document.getElementById("ijktabellegenda").outerHTML; + var ambities = document.getElementById("ijkambities").outerHTML + var resultaten = document.getElementById("ijkresultaten").outerHTML; - fPrint: function(){ + var sd = { + chart: chart, + tabellen: tabellen, + legenda: legenda, + ambities: ambities, + resultaten: resultaten, + versie: self.selectedSerie().versieid + }; + data = JSON.stringify(sd); + var $form = $("
").append($('').val(data)); + $form.appendTo("body").submit(); + }, + + + + fPrintEvenNiet: function(){ var self = ls.IJkpuntenModel; // var element = document.querySelector('#hc-chart1') // var svgAsXML = (new XMLSerializer).serializeToString(element);