Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/swvMaaktSopSchool' into develop

Browse Source
This commit is contained in:
Monique
2022-11-02 15:46:04 +01:00
parent bb87dbc72d 520a4be5e0
commit 8f7e651e25
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Compactsop.php
+1 -1
View File
@@ -153,8 +153,8 @@ class Compactsop extends MY_Controller{
$schoolID = $orgid; $schoolID = $orgid;
$html = (new Compactepaginas($compacteonderdelen, $paginas))->getHtml(); $html = (new Compactepaginas($compacteonderdelen, $paginas))->getHtml();
$padnaam = $schoolID . $schooljaarnr; $padnaam = $schoolID . $schooljaarnr;
file_put_contents(MYROOTPATH.'public/tmp/temp'.$schoolID.$schooljaarnr.'.html', $html);
file_put_contents(MYROOTPATH.'public/tmp/temp'.$schoolID.$schooljaarnr.'.html', $html);
echo json_encode($padnaam); echo json_encode($padnaam);
} }
application/controllers/monpas/Pdfmaker.php
+6 -5
View File
@@ -84,14 +84,15 @@ class Pdfmaker extends MY_Controller{
file_put_contents($downloadnaam, $pdf); file_put_contents($downloadnaam, $pdf);
chmod($downloadnaam, 0777); chmod($downloadnaam, 0777);
header( 'Content-Description: File Transfer' );
// header( 'Content-Description: File Transfer' );
header( 'Content-Type: application/pdf' ); header( 'Content-Type: application/pdf' );
header( 'Content-disposition:inline; filename="' .$bestandsnaam.'"'); header( 'Content-disposition:inline; filename="' .$bestandsnaam.'"');
header( 'Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0' ); // header( 'Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0' );
header( 'Pragma: public' ); // header( 'Pragma: public' );
header( 'Content-Length: ' . filesize( $downloadnaam ) ); // header( 'Content-Length: ' . filesize( $downloadnaam ) );
readfile($downloadnaam); readfile($downloadnaam);
//
} }
public/js/monpas/models/compactsopmodel.js
+4
View File
@@ -458,6 +458,10 @@ mh.initCompactSopModel = function(){
self.toonOnderdelen(true); self.toonOnderdelen(true);
}); });
} }
else{
apprise("geen instrumenten voor het compact sop gevonden.")
}
},'json'); },'json');
} // else } // else
}, },