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

Dodanie dat w wyswietlaniu odznaczeń

This commit is contained in:
s421507 2020-07-20 18:35:12 +02:00
parent b147a42d9f
commit b50b11f05c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml
View File

@ -3,10 +3,7 @@
<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 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/fireFightersController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/fireFightersController.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Http/Controllers/documentOverlayController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/documentOverlayController.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/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/User.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/fireFightersEdit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/fireFightersEdit.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" />
@ -265,7 +262,7 @@
<workItem from="1592276510207" duration="28000" /> <workItem from="1592276510207" duration="28000" />
<workItem from="1592478779386" duration="40397000" /> <workItem from="1592478779386" duration="40397000" />
<workItem from="1593829053562" duration="35796000" /> <workItem from="1593829053562" duration="35796000" />
<workItem from="1595090372365" duration="28404000" /> <workItem from="1595090372365" duration="29297000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -285,6 +282,10 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="519" y="347" key="NewPhpFileDialog/0.0.1536.824@0.0.1536.824" timestamp="1593832676565" /> <state x="519" y="347" key="NewPhpFileDialog/0.0.1536.824@0.0.1536.824" timestamp="1593832676565" />
<state x="195" y="58" key="SettingsEditor" timestamp="1595262884399">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="195" y="58" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1595262884399" />
<state x="482" y="276" key="com.intellij.ide.util.TipDialog" timestamp="1595090435150"> <state x="482" y="276" key="com.intellij.ide.util.TipDialog" timestamp="1595090435150">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>

2
app/Http/Controllers/documentOverlayController.php
View File

@ -88,7 +88,7 @@ class documentOverlayController extends Controller
$txt = ""; $txt = "";
foreach($awardedDecorations as $awardedDecoration){ foreach($awardedDecorations as $awardedDecoration){
$txt = $txt." ".$awardedDecoration->decorationName."\n"; $txt = $txt." ".$awardedDecoration->decorationName." (".substr($awardedDecoration->dateOfAward,0,4).")\n";
} }
$pdf->SetXY(18, 132); $pdf->SetXY(18, 132);
$pdf->MultiCell(86,4, Helpers::textConvert($txt), 0, 'l', 0); $pdf->MultiCell(86,4, Helpers::textConvert($txt), 0, 'l', 0);