diff --git a/application/controllers/monpas/Compactsop.php b/application/controllers/monpas/Compactsop.php index 759dca1..ec37d1b 100644 --- a/application/controllers/monpas/Compactsop.php +++ b/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]); } diff --git a/application/libraries/monpas/compactsop/Compacteonderdelen.php b/application/libraries/monpas/compactsop/Compacteonderdelen.php index dafb320..6fb6082 100644 --- a/application/libraries/monpas/compactsop/Compacteonderdelen.php +++ b/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(){ diff --git a/application/views/monpas/compactsop/paginacompact.php b/application/views/monpas/compactsop/paginacompact.php index 3581fdd..f6ce465 100644 --- a/application/views/monpas/compactsop/paginacompact.php +++ b/application/views/monpas/compactsop/paginacompact.php @@ -716,13 +716,13 @@
- - - ##PLACEHOLDER##
diff --git a/application/views/monpas/compactsop/schoolgegevens.php b/application/views/monpas/compactsop/schoolgegevens.php index dcecdbd..b982e0f 100644 --- a/application/views/monpas/compactsop/schoolgegevens.php +++ b/application/views/monpas/compactsop/schoolgegevens.php @@ -15,8 +15,8 @@ Adres - straat)) { - echo $data['school']->straat; + straat)) { + echo $data['details']->straat; } ?> @@ -34,8 +34,8 @@ Plaats - plaats)) { - echo $data['school']->plaats; + plaats)) { + echo $data['details']->plaats; } ?> @@ -43,15 +43,15 @@ E-mail - email1)) { - echo $data['school']->email1; + email1)) { + echo $data['details']->email1; } ?> Telefoon - telefoon)) { - echo $data['school']->telefoon; + telefoon)) { + echo $data['details']->telefoon; } ?> @@ -65,8 +65,8 @@ Website - web)) { - echo $data['school']->web; + web)) { + echo $data['details']->web; } ?> diff --git a/application/views/monpas/modals/school_modal.php b/application/views/monpas/modals/school_modal.php index d8a9731..8433594 100644 --- a/application/views/monpas/modals/school_modal.php +++ b/application/views/monpas/modals/school_modal.php @@ -93,7 +93,7 @@ overflow:hidden " /> + for="image_file">Selecteer gekozen: