Commit e4c32668 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Ajout des attributs, modification des affichages et modifications des établissements

parent 32318d53
Loading
Loading
Loading
Loading
+15 −0
Changes for doc/release-notes/MEL_logo/change.sql: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
alter table STRUCTURE add ADRESSE varchar2(1024)
/

alter table STRUCTURE add TELEPHONE varchar2(256)
/

alter table STRUCTURE add FAX varchar2(256)
/

alter table STRUCTURE add EMAIL varchar2(256)
/

alter table STRUCTURE add SITE_WEB varchar2(256)
/
+6 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Structure.dcm.xml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@
        <field name="ferme"      type="integer" column="EST_FERME"   nullable="false"/>
        <field name="cheminLogo" type="string" column="CHEMIN_LOGO" length="200" nullable="true"/>

        <field name="adresse"    type="string" column="ADRESSE"     length="1024" nullable="true"/>
        <field name="telephone"  type="string" column="TELEPHONE"   length="256"  nullable="true"/>
        <field name="fax"        type="string" column="FAX"         length="256"  nullable="true"/>
        <field name="email"      type="string" column="EMAIL"       length="256"  nullable="true"/>
        <field name="siteWeb"    type="string" column="SITE_WEB"    length="256"  nullable="true"/>

        <many-to-one field="typeStructure" target-entity="Application\Entity\Db\TypeStructure">
            <join-columns>
                <join-column name="TYPE_STRUCTURE_ID" referenced-column-name="ID"/>
+104 −0
Changes for module/Application/src/Application/Entity/Db/Structure.php: 104 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,20 @@ class Structure implements StructureInterface, HistoriqueAwareInterface, SourceA
    protected   $cheminLogo;
    protected   $ferme;

    /**
     * @var string $adresse
     * @var string $telephone
     * @var string $fax
     * @var string $email
     * @var string $siteWeb
     */

    protected $adresse;
    protected $telephone;
    protected $fax;
    protected $email;
    protected $siteWeb;

    /**
     * @var string
     */
@@ -359,4 +373,94 @@ class Structure implements StructureInterface, HistoriqueAwareInterface, SourceA
    {
        if (!$ferme) $this->ferme = 0; else $this->ferme = 1;
    }

    /**
     * @return string
     */
    public function getAdresse()
    {
        return $this->adresse;
    }

    /**
     * @param string $adresse
     * @return Structure
     */
    public function setAdresse($adresse)
    {
        $this->adresse = $adresse;
        return $this;
    }

    /**
     * @return string
     */
    public function getTelephone()
    {
        return $this->telephone;
    }

    /**
     * @param string $telephone
     * @return Structure
     */
    public function setTelephone($telephone)
    {
        $this->telephone = $telephone;
        return $this;
    }

    /**
     * @return string
     */
    public function getFax()
    {
        return $this->fax;
    }

    /**
     * @param string $fax
     * @return Structure
     */
    public function setFax($fax)
    {
        $this->fax = $fax;
        return $this;
    }

    /**
     * @return string
     */
    public function getEmail()
    {
        return $this->email;
    }

    /**
     * @param string $email
     * @return Structure
     */
    public function setEmail($email)
    {
        $this->email = $email;
        return $this;
    }

    /**
     * @return string
     */
    public function getSiteWeb()
    {
        return $this->siteWeb;
    }

    /**
     * @param string $siteWeb
     * @return Structure
     */
    public function setSiteWeb($siteWeb)
    {
        $this->siteWeb = $siteWeb;
        return $this;
    }
}
 No newline at end of file
+25 −0
Changes for module/Application/src/Application/Form/EtablissementForm.php: 25 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -45,6 +45,31 @@ class EtablissementForm extends Form
            ->setLabel("Code :")
        );

        $this->add((
        new Text('adresse'))
            ->setLabel("Adresse (sur une ligne) :")
        );

        $this->add((
        new Text('telephone'))
            ->setLabel("Téléphone :")
        );

        $this->add((
        new Text('fax'))
            ->setLabel("Fax :")
        );

        $this->add((
        new Text('email'))
            ->setLabel("Adresse électronique :")
        );

        $this->add((
        new Text('siteWeb'))
            ->setLabel("Site internet :")
        );

        $this->add(
            (new Checkbox('estMembre'))
                ->setLabel("Établissement membre")
+10 −0
Changes for module/Application/src/Application/Form/Hydrator/EtablissementHydrator.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ class EtablissementHydrator extends DoctrineObject
        $data['estAssocie'] = $etablissement->estAssocie();
        $data['cheminLogo'] = $etablissement->getCheminLogo();
        $data['estFerme'] = $etablissement->getStructure()->isFerme();
        $data['adresse'] = $etablissement->getStructure()->getAdresse();
        $data['telephone'] = $etablissement->getStructure()->getTelephone();
        $data['fax'] = $etablissement->getStructure()->getFax();
        $data['email'] = $etablissement->getStructure()->getEmail();
        $data['siteWeb'] = $etablissement->getStructure()->getSiteWeb();

        return $data;
    }
@@ -45,6 +50,11 @@ class EtablissementHydrator extends DoctrineObject
        $object->setSigle($data['sigle']);
        $object->setDomaine($data['domaine']);
        $object->getStructure()->setCode($data['code']);
        $object->getStructure()->setAdresse($data['adresse']);
        $object->getStructure()->setTelephone($data['telephone']);
        $object->getStructure()->setFax($data['fax']);
        $object->getStructure()->setEmail($data['email']);
        $object->getStructure()->setSiteWeb($data['siteWeb']);
        $object->setEstMembre($data['estMembre']);
        $object->setEstAssocie($data['estAssocie']);
        $object->setCheminLogo($data['cheminLogo']);
Loading