From 97f1b988bc4355dc0ee1d86b2c4f54ec3c9279ea Mon Sep 17 00:00:00 2001 From: Theo Weijmer Date: Mon, 15 Jan 2018 09:27:58 +0100 Subject: [PATCH] strat projects --- application/models/eloquent/Project.php | 33 +++-- application/models/eloquent/User.php | 15 +- application/views/modals/offer_modal.php | 82 ++++++++++- application/views/modals/project_modal.php | 20 +++ application/views/pages/offers_view.php | 8 +- application/views/pages/projects_view.php | 91 +++++++++++- application/views/partials/_js.php | 3 + application/views/partials/_modals.php | 1 + .../lib/dataservices/projectsDataservice.js | 47 +++++++ public/js/lib/modules/modals/offerModal.js | 32 +++++ public/js/lib/modules/modals/projectModal.js | 14 ++ .../js/lib/modules/projects/offersModule.js | 1 + .../js/lib/modules/projects/projectsModule.js | 129 ++++++++++++++++++ 13 files changed, 450 insertions(+), 26 deletions(-) create mode 100644 application/views/modals/project_modal.php create mode 100644 public/js/lib/dataservices/projectsDataservice.js create mode 100644 public/js/lib/modules/modals/projectModal.js create mode 100644 public/js/lib/modules/projects/projectsModule.js diff --git a/application/models/eloquent/Project.php b/application/models/eloquent/Project.php index e9c26e5..e8cd56c 100644 --- a/application/models/eloquent/Project.php +++ b/application/models/eloquent/Project.php @@ -16,23 +16,28 @@ class Project extends BaseModel { return $this->hasMany( 'Offer' ); } - public static function saveProject( $offerID, $offer ) + public function projectleader() { - $offer = (array) $offer; + return $this->belongsTo( 'User', 'projectleader_id' ); + } - $offer['startdate'] = date2mysql( $offer['startdate'] ); - $offer['accepteddate'] = date2mysql( $offer['accepteddate'] ); - $offer['rejectdate'] = date2mysql( $offer['rejectdate'] ); + public function customer() + { + return $this->belongsTo( 'Customer' ); + } - if ( $offerID == 0 ) - { - $offer = Offer::create( $offer ); - } - else - { - $offer = Offer::whereId( $offerID )->update( $offer ); - } + public static function getAllProjects( $archive = 'F' ) + { + $projects = Project::with( [ + 'projectleader' => function ( $q ) { + $q->selectRaw( "id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" ); + }] ) + ->with( 'customer' ); - return $offer['id']; + if($archive == 'F') $projects = $projects->whereArchive('F'); + + $projects = $projects->get(); + + return $projects; } } \ No newline at end of file diff --git a/application/models/eloquent/User.php b/application/models/eloquent/User.php index c62ef07..15325a2 100644 --- a/application/models/eloquent/User.php +++ b/application/models/eloquent/User.php @@ -18,7 +18,8 @@ class User extends BaseModel { public static function getAllUsers( $archive ) { - $users = User::orderBy( 'lastname' ); + $users = User::selectRaw("*, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname") + ->orderBy( 'lastname' ); if ( $archive == 'F' ) $users = $users->whereArchive( 'F' ); @@ -47,23 +48,23 @@ class User extends BaseModel { public static function saveUser( $userID, $user ) { - $user = (array)$user; + $user = (array) $user; - if( $userID == 0) + if ( $userID == 0 ) { - $user = User::create($user); + $user = User::create( $user ); } else { - $user = User::whereId($userID)->update($user); + $user = User::whereId( $userID )->update( $user ); } return $user['id']; } - public static function removeUser($userID) + public static function removeUser( $userID ) { - User::whereId($userID)->delete(); + User::whereId( $userID )->delete(); } diff --git a/application/views/modals/offer_modal.php b/application/views/modals/offer_modal.php index b6aff55..5ed6c7f 100644 --- a/application/views/modals/offer_modal.php +++ b/application/views/modals/offer_modal.php @@ -11,6 +11,49 @@
+
+ +
+
+ + + + +
+ + voer een offerte nummer in + +
+
+
+ +
+
+ +
+ + selecteer een offerteleider + +
+
+ +
+