diff --git a/Admin/Install/db.json b/Admin/Install/db.json index fb357bb..3c7b4d4 100644 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -36,8 +36,13 @@ "type": "INT", "null": false }, - "projectmanagement_project_budget": { - "name": "projectmanagement_project_budget", + "projectmanagement_project_budgetcosts": { + "name": "projectmanagement_project_budgetcosts", + "type": "INT", + "null": false + }, + "projectmanagement_project_budgetearnings": { + "name": "projectmanagement_project_budgetearnings", "type": "INT", "null": false }, @@ -56,6 +61,11 @@ "type": "DATETIME", "null": false }, + "projectmanagement_project_endestimated": { + "name": "projectmanagement_project_endestimated", + "type": "DATETIME", + "null": false + }, "projectmanagement_project_progress": { "name": "projectmanagement_project_progress", "type": "INT", diff --git a/Models/Project.php b/Models/Project.php index 84a4048..d4613e3 100644 --- a/Models/Project.php +++ b/Models/Project.php @@ -87,10 +87,10 @@ class Project /** * Calendar. * - * @var Calendar + * @var int|Calendar * @since 1.0.0 */ - private Calendar $calendar; + private $calendar; /** * Current total costs. @@ -185,14 +185,15 @@ class Project $this->end = new \DateTime('now'); $this->end->modify('+1 month'); - $this->estimatedEnd = clone $this->end; + $this->endEstimated = clone $this->end; $this->createdAt = new \DateTime('now'); $this->calendar = new Calendar(); - $this->costs = new Money(); - $this->budget = new Money(); - $this->earnings = new Money(); + $this->costs = new Money(); + $this->budgetCosts = new Money(); + $this->budgetEarnings = new Money(); + $this->earnings = new Money(); $this->setName($name); }