Commit 26be322b authored by Thomas Hamel's avatar Thomas Hamel
Browse files

resolution du pb lors de l'initialisation du form

parent 428a1720
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Admission/src/Admission/Entity/Db/Verification.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class Verification implements HistoriqueAwareInterface
     */
    private $document;

    private ?bool $estComplet = false;
    private ?bool $estComplet = null;

    /**
     * Set commentaire.
+0 −218
Changes for module/Admission/src/Admission/Entity/Db/Verification.php~: 0 added lines, 218 removed lines.
Original line number Diff line number Diff line
<?php

namespace Admission\Entity\Db;

use Individu\Entity\Db\Individu;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;

/**
 * Verification
 */
class Verification implements HistoriqueAwareInterface
{
    use HistoriqueAwareTrait;

    /**
     * @var string|null
     */
    private $commentaire;

    /**
     * @var int
     */
    private $id;

    /**
     * @var Individu
     */
    private $individu;

    private ?Etudiant $etudiant = null;

    /**
     * @var Inscription
     */
    private $inscription;

    /**
     * @var Financement
     */
    private $financement;

    /**
     * @var Document
     */
    private $document;

    private ?bool $estComplet = false;

    /**
     * Set commentaire.
     *
     * @param string|null $commentaire
     *
     * @return Verification
     */
    public function setCommentaire($commentaire = null)
    {
        $this->commentaire = $commentaire;

        return $this;
    }

    /**
     * Get commentaire.
     *
     * @return string|null
     */
    public function getCommentaire(): ?string
    {
        return $this->commentaire;
    }

    public function getEstComplet(): ?bool
    {
        return $this->estComplet;
    }

    public function setEstComplet(?bool $estComplet): void
    {
        $this->estComplet = $estComplet;
    }

    /**
     * Get id.
     *
     * @return int
     */
    public function getId()
    {
        return $this->id;
    }

    /**
     * Set individu.
     *
     * @param Individu|null $individu
     *
     * @return Verification
     */
    public function setIndividu(Individu $individu = null)
    {
        $this->individu = $individu;

        return $this;
    }

    /**
     * Get individu.
     *
     * @return Individu|null
     */
    public function getIndividu()
    {
        return $this->individu;
    }

    /**
     * Set etudiant.
     *
     * @param Etudiant|null $etudiant
     *
     * @return Verification
     */
    public function setEtudiant(Etudiant $etudiant = null)
    {
        $this->etudiant = $etudiant;

        return $this;
    }

    /**
     * Get etudiant.
     *
     * @return Etudiant|null
     */
    public function getEtudiant()
    {
        return $this->etudiant;
    }

    /**
     * Set inscription.
     *
     * @param Inscription|null $inscription
     *
     * @return Verification
     */
    public function setInscription(Inscription $inscription = null)
    {
        $this->inscription = $inscription;

        return $this;
    }

    /**
     * Get inscription.
     *
     * @return Inscription|null
     */
    public function getInscription()
    {
        return $this->inscription;
    }

    /**
     * Set financement.
     *
     * @param Financement|null $financement
     *
     * @return Verification
     */
    public function setFinancement(Financement $financement = null)
    {
        $this->financement = $financement;

        return $this;
    }

    /**
     * Get financement.
     *
     * @return Financement|null
     */
    public function getFinancement()
    {
        return $this->financement;
    }

    /**
     * Set document.
     *
     * @param Document|null $document
     *
     * @return Verification
     */
    public function setDocument(Document $document = null)
    {
        $this->document = $document;

        return $this;
    }

    /**
     * Get document.
     *
     * @return Document|null
     */
    public function getDocument()
    {
        return $this->document;
    }

    public function __toString(): string
    {
        return "Vérification : ".$this->id;
    }
}
+2 −4
Changes for module/Admission/view/admission/admission/partial/documentInfos.phtml: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -28,18 +28,16 @@ $canNotifierCommentairesAjoutesAdmission = $this->isAllowed($admission, Admissi
$canModifierAdmission  =
    $this->isAllowed($admission,AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION) ||
    $this->isAllowed($admission,AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION);
if(!empty($admission)){
    if(!$canModifierAdmission){
if(!empty($admission) && !$canModifierAdmission) {
    foreach ($fieldset->getElements() as $element) {
        $element->setAttribute('readonly', true);
    }
}
}
$individu = $dataForm["etudiant"]["individu"];
?>

<script>
    var readOnly = <?php echo $canModifierAdmission ? '0' : '1'; ?>;
    var readOnly = <?php echo !empty($admission) && !$canModifierAdmission ? '1' : '0'; ?>;
    var documents = <?php echo json_encode($documents); ?>;
    var individuId = <?php echo $individu; ?>;
</script>
+2 −4
Changes for module/Admission/view/admission/admission/partial/etudiantInfos.phtml: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -27,16 +27,14 @@ $canModifierAdmission =
    $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION);

$fcg = $this->formControlGroup();
if(!empty($admission)){
    if(!$canModifierAdmission){
if(!empty($admission) && !$canModifierAdmission) {
    foreach ($fieldset->getElements() as $element) {
        $element->setAttribute('readonly', true);
    }
}
}
?>
<script>
    var readOnly = <?php echo $canModifierAdmission ? 0 : 1 ?>
    var readOnly = <?php echo !empty($admission) && !$canModifierAdmission ? 1 : 0 ?>
</script>
<div class="row_sous_partie">
    <div class="title_sous_partie">
+2 −4
Changes for module/Admission/view/admission/admission/partial/financementInfos.phtml: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -22,16 +22,14 @@ $canVerifierAdmission = $this->isAllowed($admission, AdmissionPrivileges::ADMIS
$canModifierAdmission  =
    $this->isAllowed($admission,AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION) ||
    $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION);
if(!empty($admission)){
    if(!$canModifierAdmission){
if(!empty($admission) && !$canModifierAdmission) {
    foreach ($fieldset->getElements() as $element) {
        $element->setAttribute('readonly', true);
    }
}
}
?>
<script>
        var readOnly = <?php echo $canModifierAdmission ? 0 : 1 ?>
    var readOnly = <?php echo !empty($admission) && !$canModifierAdmission ? 1 : 0 ?>
</script>
<div class="row_sous_partie">
    <div class="title_sous_partie">
Loading