improvements

src/TimesheetBundle/Entity/Activity.php

@@ -27,11 +27,18 @@ class Activity
     /**
      * @var integer
      *
-     * @ORM\Column(name="activityID", type="integer")
+     * @ORM\Column(name="id", type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $activityid;
+    private $id;
+
+    /**
+     * @var Project
+     *
+     * @ORM\ManyToOne(targetEntity="TimesheetBundle\Entity\Project", inversedBy="activities")
+     */
+    private $project;
 
     /**
      * @var string
@@ -52,7 +59,23 @@ class Activity
      *
      * @ORM\Column(name="visible", type="boolean", nullable=false)
      */
-    private $visible = '1';
+    private $visible = true;
+
+    /**
+     * @return Project
+     */
+    public function getProject()
+    {
+        return $this->project;
+    }
+
+    /**
+     * @param int $project
+     */
+    public function setProject($project)
+    {
+        $this->project = $project;
+    }
 
     /**
      * Set name
@@ -131,8 +154,16 @@ class Activity
      *
      * @return integer
      */
-    public function getActivityId()
+    public function getId()
     {
-        return $this->activityid;
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getName();
     }
 }

src/TimesheetBundle/Entity/Project.php

@@ -27,13 +27,14 @@ class Project
     /**
      * @var integer
      *
-     * @ORM\Column(name="projectID", type="integer")
+     * @ORM\Column(name="id", type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $projectid;
+    private $id;
 
     /**
+     * FIXME
      * @var integer
      *
      * @ORM\Column(name="customerID", type="integer", nullable=false)
@@ -59,14 +60,21 @@ class Project
      *
      * @ORM\Column(name="visible", type="boolean", nullable=false)
      */
-    private $visible = '1';
+    private $visible = true;
 
     /**
      * @var string
      *
      * @ORM\Column(name="budget", type="decimal", precision=10, scale=2, nullable=true)
      */
-    private $budget = '0.00';
+    private $budget = 0.00;
+
+    /**
+     * @var Activity[]
+     *
+     * @ORM\OneToMany(targetEntity="TimesheetBundle\Entity\Activity", mappedBy="project")
+     */
+    private $activities;
 
     /**
      * Set customerid
@@ -193,8 +201,24 @@ class Project
      *
      * @return integer
      */
-    public function getProjectId()
+    public function getId()
     {
-        return $this->projectid;
+        return $this->id;
+    }
+
+    /**
+     * @return Activity[]
+     */
+    public function getActivities()
+    {
+        return $this->activities;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getName();
     }
 }

src/TimesheetBundle/Entity/Timesheet.php

@@ -18,7 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
  * Timesheet entity.
  *
  * @ORM\Entity(repositoryClass="TimesheetBundle\Repository\TimesheetRepository")
- * @ORM\Table(name="timeSheet", indexes={@ORM\Index(columns={"userID"}), @ORM\Index(columns={"projectID"}), @ORM\Index(name="activityID", columns={"activityID"})})
+ * @ORM\Table(name="timeSheet", indexes={@ORM\Index(columns={"userID"}), @ORM\Index(name="activity", columns={"activity"})})
  *
  * @author Kevin Papst <kevin@kevinpapst.de>
  */
@@ -46,7 +46,7 @@ class Timesheet
     private $duration = '0';
 
     /**
-     * @var integer
+     * @var User
      *
      * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User")
      * @ORM\JoinColumn(name="userID", referencedColumnName="userID")
@@ -56,16 +56,10 @@ class Timesheet
     /**
      * @var integer
      *
-     * @ORM\Column(name="projectID", type="integer", nullable=false)
+     * @ORM\ManyToOne(targetEntity="TimesheetBundle\Entity\Activity")
+     * @ORM\JoinColumn(name="activity", referencedColumnName="id")
      */
-    private $projectid;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="activityID", type="integer", nullable=false)
-     */
-    private $activityid;
+    private $activity;
 
     /**
      * @var string
@@ -258,40 +252,16 @@ class Timesheet
         return $this->user;
     }
 
-    /**
-     * Set projectid
-     *
-     * @param integer $projectid
-     *
-     * @return Timesheet
-     */
-    public function setProjectid($projectid)
-    {
-        $this->projectid = $projectid;
-
-        return $this;
-    }
-
-    /**
-     * Get projectid
-     *
-     * @return integer
-     */
-    public function getProjectid()
-    {
-        return $this->projectid;
-    }
-
     /**
      * Set activityid
      *
-     * @param integer $activityid
+     * @param integer $activity
      *
      * @return Timesheet
      */
-    public function setActivityid($activityid)
+    public function setActivity($activity)
     {
-        $this->activityid = $activityid;
+        $this->activity = $activity;
 
         return $this;
     }
@@ -301,9 +271,9 @@ class Timesheet
      *
      * @return integer
      */
-    public function getActivityid()
+    public function getActivity()
     {
-        return $this->activityid;
+        return $this->activity;
     }
 
     /**