Merge branch 'master' into dist/eole/2.7.2/master

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,24 @@
+Source: eole-schedule
+Section: web
+Priority: optional
+Maintainer: Cadoles <contact@cadoles.com>
+Build-Depends: debhelper (>= 7.0.50)
+Standards-Version: 3.8.4
+Homepage: https://forge.cadoles.com/Cadoles/schedule
+Vcs-Git: https://forge.cadoles.com/Cadoles/schedule
+Vcs-Browser: https://forge.cadoles.com/Cadoles/schedule
+
+Package: schedule-sso
+Architecture: all
+Depends: ${misc:Depends}, eole-sso
+Description: Filtre SSO pour schedule "EOLE".
+
+Package: eole-schedule
+Architecture: all
+Depends: ${misc:Depends}, eole-envole-dependances, schedule-sso
+Description: Eolisation de l'application schedule.
+
+Package: schedule-apps
+Architecture: all
+Depends: ${misc:Depends}, envole-dependances-apps
+Description: Sources pour schedule "EOLE".

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-schedule.install

@@ -0,0 +1 @@
+usr/share/eole

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/envole/%(version)s

debian/rules

@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@

debian/schedule-apps.install

@@ -0,0 +1 @@
+var/www/html

debian/schedule-sso.install

@@ -0,0 +1 @@
+usr/share/sso

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

dicos/25_schedule.xml

@@ -6,9 +6,7 @@
 
 	<containers>
         <container name='web'>
-            <!--
             <package>schedule-apps</package>
-            -->
             
 			<!-- service de configuration apache -->
 			<service method="apache" servicelist="schedule">schedule</service>

src/schedule-2.0/composer.json

@@ -51,10 +51,7 @@
         "preferred-install": {
             "*": "dist"
         },
-        "sort-packages": true,
+        "sort-packages": true
-        "allow-plugins": {
-            "symfony/flex": true
-        }
     },
     "autoload": {
         "psr-4": {
@@ -75,9 +72,6 @@
         "symfony/polyfill-php56": "*"
     },
     "scripts": {
-        "pre-install-cmd": [
-            "php scripts/checkcomposer.php"
-        ],        
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "cache:clear --env=prod": "symfony-cmd",

src/schedule-2.0/scripts/checkcomposer.php

@@ -1,13 +0,0 @@
-<?php
-
-$requiredVersion = 'version 1'; // La version interdite
-
-$composerVersion = trim(shell_exec('COMPOSER_ALLOW_SUPERUSER=1 composer --version --no-ansi'));
-echo $composerVersion."\n";
-
-if (stripos($composerVersion,$requiredVersion)===false ) {
-    echo "La version de Composer $requiredVersion n'est pas autorisée" . PHP_EOL;
-    echo "Veuillez mettre à jour Composer avec 'composer self-update --1'." . PHP_EOL;
-    echo "Ou executez le scripts/reconfigure.sh" . PHP_EOL;
-    exit(1); // Quitte avec un code d'erreur
-}

src/schedule-2.0/scripts/reconfigure.sh

@@ -6,13 +6,12 @@ cd /var/www/html/schedule
 . scripts/proxy.sh
 
 # Mise en place du fichier d'environnement model
-yes 2>/dev/null | cp /var/www/html/schedule/scripts/.env.model $DIR/.env
+if [ ! -f /var/www/html/schedule/.env ]; then
+    mv /var/www/html/schedule/scripts/.env.model /var/www/html/schedule/.env
+fi
 
 # Installation des dépendances composer
-echo COMPOSER = Install
+composer install
-export COMPOSER_ALLOW_SUPERUSER=1
-composer self-update --1 --quiet
-composer install --quiet
 
 php bin/console app:AppInit --env=prod
 php bin/console app:CronInit --env=prod

src/schedule-2.0/src/Controller/ReportController.php

@@ -166,19 +166,18 @@ class ReportController extends AbstractController
                     $st=clone $breakday->getStart();
                     while($st<$breakday->getEnd()) {
                         $idday=$st->format("Ymd");
-                        $tmp["events"][$idday]["events"][-2000]["allday"]=true;
+                        $tmp["events"][$idday]["allday"]=true;
-                        $tmp["events"][$idday]["events"][-2000]["colorday"]="#6c7a89";
+                        $tmp["events"][$idday]["colorday"]="#6c7a89";
-                        $tmp["events"][$idday]["events"][-2000]["descriptionday"]="Jour Férié";
+                        $tmp["events"][$idday]["descriptionday"]="Jour Férié";
 
                         $st->add(new \DateInterval('P1D'));
                     }
                 }
+
                 array_push($tbevents,$tmp);
             }
         }
 
-        //dump($tbevents);
-
         if($request->query->get('fgprint')) {
             $render = $this->renderView('Report/synthese.html.twig',[
                 "useheader"     => true,

src/schedule-2.0/src/Controller/RestController.php

@@ -64,10 +64,14 @@ class RestController extends AbstractFOSRestController
         }
 
         // On formate le tableau de jour
-        $start=new \Datetime('2022-03-07 00:00');
+        $mini=new \Datetime('2022-03-07 00:00');
+        $start=new \Datetime('00:00');
+        $start->modify("monday this week");
         $end=new \Datetime('00:00');
         $end->modify("last day of this month");  
         $end->modify("next sunday");            
+        $start->modify("previous month");
+        if($start<$mini) $start=clone $mini;
 
         $events = $em
                 ->createQueryBuilder('event')

src/schedule-2.0/symfony.lock

@@ -227,20 +227,6 @@
     "phpdocumentor/type-resolver": {
         "version": "1.1.0"
     },
-    "phpunit/phpunit": {
-        "version": "8.5",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "4.7",
-            "ref": "db276258424d15e572d35a4eb834b8f815662b25"
-        },
-        "files": [
-            ".env.test",
-            "phpunit.xml.dist",
-            "tests/bootstrap.php"
-        ]
-    },
     "psr/cache": {
         "version": "1.0.1"
     },