Offrte gours

application/controllers/projects/EmployeeHoursController.php

@@ -51,6 +51,7 @@ class EmployeeHoursController extends MY_Controller {
         unset( $data['id'] );
         unset( $data['hourType'] );
         unset( $data['project_id'] );
+        if( $hourType == 'OFFERS' ) $data['offer_id'] = $projectID;
 
         $data['hourdate'] = date2mysql( $data['hourdate'] );
 

application/controllers/projects/OffersController.php

@@ -34,6 +34,13 @@ class OffersController extends MY_Controller {
         $this->json( $offers );
     }
 
+    public function getOffersWithoutProject()
+    {
+        $offersWithoutProject = Offer::getOffersWithoutProject();
+
+        $this->json( $offersWithoutProject);
+    }
+
     public function saveOffer()
     {
         $offerValidation = new OfferValidation();

application/controllers/projects/ProjectsController.php

@@ -79,11 +79,25 @@ class ProjectsController extends MY_Controller {
 
         Offer::whereId( $offerID )->update( ['project_id' => $project->id] );
 
-        Projectemployee::create( [
-            'project_id' => $project->id,
-            'user_id'    => $offer->offerleader_id,
-            'tarif'      => User::find( $offer->offerleader_id )->hourlyrate
-        ] );
+        Projectemployee::firstOrCreateProjectemployee( $offer->offerleader_id, $project->id );
+
+        $offerteHours = Employeehour::whereOfferId( $offerID )->get();
+        foreach ( $offerteHours as $offerteHour )
+        {
+            $projectemployee =
+                Projectemployee::firstOrCreateProjectemployee( $offerteHour->employee_id, $project->id );
+
+            $data = [
+                'projectemployee_id' => $projectemployee->id,
+                'hourtype_id'        => 10,
+                'hourdate'           => $offerteHour->hourdate,
+                'hours'              => $offerteHour->hours
+            ];
+
+            Projecthour::create( $data );
+
+            Employeehour::whereId( $offerteHour->id )->delete();
+        }
 
         $this->json( ['success' => TRUE, 'projectnumber' => $projectnumber] );
     }