strat projects

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;
     }
 }

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();
     }