logo en schoolgegevens in sop

application/controllers/monpas/Compactsop.php

@@ -158,7 +158,7 @@ class  Compactsop extends MY_Controller{
         //TODO: unlink eventueel oud logo
         $logo = $this->Schooldetails_model->getLogo($schoolID);
         $padNaam = $savePath.$logo;
-        unlink($padNaam);
+//        unlink($padNaam);
         $this->Schooldetails_model->update_record_where(['logo'=>$filename], ['organisatie_id' =>$schoolID]);
     }
 

application/libraries/monpas/compactsop/Compacteonderdelen.php

@@ -98,7 +98,9 @@ class Compacteonderdelen
         $test = $this->CI->rootpath;
         $logo = false;
         if($this->details && $this->details->logo) {
-            $logo = $this->CI->config->item('vendor_url') . '/images/logos/' . $this->details->logo;
+//            $logo = $this->CI->config->item('vendor_url') . '/images/logos/' . $this->details->logo;
+            $logo = $_ENV['BASE_URL']. '/images/logos/' . $this->details->logo;
+
         }
 
         $this->orgGegevens = [
@@ -117,7 +119,7 @@ class Compacteonderdelen
     private function setOrgpartial()
     {
         $this->orgpartial['data'] = $this->orgGegevens;
-        $this->orgpartial['html'] = 'monpas/compactsop/schoolgegevenscompact';
+        $this->orgpartial['html'] = 'monpas/compactsop/schoolgegevens';
     }
 
     private function setOrglist(){

application/views/monpas/compactsop/paginacompact.php

@@ -716,13 +716,13 @@
     <div class="container" id='compactSopPdf' >
  
     <?php if ($schoolgegevens) { ?>
-            <img style="max-width:45px; height:0px; visibility:hidden"
+            <img style="max-width:45px;"
                 src="<?=$schoolgegevens['data']['logo']?>"/>
     <?php } else { ?>
-            <img style="max-width:45px; height: 0px; visibility:hidden"
+            <img style="max-width:45px; height: 0px; "
                 src="http://app.monpas.nl/images/logos/monpaslogo.png"/>
     <?php } ?>            
-    <img style="max-width:50%; height: 0px; visibility:hidden"
+    <img style="max-width:50%; height: 0px;"
           src="http://app.monpas.nl/images/logos/frameworklogo.png"/>      
     ##PLACEHOLDER##
     </div>

application/views/monpas/compactsop/schoolgegevens.php

@@ -15,8 +15,8 @@
         <td class="sopTabeltd" style="color:#737373 !important;width:45px">Adres
         </td>
         <td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
-            <?php if (isset($data['school']->straat)) {
+            <?php if (isset($data['details']->straat)) {
-                echo $data['school']->straat;
+                echo $data['details']->straat;
             } ?>
         </td>
     </tr>
@@ -34,8 +34,8 @@
         <td class="sopTabeltd" style="color:#737373 !important;">Plaats
         </td>
         <td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
-            <?php if (isset($data['school']->plaats)) {
+            <?php if (isset($data['details']->plaats)) {
-                echo $data['school']->plaats;
+                echo $data['details']->plaats;
             } ?>
         </td>
     </tr>
@@ -43,15 +43,15 @@
         <td class="sopTabeltd" style="color:#737373 !important;">E-mail
         </td>
         <td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
-            <?php if (isset($data['school']->email1)) {
+            <?php if (isset($data['details']->email1)) {
-                echo $data['school']->email1;
+                echo $data['details']->email1;
             } ?>
         </td>
         <td class="sopTabeltd" style="color:#737373 !important;">Telefoon
         </td>
         <td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
-            <?php if (isset($data['school']->telefoon)) {
+            <?php if (isset($data['details']->telefoon)) {
-                echo $data['school']->telefoon;
+                echo $data['details']->telefoon;
             } ?>
         </td>
 
@@ -65,8 +65,8 @@
         <td class="sopTabeltd" style="color:#737373 !important;">Website
         </td>
         <td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
-            <?php if (isset($data['school']->web)) {
+            <?php if (isset($data['details']->web)) {
-                echo $data['school']->web;
+                echo $data['details']->web;
             } ?>
         </td>
 

application/views/monpas/modals/school_modal.php

@@ -93,7 +93,7 @@
                                     overflow:hidden " />
                     <label class="btn btn-small btn-info" 
 
-                            for="image_file">Logo uploaden</label>
+                            for="image_file">Selecteer</label>
                     <!-- ko if: uploadLogoNaam()-->
                         <i>gekozen: <span data-bind="text:showLogoNaam"></span></i>
                     <!-- /ko -->