From b50b11f05cae090cffe77267d7e405e94ab071db Mon Sep 17 00:00:00 2001
From: s421507 <micrej@st.amu.edu.pl>
Date: Mon, 20 Jul 2020 18:35:12 +0200
Subject: [PATCH] =?UTF-8?q?Dodanie=20dat=20w=20wyswietlaniu=20odznacze?=
 =?UTF-8?q?=C5=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fe81a3c..761dbbd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,7 @@
   <component name="ChangeListManager">
     <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$/app/Http/Controllers/fireFightersController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/fireFightersController.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" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/documentOverlayController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/documentOverlayController.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -265,7 +262,7 @@
       <workItem from="1592276510207" duration="28000" />
       <workItem from="1592478779386" duration="40397000" />
       <workItem from="1593829053562" duration="35796000" />
-      <workItem from="1595090372365" duration="28404000" />
+      <workItem from="1595090372365" duration="29297000" />
     </task>
     <servers />
   </component>
@@ -285,6 +282,10 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <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">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
diff --git a/app/Http/Controllers/documentOverlayController.php b/app/Http/Controllers/documentOverlayController.php
index 948101d..b4a1fe6 100644
--- a/app/Http/Controllers/documentOverlayController.php
+++ b/app/Http/Controllers/documentOverlayController.php
@@ -88,7 +88,7 @@ class documentOverlayController extends Controller
 
                 $txt = "";
                 foreach($awardedDecorations as $awardedDecoration){
-                    $txt = $txt." ".$awardedDecoration->decorationName."\n";
+                    $txt = $txt." ".$awardedDecoration->decorationName." (".substr($awardedDecoration->dateOfAward,0,4).")\n";
                 }
                 $pdf->SetXY(18, 132);
                 $pdf->MultiCell(86,4, Helpers::textConvert($txt), 0, 'l', 0);