Commit 6e64f609 authored by Thomas Hamel's avatar Thomas Hamel Committed by Bertrand Gauthier
Browse files

Module Formation : Amélioration de l'UI concernant l'affichage des inscrits à...

Module Formation : Amélioration de l'UI concernant l'affichage des inscrits à une session de formation
parent e5ce7524
Loading
Loading
Loading
Loading
+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Journal des modifications
-----
- Module Formation : Ajout d'un tri pour les individus sur l'écran Inscriptions
- Module Formation : Ajout d'un bouton sur la fiche d'une session pour envoyer la feuille d'émargement aux formateurs
- Module Formation : Amélioration de l'UI concernant l'affichage des inscrits à une session de formation

9.2.1
-----
+3 −0
Changes for module/Formation/config/module.config.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -94,5 +94,8 @@ return array(
        'stylesheets' => [
            '071_formation' => '/css/formation.css',
        ],
        'head_scripts' => [
            '080_formation' => "/js/formation.js",
        ]
    ],
);
+31 −8
Changes for module/Formation/src/Formation/View/Helper/partial/inscription.phtml: 31 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -31,11 +31,29 @@ $these = current($doctorant->getTheses());

?>

<li>
    <?php
<div class="card doctorant-card <?php if ($inscription->estHistorise()) echo "historise"; ?>"
     <?php if($inscription->getDescription()) : ?>
        data-bs-toggle='tooltip' data-bs-placement="right" title="Motif : <?php echo strip_tags($inscription->getDescription()); ?>"
     <?php endif; ?>
>
    <div class="card-body d-flex align-items-center">
        <div class="doctorant-icon">
            <div class="icon">
                <i class="fas fa-user-graduate"></i>
                <?php foreach ($doctorant->getTheses() as $these):
                    if ($these->getEtatThese() === These::ETAT_EN_COURS and $these->estNonHistorise()): ?>
                        <span class="badge">
                            <?php echo "D" . $these->getAnneesUnivInscriptionCount(AnneeUniv::fromPremiereAnnee($annee->getPremiereAnnee())); ?>
                        </span>
                    <?php endif; ?>
                <?php endforeach; ?>
            </div>
        </div>

    echo $doctorant->getIndividu()->getNomComplet(); ?>
    <span class=" <?php if ($inscription->estHistorise()) echo "historisee"; ?> " data-bs-toggle='tooltip' data-bs-placement="right" title="<?php echo strip_tags($inscription->getDescription()); ?>">
        <div class="doctorant-info flex-grow-1">
            <div class="doctorant-name"><?php echo $doctorant->getIndividu()->getNomComplet(); ?></div>
            <div class="doctorant-details">
                <span>
                    <?php foreach ($doctorant->getTheses() as $these) {
                        if ($these->getEtatThese() === These::ETAT_EN_COURS and $these->estNonHistorise()) {
                            echo "<br/>";
@@ -61,11 +79,16 @@ $these = current($doctorant->getTheses());
                    }
                    ?>
                </span>
    <br/>
            </div>
            <div class="doctorant-extra">
                Inscrit le <?php echo $inscription->getHistoCreation()->format("d/m/Y à H:i"); ?>
                <?php if ($inscription->getSursisEnquete()) : ?>
                    <br><b>Possède un sursis personnel de <?= $inscription->getSursisEnquete() ?> jours pour répondre à l'enquête</b>
                <?php endif; ?>
            </div>
        </div>

        <div class="doctorant-actions">
            <?php if ($actionListePrincipale OR $actionListeComplementaire OR $actionHistoriser OR $actionSupprimer) : ?>
                <br/>
                <?php if ($inscription->estNonHistorise() AND $actionListePrincipale) : ?>
@@ -129,6 +152,6 @@ $these = current($doctorant->getTheses());
                        <span class="fa fa-bomb text-danger"></span></a>
                <?php endif; ?>
            <?php endif; ?>
</li>

        </div>
    </div>
</div>
 No newline at end of file
+23 −8
Changes for module/Formation/view/formation/session/afficher.phtml: 23 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace();
        Envoyer les inscrits aux formateurs
    </a>
<?php endif; ?>
<div class="index-result">
<div class="index-result mt-4">
<?php if (empty($inscrits)) : ?>
    <em>Aucun·e doctorant·e inscrit·e à cette session de formation.</em>
<?php else : ?>
@@ -494,7 +494,8 @@ echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace();
            (<?php echo count($listeNonClasseeTrue); ?> inscriptions)
        </h3>

        <ul>
        <div class="doctorant-cards-container" id="inscrits-non-classes-container">
            <div class="doctorant-cards-wrapper">
                <?php foreach ($listeNonClassee as $inscrit) : ?>
                    <?php echo $this->inscription($inscrit, [
                        'action-liste-principale' => ($session->getDateDebut() !== null AND $canModifierInscription),
@@ -504,7 +505,11 @@ echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace();
                        'anneeUniv' => $anneeUniv
                    ]); ?>
                <?php endforeach; ?>
        </ul>
            </div>
            <div class="text-center mt-3">
                <button id="show-more-non-classes" class="btn btn-primary show-more-inscrits-button ">Afficher tout</button>
            </div>
        </div>

    </div>
    <div class="col-md-4">
@@ -513,7 +518,8 @@ echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace();
            (<?php echo count($listePrincipaleTrue); ?>/<?php echo $session->getTailleListePrincipale(); ?>)
        </h3>

        <ul>
        <div class="doctorant-cards-container" id="inscrits-liste-principale-container">
            <div class="doctorant-cards-wrapper">
                <?php foreach ($listePrincipale as $inscription) : ?>
                    <?php echo $this->inscription($inscription, [
                            'action-liste-principale' => false,
@@ -523,7 +529,12 @@ echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace();
                            'anneeUniv' => $anneeUniv
                    ]); ?>
                <?php endforeach; ?>
        </ul>
            </div>
            <div class="text-center mt-3">
                <button id="show-more-principale" class="btn btn-primary show-more-inscrits-button">Afficher tout</button>
            </div>
        </div>

    </div>

    <div class="col-md-4">
@@ -532,7 +543,8 @@ echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace();
            (<?php echo count($listeComplementaireTrue); ?>/<?php echo $session->getTailleListeComplementaire(); ?>)
        </h3>

        <ul>
        <div class="doctorant-cards-container" id="inscrits-liste-compl-container">
            <div class="doctorant-cards-wrapper">
                <?php /** @var Inscription $inscription */ ?>
                <?php foreach ($listeComplementaire as $inscription) : ?>
                    <?php echo $this->inscription($inscription, [
@@ -543,7 +555,11 @@ echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace();
                            'anneeUniv' => $anneeUniv
                    ]); ?>
                <?php endforeach; ?>
        </ul>
            </div>
            <div class="text-center mt-3">
                <button id="show-more-compl" class="btn btn-primary show-more-inscrits-button">Afficher tout</button>
            </div>
        </div>
    </div>
</div>

@@ -572,4 +588,3 @@ echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace();
        cursor: not-allowed;
    }
</style>
 No newline at end of file
+105 −0
Changes for public/css/app.css: 105 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -983,4 +983,109 @@ p.avis-complem {
.nav-item:has(+ .nav-item .divider):has(> .divider) {
  display: none; }

/******************** Inscription (ViewHelper) **********************/
/* Card doctorant  */
.doctorant-card {
  margin: 8px 0;
  border-radius: 6px;
  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); }

.doctorant-card .doctorant-icon {
  margin-right: 10px; }

.doctorant-card .doctorant-icon .icon {
  position: relative;
  width: 40px;
  height: 40px;
  background-color: var(--secondary-color);
  border-radius: 50%;
  display: flex;
  justify-content: center;
  align-items: center;
  font-size: 20px;
  color: #fff;
  padding: unset; }

.doctorant-card .doctorant-icon .badge {
  position: absolute;
  top: -10px;
  right: -6px;
  background-color: var(--primary-color);
  color: #fff;
  border-radius: 50%;
  padding: 4px 4px;
  font-size: 12px;
  font-weight: bold; }

.doctorant-card .doctorant-info {
  margin-left: 10px;
  line-height: 1.4; }

.doctorant-card .doctorant-name {
  font-size: 15px;
  font-weight: bold; }

.doctorant-card .doctorant-actions {
  display: flex;
  gap: 6px; }

/* Container global pour centrer le bouton et organiser les cartes */
.doctorant-cards-container {
  position: relative;
  max-width: 600px;
  margin: 0 auto; }

/* Styles des cartes */
.doctorant-card {
  display: none;
  /* Masquer toutes les cartes par défaut */
  opacity: 0;
  transform: translateY(10px);
  transition: opacity 0.3s ease, transform 0.3s ease; }

/* Carte visible */
.doctorant-card.visible {
  display: block;
  opacity: 1;
  transform: translateY(0); }

/* Carte preview (partiellement visible sous le bouton) */
.doctorant-card.preview {
  display: block;
  opacity: 0.6;
  margin-bottom: 80px; }

/* Bouton "Afficher tout" */
.show-more-inscrits-button {
  display: none;
  position: absolute;
  bottom: 40px;
  left: 50%;
  transform: translate(-50%, 50%);
  z-index: 10; }

/* Inscriptions historisées */
.doctorant-card.historise {
  background-color: #f5f5f5;
  /* Fond plus clair pour signaler */
  border-color: #c0c0c0;
  /* Bordures grises */
  color: #6c757d;
  /* Texte grisé */ }

.doctorant-card.historise .doctorant-icon .icon, .doctorant-card.historise .doctorant-icon .badge {
  background-color: #d3d3d3;
  /* Icône grisée */
  color: #9e9e9e; }

.doctorant-card.historise .doctorant-actions .btn {
  opacity: 0.6;
  /* Boutons légèrement estompés */
  pointer-events: none;
  /* Désactive les actions */ }

.doctorant-card.historise .doctorant-name {
  text-decoration: line-through;
  /* Nom barré pour signaler l'historisation */ }

/*# sourceMappingURL=app.css.map */
Loading