From 4e97ec00c7750b2c1ce572707c544c4a20187243 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 24 Dec 2017 17:23:43 +0200
Subject: [PATCH] Added new project fields

---
 app/Ninja/Datatables/ProjectDatatable.php    | 15 ++++++++++++++-
 app/Ninja/Repositories/ProjectRepository.php |  3 +++
 resources/views/projects/edit.blade.php      |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/Ninja/Datatables/ProjectDatatable.php b/app/Ninja/Datatables/ProjectDatatable.php
index 20b52c98ccfd..85f9cb142f05 100644
--- a/app/Ninja/Datatables/ProjectDatatable.php
+++ b/app/Ninja/Datatables/ProjectDatatable.php
@@ -21,7 +21,8 @@ class ProjectDatatable extends EntityDatatable
                         return $model->project;
                     }
 
-                    return link_to("projects/{$model->public_id}/edit", $model->project)->toHtml();
+                    $str = link_to("projects/{$model->public_id}/edit", $model->project)->toHtml();
+                    return $this->addNote($str, $model->private_notes);
                 },
             ],
             [
@@ -38,6 +39,18 @@ class ProjectDatatable extends EntityDatatable
                     }
                 },
             ],
+            [
+                'due_date',
+                function ($model) {
+                    return Utils::fromSqlDate($model->due_date);
+                },
+            ],
+            [
+                'budgeted_hours',
+                function ($model) {
+                    return $model->budgeted_hours;
+                },
+            ],
             [
                 'task_rate',
                 function ($model) {
diff --git a/app/Ninja/Repositories/ProjectRepository.php b/app/Ninja/Repositories/ProjectRepository.php
index d9119fa93e9f..b25688335539 100644
--- a/app/Ninja/Repositories/ProjectRepository.php
+++ b/app/Ninja/Repositories/ProjectRepository.php
@@ -38,6 +38,9 @@ class ProjectRepository extends BaseRepository
                     'projects.deleted_at',
                     'projects.task_rate',
                     'projects.is_deleted',
+                    'projects.due_date',
+                    'projects.budgeted_hours',
+                    'projects.private_notes',
                     DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
                     'clients.user_id as client_user_id',
                     'clients.public_id as client_public_id'
diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php
index aa436454e155..63f49421e1ef 100644
--- a/resources/views/projects/edit.blade.php
+++ b/resources/views/projects/edit.blade.php
@@ -43,7 +43,7 @@
 	                        ->addGroupClass('due_date')
 	                        ->append('<i class="glyphicon glyphicon-calendar"></i>') !!}
 
-				{!! Former::text('budgeted_hours')->type('number') !!}
+				{!! Former::text('budgeted_hours') !!}
 
 				{!! Former::text('task_rate')
 						->placeholder($project && $project->client->task_rate ? $project->client->present()->taskRate : $account->present()->taskRate)