Rename end field in length

Cleanup

diff --git a/Entity/Application.php b/Entity/Application.php
index c9229328a4d214159a13564c2580d25a279996e3..a31aa92e966d0205b70f8c08398c14764ee1375d 100644 (file)
--- a/Entity/Application.php
+++ b/Entity/Application.php
@@ -21,6 +21,11 @@ class Application {
         */
        private $updated;
 
         */
        private $updated;
 

+
+       //TODO: ajouter un champ score à replir lors de l'attribution d'une session
+       //XXX: champ float avec une bonne capacité en décimale
+
+

        /**
         * @var \Doctrine\Common\Collections\Collection
         */
        /**
         * @var \Doctrine\Common\Collections\Collection
         */

diff --git a/Entity/Session.php b/Entity/Session.php
index 72d1f33f83843f3db7c31ba6266712d72d5a477f..6a0f13895c3331ff2680ce9a05cc61814d258c25 100644 (file)
--- a/Entity/Session.php
+++ b/Entity/Session.php
@@ -24,7 +24,7 @@ class Session {
        /**
         * @var \DateTime
         */
        /**
         * @var \DateTime
         */

-       private $end;
+       private $length;

 
        /**
         * @var \DateTime
 
        /**
         * @var \DateTime


@@ -37,9 +37,9 @@ class Session {
        private $updated;
 
        /**
        private $updated;
 
        /**

-        * @var \Doctrine\Common\Collections\Collection
+        * @var \Rapsys\AirBundle\Entity\Application

         */
         */

-       private $applications;
+       private $application;

 
        /**
         * @var \Rapsys\AirBundle\Entity\Location
 
        /**
         * @var \Rapsys\AirBundle\Entity\Location


@@ -47,9 +47,14 @@ class Session {
        private $location;
 
        /**
        private $location;
 
        /**

-        * @var \Rapsys\AirBundle\Entity\Application
+        * @var \Rapsys\AirBundle\Entity\Slot

         */
         */

-       private $application;
+       private $slot;
+
+       /**
+        * @var \Doctrine\Common\Collections\Collection
+        */
+       private $applications;

 
        /**
         * Constructor
 
        /**
         * Constructor


@@ -112,25 +117,25 @@ class Session {
        }
 
        /**
        }
 
        /**

-        * Set end
+        * Set length

         *
         *

-        * @param \DateTime $end
+        * @param \DateTime $length

         *
         * @return Session
         */
         *
         * @return Session
         */

-       public function setEnd($end) {
-               $this->end = $end;
+       public function setLength($length) {
+               $this->length = $length;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Get end
+        * Get length

         *
         * @return \DateTime
         */
         *
         * @return \DateTime
         */

-       public function getEnd() {
-               return $this->end;
+       public function getLength() {
+               return $this->length;

        }
 
        /**
        }
 
        /**


@@ -229,11 +234,6 @@ class Session {
        public function getLocation() {
                return $this->location;
        }
        public function getLocation() {
                return $this->location;
        }

-       /**
-        * @var \Rapsys\AirBundle\Entity\Slot
-        */
-       private $slot;
-

 
        /**
         * Set slot
 
        /**
         * Set slot