Commit 42ae0205 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'master' of git.unicaen.fr:dsi/sygal

parents 803f8699 b8755bb3
Loading
Loading
Loading
Loading
Loading
+6 −2
Changes for module/Application/src/Application/Controller/TheseController.php: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1506,7 +1506,9 @@ class TheseController extends AbstractController
    //TODO si plus de retraitement sont requis faire un service associé au retraitement de pdf
    public function mergePDF($inputFile1, $inputFile2, $outputFile) {
        $GS_PATH = 'gs';
        $cmd = $GS_PATH ." -dNOPAUSE -sDEVICE=pdfwrite -sOUTPUTFILE=".$outputFile." -dBATCH ".$inputFile1." ".$inputFile2;
        $options  = " -dColorConversionStrategy=/LeaveColorUnchanged -dDownsampleMonoImages=false -dDownsampleGrayImages=false";
        $options .= " -dDownsampleColorImages=false -dAutoFilterColorImages=false -dAutoFilterGrayImages=false -dColorImageFilter=/FlateEncode -dGrayImageFilter=/FlateEncode ";
        $cmd = $GS_PATH .$options." -dNOPAUSE -sDEVICE=pdfwrite -sOUTPUTFILE=".$outputFile." -dBATCH ".$inputFile1." ".$inputFile2;
        $output = [];
        $return = null;
        exec($cmd, $output, $return);
@@ -1522,7 +1524,9 @@ class TheseController extends AbstractController

    public function removePremierePage($inputFile, $outputFile) {
        $GS_PATH = 'gs';
        $cmd = $GS_PATH." -dNOPAUSE -sDEVICE=pdfwrite -sOUTPUTFILE=".$outputFile." -dFirstPage=2 -dBATCH ".$inputFile;
        $options  = " -dColorConversionStrategy=/LeaveColorUnchanged -dDownsampleMonoImages=false -dDownsampleGrayImages=false";
        $options .= " -dDownsampleColorImages=false -dAutoFilterColorImages=false -dAutoFilterGrayImages=false -dColorImageFilter=/FlateEncode -dGrayImageFilter=/FlateEncode ";
        $cmd = $GS_PATH .$options." -dNOPAUSE -sDEVICE=pdfwrite -sOUTPUTFILE=".$outputFile." -dFirstPage=2 -dBATCH ".$inputFile;
        $output = [];
        $return = null;
        exec($cmd, $output, $return);
+1 −1
Changes for module/Application/view/application/etablissement/index.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ $canModifier = $this->isAllowed(EtablissementPrivileges::getResourceId(Etablisse
<?php endif ?>

<h2>
    Établissements participants à SyGAL
    Établissements participant à SyGAL
    <span class="badge">
        <?php echo count($etablissementsSygal); ?>
    </span>