Merge branch 'zarchief/headersop'

# Conflicts: # application/controllers/monpas/Pdfmaker.php
2022-01-25 09:28:06 +01:00
parent 461f933bc2 0c1dd2942b
commit 273305be2c
2 changed files with 17 additions and 1 deletions
@@ -23,7 +23,23 @@ class  Pdfmaker extends MY_Controller{
        $inputstring	= $this->input->post('data');
        $input			= json_decode($inputstring);
        $inhoud         = $input->pagina;
+<<<<<<< HEAD
        $titel          = $input->titel;
+=======
+        $schooljaar     = $input->titel;
+        $orgsoort       = $input->orgsoort;
+        //maak goede titel
+        switch($orgsoort){
+            case 1 : $profiel = 'SWOP';
+            break;
+            case 2 : $profiel = 'ROP';
+            break;
+            case 3 : $profiel = 'BOP';
+            break;
+            default : $profiel = 'SOP';
+        }
+        $soptitel = 'Compact '.$profiel. ' ' . $schooljaar;
+>>>>>>> zarchief/headersop
        $schoolid       = $input->schoolid;
        $schooljaarnummer   = $input->schooljaarnr;
        $organisatie        = $this->Organisaties_model->get(['id' => $schoolid],false, true);
@@ -670,7 +670,7 @@
            margin-bottom   : 10px;
            margin-left     : 10px;
            max-height      : 95%;
-            min-width:      : 70%;
+            min-width       : 70%;
            max-width       : 100%;
            font-size         : 0.7em;
        }