Commit 62ca17f0 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

suppression de coquilles, modifs css

parent e38bddaa
Loading
Loading
Loading
Loading
+2 −2
Changes for module/Application/src/Application/View/Helper/Etat/EtatViewHelper.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ class EtatViewHelper extends AbstractHelper
                $colorEtat = "grey";
                break;
            case Etat::CODE_VALIDE :
                $colorEtat = "#2EA662";
                $colorEtat = "var(--success-color)";
                break;
            case These::ETAT_SOUTENUE :
                if(!$resultat){
                    $colorEtat = "var(--primary-color)";
                }else{
                    $colorEtat = $resultat === 1 ? "#2EA662" : "#d23544";
                    $colorEtat = $resultat === 1 ? "var(--success-color)" : "#d23544";
                }
                break;
            default:
+2 −9
Changes for module/Depot/src/Depot/Controller/Factory/FichierHDRControllerFactory.php: 2 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -3,24 +3,20 @@
namespace Depot\Controller\Factory;

use Application\EventRouterReplacer;
use Validation\Service\ValidationThese\ValidationTheseService;
use Depot\Controller\FichierHDRController;
use Depot\Controller\FichierTheseController;
use Depot\Service\FichierHDR\FichierHDRService;
use Depot\Service\FichierThese\FichierTheseService;
use Depot\Service\Notification\DepotNotificationFactory;
use HDR\Service\HDRService;
use Notification\Service\NotifierService;
use Depot\Service\These\DepotService;
use Depot\Service\Validation\DepotValidationService;
use Fichier\Service\Fichier\FichierService;
use Fichier\Service\Fichier\FichierStorageService;
use Fichier\Service\VersionFichier\VersionFichierService;
use HDR\Service\HDRService;
use Individu\Service\IndividuService;
use Interop\Container\ContainerInterface;
use Laminas\EventManager\EventManager;
use Laminas\Router\Http\TreeRouteStack;
use These\Service\These\TheseService;
use Notification\Service\NotifierService;

class FichierHDRControllerFactory
{
@@ -42,7 +38,6 @@ class FichierHDRControllerFactory
         * @var VersionFichierService $versionFichierService
         * @var NotifierService       $notificationService
         * @var IndividuService       $individuService
         * @var ValidationTheseService     $validationService
         * @var EventManager          $eventManager
         */
        $hdrService = $container->get(HDRService::class);
@@ -52,7 +47,6 @@ class FichierHDRControllerFactory
        $versionFichierService = $container->get('VersionFichierService');
        $notificationService = $container->get(NotifierService::class);
        $individuService = $container->get(IndividuService::class);
        $validationService = $container->get(ValidationTheseService::class);
        $eventRouterReplacer = new EventRouterReplacer($httpRouter, $cliConfig);
        $eventManager = $container->get('EventManager');

@@ -64,7 +58,6 @@ class FichierHDRControllerFactory
        $controller->setVersionFichierService($versionFichierService);
        $controller->setNotifierService($notificationService);
        $controller->setIndividuService($individuService);
        $controller->setValidationTheseService($validationService);
        $controller->setEventRouterReplacer($eventRouterReplacer);

        /** @var DepotService $depotService */
+0 −9
Changes for module/Depot/src/Depot/Controller/FichierHDRController.php: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -6,27 +6,19 @@ use Application\Controller\AbstractController;
use Application\EventRouterReplacerAwareTrait;
use Application\Filter\IdifyFilterAwareTrait;
use Application\RouteMatch;
use Depot\Event\EventsInterface;
use Depot\Service\FichierHDR\FichierHDRServiceAwareTrait;
use Depot\Service\FichierThese\Exception\DepotImpossibleException;
use Depot\Service\Notification\DepotNotificationFactoryAwareTrait;
use Depot\Service\These\DepotServiceAwareTrait;
use Depot\Service\Validation\DepotValidationServiceAwareTrait;
use Exception;
use Fichier\Entity\Db\Fichier;
use Fichier\Entity\Db\VersionFichier;
use Fichier\Service\Fichier\FichierServiceAwareTrait;
use Fichier\Service\Fichier\FichierStorageServiceAwareTrait;
use Fichier\Service\Storage\Adapter\Exception\StorageAdapterException;
use Fichier\Service\VersionFichier\VersionFichierServiceAwareTrait;
use HDR\Service\HDRServiceAwareTrait;
use Individu\Service\IndividuServiceAwareTrait;
use Laminas\Form\Element\Hidden;
use Laminas\View\Model\JsonModel;
use Laminas\View\Model\ViewModel;
use Notification\Service\NotifierServiceAwareTrait;
use UnicaenApp\Exception\RuntimeException;
use Validation\Service\ValidationThese\ValidationTheseServiceAwareTrait;

class FichierHDRController extends AbstractController
{
@@ -40,7 +32,6 @@ class FichierHDRController extends AbstractController
    use NotifierServiceAwareTrait;
    use DepotNotificationFactoryAwareTrait;
    use IndividuServiceAwareTrait;
    use ValidationTheseServiceAwareTrait;
    use DepotValidationServiceAwareTrait;
    use EventRouterReplacerAwareTrait;

+0 −6
Changes for module/Depot/src/Depot/Entity/Db/FichierHDR.php: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -16,12 +16,6 @@ use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait;
class FichierHDR implements ResourceInterface, HistoriqueAwareInterface
{
    use HistoriqueAwareTrait;
    /**
     * Tag marquant un fichier qui résulte d'un deuxième dépôt (après correction).
     *
     * 'V2' = Deuxième dépôt (après corrections)
     */
    const TAG_DEUXIEME_DEPOT = 'V2';

    const RESOURCE_ID = 'FichierHDR';

+0 −16
Changes for module/HDR/src/HDR/Entity/Db/HDR.php: 0 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -633,22 +633,6 @@ class HDR implements HistoriqueAwareInterface, HasHorodatagesInterface, Resource
        return self::$etatsLibelles[$this->etatHDR];
    }

    public function hasVersionInitiale() {

        /** @var FichierHDR $fichier */
        foreach ($this->fichierHDRs as $fichierHDR) {
            /** @var Fichier $fichier */
            $fichier = $fichierHDR->getFichier();
            $nature = $fichier->getNature()->getCode();
            $version = $fichier->getVersion()->getCode();
            if ($fichier->getHistoDestruction() === null
                && $nature === NatureFichier::CODE_THESE_PDF
                && $version === VersionFichier::CODE_ORIG)
                return $fichierHDR;
        }
        return null;
    }

    /**
     * Retourne :
     * - <code>1</code> si "admis" ;
Loading