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

Poprawienie widokow i kilku bugow - pojazdy

Browse Source
This commit is contained in:
czup 2020-01-30 17:34:37 +01:00
parent b9298ee626
commit 0904d1da4c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.idea/workspace.xml
View File

@ -2,15 +2,15 @@
<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$/app/operations.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/operations.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$/database/migrations/2019_11_12_235707_create_operations_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_11_12_235707_create_operations_table.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/operation.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/operation.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/operationAdd.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/operationAdd.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/trainings.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/trainings.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" />
<change beforePath="$PROJECT_DIR$/resources/views/trainingsAddFireFighters.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/trainingsAddFireFighters.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.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" />
@ -144,6 +144,9 @@
<property name="nodejs_package_manager_path" value="npm" /> <property name="nodejs_package_manager_path" value="npm" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/database/migrations" />
</key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/database/migrations/x" /> <recent name="$PROJECT_DIR$/database/migrations/x" />
<recent name="$PROJECT_DIR$" /> <recent name="$PROJECT_DIR$" />
@ -176,7 +179,7 @@
<workItem from="1562881688607" duration="256000" /> <workItem from="1562881688607" duration="256000" />
<workItem from="1578546881124" duration="357000" /> <workItem from="1578546881124" duration="357000" />
<workItem from="1578547239701" duration="71154000" /> <workItem from="1578547239701" duration="71154000" />
<workItem from="1579902704711" duration="802000" /> <workItem from="1579902704711" duration="32414000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -208,9 +211,9 @@
<screen x="67" y="27" width="1853" height="1053" /> <screen x="67" y="27" width="1853" height="1053" />
</state> </state>
<state x="647" y="170" width="683" height="764" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/67.27.1853.1053@67.27.1853.1053" timestamp="1579395082597" /> <state x="647" y="170" width="683" height="764" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/67.27.1853.1053@67.27.1853.1053" timestamp="1579395082597" />
<state x="657" y="253" key="run.anything.popup" timestamp="1579650286067"> <state x="657" y="253" key="run.anything.popup" timestamp="1580393897949">
<screen x="67" y="27" width="1853" height="1053" /> <screen x="67" y="27" width="1853" height="1053" />
</state> </state>
<state x="657" y="253" key="run.anything.popup/67.27.1853.1053@67.27.1853.1053" timestamp="1579650286067" /> <state x="657" y="253" key="run.anything.popup/67.27.1853.1053@67.27.1853.1053" timestamp="1580393897949" />
</component> </component>
</project> </project>