diff --git a/application/controllers/monpas/Pdfmaker.php b/application/controllers/monpas/Pdfmaker.php index efddbb2..2d3533d 100644 --- a/application/controllers/monpas/Pdfmaker.php +++ b/application/controllers/monpas/Pdfmaker.php @@ -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); diff --git a/public/tmp/temp187.html b/public/tmp/temp187.html index c5358eb..38678f3 100644 --- a/public/tmp/temp187.html +++ b/public/tmp/temp187.html @@ -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; }