s421507
/
eOSP2
2
0
Fork 2
Code Issues Pull Requests Releases Wiki Activity

OperationsController vehicles fix

This commit is contained in:
s421507 2020-02-27 02:04:39 +01:00
parent d0f557f638
commit 32486d50b0
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/workspace.xml
View File

@ -2,15 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="adc1032e-2c5f-4e68-bc22-d140f965f9d5" name="Default Changelist" comment=""> <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$/.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$/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -180,6 +173,7 @@
<workItem from="1578546881124" duration="357000" /> <workItem from="1578546881124" duration="357000" />
<workItem from="1578547239701" duration="71154000" /> <workItem from="1578547239701" duration="71154000" />
<workItem from="1579902704711" duration="32414000" /> <workItem from="1579902704711" duration="32414000" />
<workItem from="1582764640549" duration="784000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -203,9 +197,10 @@
<screen x="67" y="27" width="1853" height="1053" /> <screen x="67" y="27" width="1853" height="1053" />
</state> </state>
<state x="776" y="310" width="424" height="484" key="FileChooserDialogImpl/67.27.1853.1053@67.27.1853.1053" timestamp="1578547803408" /> <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"> <state x="482" y="276" key="com.intellij.ide.util.TipDialog" timestamp="1582764836356">
<screen x="67" y="27" width="1853" height="1053" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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"> <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" /> <screen x="67" y="27" width="1853" height="1053" />

4
app/Http/Controllers/operationsController.php
View File

@ -160,8 +160,8 @@ class operationsController extends Controller
for($count = 0; $count < count($operationDriver); $count++){ for($count = 0; $count < count($operationDriver); $count++){
$operationsTrucks = operationsTrucks::create([ $operationsTrucks = operationsTrucks::create([
'operationID' => $operations->id, 'operationID' => $operations->id,
'truckID' => $operationDriver[$count], 'truckID' => $operationVehicle[$count],
'driverID' => $operationVehicle[$count] 'driverID' => $operationDriver[$count]
]); ]);
} }