From f3cc31e9b6b6b5c9908db15bf54c56cad44530e6 Mon Sep 17 00:00:00 2001
From: Tobias Hopp <tobi@gaminggeneration.de>
Date: Sun, 4 Oct 2020 13:14:08 +0200
Subject: [PATCH] Fix issue #1

Took 2 hours 7 minutes
---
 .idea/workspace.xml          | 25 ++++++++++++++++++-------
 config.inc.php               |  2 +-
 model/FaqModel.class.inc.php | 14 ++++++++++++--
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index df79797..0f5c775 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -19,9 +19,10 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fc13552d-b118-4828-b78f-fc8714e0cfdc" name="Default Changelist" comment="&#10;Updating database-conf">
+    <list default="true" id="fc13552d-b118-4828-b78f-fc8714e0cfdc" name="Default Changelist" comment="Final COMMIT!!!">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/config.inc.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/model/FaqModel.class.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/model/FaqModel.class.inc.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,7 +33,7 @@
     <execution />
   </component>
   <component name="DarkyenusTimeTracker">
-    <option name="totalTimeSeconds" value="119779" />
+    <option name="totalTimeSeconds" value="73466" />
     <option name="gitIntegration" value="true" />
     <option name="naggedAbout" value="1" />
   </component>
@@ -76,7 +77,8 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1601618466935</updated>
-      <workItem from="1601618467981" duration="36471000" />
+      <workItem from="1601618467981" duration="36776000" />
+      <workItem from="1601809534320" duration="505000" />
     </task>
     <task id="LOCAL-00001" summary="Initial commit">
       <created>1601618764031</created>
@@ -155,7 +157,14 @@
       <option name="project" value="LOCAL" />
       <updated>1601751040426</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="Final COMMIT!!!">
+      <created>1601751093352</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1601751093352</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -171,6 +180,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Initial commit" />
@@ -182,7 +192,8 @@
     <MESSAGE value="Fixing a little things" />
     <MESSAGE value="Should be the final commit" />
     <MESSAGE value="&#10;Updating database-conf" />
-    <option name="LAST_COMMIT_MESSAGE" value="&#10;Updating database-conf" />
+    <MESSAGE value="Final COMMIT!!!" />
+    <option name="LAST_COMMIT_MESSAGE" value="Final COMMIT!!!" />
   </component>
   <component name="WindowStateProjectService">
     <state x="728" y="326" width="800" height="683" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601632929047">
@@ -221,10 +232,10 @@
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
     <state x="441" y="192" width="1037" height="736" key="SettingsEditor/0.34.1920.1046@0.34.1920.1046" timestamp="1601632853044" />
-    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601751041908">
+    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601751094619">
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
-    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601751041908" />
+    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601751094619" />
     <state x="809" y="122" width="639" height="876" key="com.intellij.database.view.ui.AbstractDbRefactoringDialog" timestamp="1601632983240">
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
diff --git a/config.inc.php b/config.inc.php
index f33ecf7..853fb8d 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -8,4 +8,4 @@ define( 'MYSQL_DB', 'c1online_faq' );
 
 define( 'CODE_LENGTH', 4 );
 define( 'SHARE_URL_PREFIX', 'https://faq.hw-table.de/?code=' );
-define( 'WASTED_TIME', '33hrs and 17mins' );
+define( 'WASTED_TIME', '20hrs and 17mins' );
diff --git a/model/FaqModel.class.inc.php b/model/FaqModel.class.inc.php
index 6d3b86d..c2d79c1 100644
--- a/model/FaqModel.class.inc.php
+++ b/model/FaqModel.class.inc.php
@@ -43,9 +43,19 @@ class FaqModel
         $return = array();
         foreach( $result as $index => $value )
         {
-            $result[$index]['question'] = substr( $result[$index]['question'], 0, 50 );
+            $end_question = '';
+            $end_answer = '';
+            if( strlen( $result[$index]['question'] ) > 50 )
+            {
+                $end_question = '...';
+            }
+            if( strlen( $result[$index]['answer'] ) > 50 )
+            {
+                $end_answer = '...';
+            }
+            $result[$index]['question'] = substr( $result[$index]['question'], 0, 50 ) . $end_question;
             $result[$index]['question'] = str_replace( "\n", '   ', $result[$index]['question'] );
-            $result[$index]['answer'] = substr( $result[$index]['answer'], 0, 50 );
+            $result[$index]['answer'] = substr( $result[$index]['answer'], 0, 50 ) . $end_answer;
             $result[$index]['answer'] = str_replace( "\n", '   ', $result[$index]['answer'] );
         }