diff --git a/application/controllers/monpas/Compactsop.php b/application/controllers/monpas/Compactsop.php index ac69b9c..cc0fd46 100644 --- a/application/controllers/monpas/Compactsop.php +++ b/application/controllers/monpas/Compactsop.php @@ -168,7 +168,7 @@ class Compactsop extends MY_Controller{ $filename = random_string('alnum', 15).'.'.$extension; $source = $_FILES['image_file']['tmp_name']; $target = $savePath.$filename; - chmod($target, '0777'); +// chmod($target, '0777'); rename($source, $target ); //TODO: unlink eventueel oud logo $logo = $this->Schooldetails_model->getLogo($schoolID); @@ -181,9 +181,9 @@ class Compactsop extends MY_Controller{ $schoolID = $this->clean_input('schoolID'); $savePath = MYROOTPATH.'public/images/logos/'; $logo =$this->Schooldetails_model->getLogo($schoolID); - $padNaam = $savePath.$logo; +// $padNaam = $savePath.$logo; - $this->json($padNaam); + $this->json($logo); } } diff --git a/application/controllers/monpas/Pdfmaker.php b/application/controllers/monpas/Pdfmaker.php index a0c50ff..458685d 100644 --- a/application/controllers/monpas/Pdfmaker.php +++ b/application/controllers/monpas/Pdfmaker.php @@ -49,18 +49,21 @@ class Pdfmaker extends MY_Controller{ $bestandsschoolnaam = str_replace($zoek, "",$sopschoolnaam);; $frameworklogo= $this->config->item('vendor_url').'/images/logos/frameworklogo.png'; +// $logonaam = $this->Schooldetails_model->get(["organisatie_id" =>$schoolid],'logo', true); if (! $logonaam) $logonaam="monpaslogo.png"; $schoollogo = $this->config->item('vendor_url').'/images/logos/'.$logonaam; + chmod($schoollogo, 0777); $headerdata = ['titel' =>$soptitel, 'schoolnaam' =>$sopschoolnaam ? $sopschoolnaam : '', 'logoframework' =>$frameworklogo, - 'logoschool' =>$schoollogo]; - $footerdata = ""; + 'logoschool' =>$schoollogo + ]; +// $footerdata = []; $header = $this->load->view( "monpas/compactsop/compactheader", $headerdata, TRUE ) ; - $footer = $this->load->view ("monpas/compactsop/compactfooter", $footerdata, TRUE); - $filenaam = $this->compactsoppath.'sop.pdf'; +// $footer = $this->load->view ("monpas/compactsop/compactfooter", $footerdata, TRUE); + $filenaam = $this->compactsoppath.'sop.pdf'; $bestandsnaam = "compactsop".$bestandsschoolnaam.$schoolid.$bestandstitel.'-'.$date.'.pdf'; $downloadnaam = $this->compactsoppath.$bestandsnaam; diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 8944f06..8d8a908 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -79,7 +79,7 @@ class MY_Controller extends CI_Controller{ // public $version = '1.18.05';// fout schoolgegevens compactsop // public $version = '1.18.08';// kleurenfout // public $version = '1.18.09';// zoek gebruikers sneller - public $version = '1.18.11';// compactsops maken van valtonderorgs + public $version = '1.18.12';// compactsops maken van valtonderorgs diff --git a/application/views/monpas/compactsop/compactfooter.php b/application/views/monpas/compactsop/compactfooter.php deleted file mode 100644 index e633240..0000000 --- a/application/views/monpas/compactsop/compactfooter.php +++ /dev/null @@ -1,3 +0,0 @@ -een -product diff --git a/application/views/monpas/compactsop/compactheader.php b/application/views/monpas/compactsop/compactheader.php index 55d3e21..56cb3cc 100644 --- a/application/views/monpas/compactsop/compactheader.php +++ b/application/views/monpas/compactsop/compactheader.php @@ -2,7 +2,7 @@ Compact Sop -
@@ -24,7 +24,10 @@
- - + + + +
diff --git a/application/views/monpas/modals/school_modal.php b/application/views/monpas/modals/school_modal.php index c545557..04ec513 100644 --- a/application/views/monpas/modals/school_modal.php +++ b/application/views/monpas/modals/school_modal.php @@ -109,7 +109,7 @@
-
diff --git a/public/js/monpas/models/compactsopmodel.js b/public/js/monpas/models/compactsopmodel.js index a08fdfb..ede95c9 100644 --- a/public/js/monpas/models/compactsopmodel.js +++ b/public/js/monpas/models/compactsopmodel.js @@ -65,6 +65,7 @@ mh.initCompactSopModel = function(){ else return false },this) + this.versies = ko.observable(false); this.isBreedBlok = ko.pureComputed(function(){ if (this.groepen() >=9 ) return true @@ -320,6 +321,8 @@ mh.initCompactSopModel = function(){ }), + + initBindings :function(){ var self = mh.CompactSopModel; if (!ko.dataFor(document.getElementById('pagcompactsop')) ) { @@ -329,7 +332,6 @@ mh.initCompactSopModel = function(){ if(result){ self.toporgnr(result); } - console.log(self.toporgnr()) self.druk(true); self.initModel(); @@ -431,7 +433,6 @@ mh.initCompactSopModel = function(){ orgID : self.selectedOrganisatie().id, orgsoort : self.selectedOrganisatie().soort, } - console.log(sd, "sd") if(self.erIsEenSop()){ apprise("Het nieuwe Compact " + self.label() + " overschrijft het bestaande Compact " + self.label() + " bij dit schooljaar. Wilt u doorgaan?", @@ -576,29 +577,60 @@ mh.initCompactSopModel = function(){ fStartUploading: function(){ var self = mh.CompactSopModel; - var schoolID = self.schoolasobject().schoolid; - - var vFD = new FormData(document.getElementById('upload_form')); - var oXHR = new XMLHttpRequest(); - oXHR.open('POST', 'index.php/monpas/compactsop/uploadLogo/' + schoolID); - oXHR.send(vFD); + console.log("in start uploading") + self.fUploadLogo(function(){self.fToonLogo()}) - setTimeout(function(){ - var sd = {schoolID : self.schoolasobject().schoolid} - $.post("index.php/monpas/compactsop/getLogo" , sd, function(result){ - - if (result == '') self.schoolasobject().logo(null) - else self.schoolasobject().logo(result); - - self.school()[0].logo(self.schoolasobject().logo()); - self.uploadLogoNaam(null); - - }, 'json') - }, 500) // set timeout + // setTimeout(function(){ + // var sd = {schoolID : self.selectedOrganisatie().id} + // $.post("index.php/monpas/compactsop/getLogo" , sd, function(result){ + // + // if (result == '') self.schoolasobject().logo(null) + // else self.schoolasobject().logo(result); + // + // // self.school()[0].logo(self.schoolasobject().logo()); + // self.uploadLogoNaam(null); + // + // }, 'json') + // }, 1000) // set timeout }, + fUploadLogo: function(callback){ + var self = mh.CompactSopModel; + console.log("in upload logo") + var schoolID = self.selectedOrganisatie().id; + + var vFD = new FormData(document.getElementById('upload_form')); + var oXHR = new XMLHttpRequest(); + oXHR.open('POST', 'index.php/monpas/compactsop/uploadLogo/' + schoolID); + oXHR.send(vFD); + console.log(callback) + + if (typeof callback == "function") callback(); + }, + + fToonLogo: function(){ + var self = mh.CompactSopModel; + console.log("in toon logo") + self.schoolasobject().logo(null) + setTimeout(function() { + + $.post("index.php/monpas/compactsop/getOrganisatiegegevens/" + self.selectedOrganisatie().id, function (result) { + if(result){ + self.school.removeAll(); + self.schoolasobject(new fAddSchool(result)) + self.school.push(new fAddSchool(result)); + // $("#modSchool").modal('show'); + self.uploadLogoNaam(null); + } + }, 'json'); + + }, 600) + + + }, + fSelecteerBudgetVersie: function(data, parent){ - var self = mh.CompactSopModel; + var onderdeel = data; var dit = this;