From 32486d50b0d1172bfcfad81920f3d3625af2bec1 Mon Sep 17 00:00:00 2001
From: s421507 <micrej@st.amu.edu.pl>
Date: Thu, 27 Feb 2020 02:04:39 +0100
Subject: [PATCH] OperationsController vehicles fix

---
 .idea/workspace.xml                           | 13 ++++---------
 app/Http/Controllers/operationsController.php |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 77a2a5e..b0db4a4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="adc1032e-2c5f-4e68-bc22-d140f965f9d5" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/database/migrations/2019_12_28_165307_add_softDelete_to_vehicles_table.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/VehiclesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/VehiclesController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Http/Controllers/operationsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/operationsController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/unit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/unit.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/userDecorations.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/userDecorations.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/userProfile.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/userProfile.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/userTrainings.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/userTrainings.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/vehicles.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/vehicles.blade.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -180,6 +173,7 @@
       <workItem from="1578546881124" duration="357000" />
       <workItem from="1578547239701" duration="71154000" />
       <workItem from="1579902704711" duration="32414000" />
+      <workItem from="1582764640549" duration="784000" />
     </task>
     <servers />
   </component>
@@ -203,9 +197,10 @@
       <screen x="67" y="27" width="1853" height="1053" />
     </state>
     <state x="776" y="310" width="424" height="484" key="FileChooserDialogImpl/67.27.1853.1053@67.27.1853.1053" timestamp="1578547803408" />
-    <state x="649" y="380" key="com.intellij.ide.util.TipDialog" timestamp="1579902711879">
-      <screen x="67" y="27" width="1853" height="1053" />
+    <state x="482" y="276" key="com.intellij.ide.util.TipDialog" timestamp="1582764836356">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
+    <state x="482" y="276" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1582764836356" />
     <state x="649" y="380" key="com.intellij.ide.util.TipDialog/67.27.1853.1053@67.27.1853.1053" timestamp="1579902711879" />
     <state x="647" y="170" width="683" height="764" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1579395082597">
       <screen x="67" y="27" width="1853" height="1053" />
diff --git a/app/Http/Controllers/operationsController.php b/app/Http/Controllers/operationsController.php
index 30f7175..d32a094 100644
--- a/app/Http/Controllers/operationsController.php
+++ b/app/Http/Controllers/operationsController.php
@@ -160,8 +160,8 @@ class operationsController extends Controller
         for($count = 0; $count < count($operationDriver); $count++){
             $operationsTrucks = operationsTrucks::create([
                 'operationID' => $operations->id,
-                'truckID' => $operationDriver[$count],
-                'driverID' => $operationVehicle[$count]
+                'truckID' => $operationVehicle[$count],
+                'driverID' => $operationDriver[$count]
             ]);
         }