reconf env.model

dicos/25_schedule.xml

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

src/schedule-2.0/composer.json

@@ -51,7 +51,10 @@
         "preferred-install": {
             "*": "dist"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "symfony/flex": true
+        }
     },
     "autoload": {
         "psr-4": {
@@ -72,6 +75,9 @@
         "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

@@ -0,0 +1,13 @@
+<?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,12 +6,13 @@ cd /var/www/html/schedule
 . scripts/proxy.sh
 
 # Mise en place du fichier d'environnement model
-if [ ! -f /var/www/html/schedule/.env ]; then
-    mv /var/www/html/schedule/scripts/.env.model /var/www/html/schedule/.env
-fi
+yes 2>/dev/null | cp /var/www/html/schedule/scripts/.env.model $DIR/.env
 
 # Installation des dépendances composer
-composer install
+echo 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,18 +166,19 @@ class ReportController extends AbstractController
                     $st=clone $breakday->getStart();
                     while($st<$breakday->getEnd()) {
                         $idday=$st->format("Ymd");
-                        $tmp["events"][$idday]["allday"]=true;
-                        $tmp["events"][$idday]["colorday"]="#6c7a89";
-                        $tmp["events"][$idday]["descriptionday"]="Jour Férié";
+                        $tmp["events"][$idday]["events"][-2000]["allday"]=true;
+                        $tmp["events"][$idday]["events"][-2000]["colorday"]="#6c7a89";
+                        $tmp["events"][$idday]["events"][-2000]["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,14 +64,10 @@ class RestController extends AbstractFOSRestController
         }
 
         // On formate le tableau de jour
-        $mini=new \Datetime('2022-03-07 00:00');
-        $start=new \Datetime('00:00');
-        $start->modify("monday this week");
+        $start=new \Datetime('2022-03-07 00:00');
         $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,6 +227,20 @@
     "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"
     },