diff --git a/media/beutelsbach.jpg b/media/beutelsbach.jpg
deleted file mode 100644
index aa77016..0000000
Binary files a/media/beutelsbach.jpg and /dev/null differ
diff --git a/media/jumi.png b/media/jumi.png
new file mode 100644
index 0000000..c7033f3
Binary files /dev/null and b/media/jumi.png differ
diff --git a/survey/index.php b/survey/index.php
index 41b8512..e426ff3 100644
--- a/survey/index.php
+++ b/survey/index.php
@@ -1,182 +1,257 @@
 <?php
 ## INDEX gegen DB
-if(!isset($_SESSION)) { session_start(); }
+if (!isset($_SESSION)) {
+    session_start();
+}
 #$_SESSION['sessionid'] = session_id();
 
 
 include_once '../classes/TestProjektSmarty.class_subdir.php';
 #require_once("../config.inc.php");
 require_once("../config/datenbankanbindung.php");
-$smarty = new SmartyAdmin();
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
+$smarty       = new SmartyAdmin();
+$templatename = substr(basename($_SERVER['PHP_SELF']), 0, -3) . "html";
 require_once "../language/german.inc.php";
 
 
 $action = $_GET['action'];
-if($action == ''){
-$db = dbconnect();
 
-
-// Datendefinition
-$start = (isset($_POST['start'])) ? abs((int)$_POST['start']) : 0;
-$ip    = $_SERVER["REMOTE_ADDR"];  
-$limit = 1;                     // Fragen pro Seite
-
-#############################################################################
-$umid=1;
-#############################################################################
-
-####################### Speichern der Antworten #############################
-if(isset($_POST['save'])){
-  $frage = $_POST['save'];
-  $result_multiple = $db->query("SELECT multiple
-                                   FROM jumi_umfragen_fragen
-                                  WHERE ufid = $frage;");
-  $row_multiple    = $result_multiple->fetch_array();
-  if($row_multiple['multiple'] == '0'){
-#    echo "Antwort: $_POST[antwort]<br>";
-  }
-  if($row_multiple['multiple'] == '1'){
-    $query    = "SELECT uaid
-                   FROM jumi_umfragen_antworten
-                  WHERE ufid = $frage
-                  ORDER BY ufid ASC";
-    $result = $db->query( $query);
-    while ($row = $result->fetch_array()){
-      $antwort = $_POST['antwort_'.$row['uaid']];
-      if($antwort != ''){
-#        echo "Antwort: $antwort<br>";
-      }
-    }
+if ($action == '') {
+  $db = dbconnect();
+  $datum=date("Y-m-d H:i:s");
+  $query_umid = $db->query("SELECT max(umid) umid
+                             FROM jumi_umfragen
+                            WHERE datum_von < '$datum'
+                             AND datum_bis > '$datum'
+                          ");
+  $row_umid = $query_umid->fetch_array();
+  if($row_umid['umid'] == NULL ){
+    $smarty->assign('umfrage_anzeigen', "0");
+  }else{
+    $smarty->assign('umfrage_anzeigen', "1");
+    $smarty->assign('umfrage_umid', "$row_umid[umid]");
   }
 
+
 }
 
-
-
-
-            $rowperpage = 1;
-            $row1234 = 0;
-
-            // Previous Button
-            if(isset($_POST['but_prev'])){
-                $row1234 = $_POST['row'];
-                $row1234 -= $rowperpage;
-                if( $row1234 < 0 ){
-                    $row1234 = 0;
+if ($action == 'umfrage') {
+    $db = dbconnect();
+    
+    
+    // Datendefinition
+    
+    $limit = 1; // Fragen pro Seite
+    
+    #############################################################################
+    if (isset($_POST['umid'])) {
+      $umid = $_POST['umid'];
+      $_SESSION['umid'] = $umid;
+    }else{
+      $umid = $_SESSION['umid'];
+    }
+    ####################### Abfrage, ob Umfrage schon teilgenommen ##############
+    
+    ####################### Speichern der Antworten #############################
+    if (isset($_POST['but_next'])) {
+        $frage   = $_POST['save'];
+        $session = session_id();
+        $ip      = $_SERVER["REMOTE_ADDR"];
+        
+        if (!isset($_POST['freitext'])) {
+            $result_multiple = $db->query("SELECT multiple
+                                         FROM jumi_umfragen_fragen
+                                        WHERE ufid = $frage");
+            $row_multiple    = $result_multiple->fetch_array();
+            
+            $del1 = $db->query("DELETE FROM jumi_umfragen_ergebnisse WHERE ufid = $frage AND ip='$ip' AND session='$session'");
+            
+            if ($row_multiple['multiple'] == '0') {
+                #                echo "Antwort: $_POST[antwort]<br>";
+                $antwort = $_POST['antwort'];
+                $sql1    = $db->query("INSERT INTO jumi_umfragen_ergebnisse (ip, session, ufid, uaid)
+                                VALUES ('$ip', '$session', '$frage', '$antwort')
+                              ");
+                
+            }
+            if ($row_multiple['multiple'] == '1') {
+                $query  = "SELECT uaid
+                         FROM jumi_umfragen_antworten
+                        WHERE ufid = $frage
+                        ORDER BY ufid ASC";
+                $result = $db->query($query);
+                while ($row = $result->fetch_array()) {
+                    $antwort = $_POST['antwort_' . $row['uaid']];
+                    if ($antwort != '') {
+                        #                            echo "Antwort: $antwort<br>";
+                        $sql1 = $db->query("INSERT INTO jumi_umfragen_ergebnisse (ip, session, ufid, uaid)
+                                        VALUES ('$ip', '$session', '$frage', '$antwort')
+                                      ");
+                    }
                 }
             }
-
-            // Next Button
-            if(isset($_POST['but_next'])){
-                $row1234 = $_POST['row'];
-                $allcount = $_POST['allcount'];
-
-                $val = $row1234 + $rowperpage;
-                if( $val < $allcount ){
-                    $row1234 = $val;
-                }
-            }
-
-
-$smarty->assign('pagination_row', $row1234);
-
-
-
-
-
-####################### Ausgabe der Fragen #####################################
-
-  $last = floor($total/$limit)*$limit;   //Sprungziel zur letzten Seite BSP abrunden(1954/13)*13 ==> 150*13=1950 Sprungmarke auf Zeile 1950, 4 DS werden angezeigt
-  $akt = round((($start-$limit)/$limit+2),0);
-
-  $result0 = $db->query("SELECT headline
+        }
+        if (isset($_POST['freitext'])) {
+            $freitext = $_POST['freitext'];
+            $del1     = $db->query("DELETE FROM jumi_umfragen_erg_freitext WHERE ip='$ip' AND session='$session'");
+            $sql1     = $db->query("INSERT INTO jumi_umfragen_erg_freitext (umid, ip, session, freitext)
+                                VALUES ('$umid', '$ip', '$session', '$freitext')
+                              ");
+        }
+        
+        if ($_POST['exit'] == '1') {
+            $smarty->assign('umfrage_showende', "1");
+        }
+    }
+    
+    $rowperpage = 1;
+    $row_page   = 0;
+    
+    // Previous Button
+    if (isset($_POST['but_prev'])) {
+        
+        $row_page = $_POST['row'];
+        $row_page -= $rowperpage;
+        if ($row_page < 0) {
+            $row_page = 0;
+            $smarty->assign('umfrage_start0', "2");
+            
+        } else {
+            $smarty->assign('umfrage_start0', "1");
+            
+        }
+    }
+    
+    // Next Button
+    if (isset($_POST['but_next'])) {
+        $row_page = $_POST['row'];
+        $allcount = $_POST['allcount'];
+        
+        $val = $row_page + $rowperpage;
+        if ($val < $allcount) {
+            $row_page = $val;
+        }
+    }
+    $smarty->assign('pagination_row', $row_page);
+    
+    ####################### Ausgabe der Fragen #####################################
+    
+    #  $last = floor($total/$limit)*$limit;   //Sprungziel zur letzten Seite BSP abrunden(1954/13)*13 ==> 150*13=1950 Sprungmarke auf Zeile 1950, 4 DS werden angezeigt
+    $akt = round((($row_page - $limit) / $limit + 2), 0);
+    
+    $result0 = $db->query("SELECT headline, freitext
                           FROM jumi_umfragen
                          WHERE umid = $umid;");
-  $row0    = $result0->fetch_array();
-  $smarty->assign('umfrage_headline', $row0['headline']);
-  
-  $result = $db->query("SELECT count(*)-1 Anz_limit, round(100/count(*)*$akt,1) progress, count(*) total
+    $row0    = $result0->fetch_array();
+    if ($row0['freitext'] == '0') {
+        $freitext = 0;
+    } else {
+        $freitext = 1;
+    }
+    $smarty->assign('umfrage_headline', $row0['headline']);
+    
+    $result = $db->query("SELECT count(*)-1 Anz_limit, round(100/(count(*)+$freitext)*$akt,1) progress, count(*) total
                           FROM jumi_umfragen_fragen
                          WHERE umid = $umid;");
-  $row    = $result->fetch_array();
-  $smarty->assign('umfrage_progress', $row['progress']);
-  $allcount = $row['total'];
-  $smarty->assign('pagination_allcount', $allcount);
-  
-  #$show = ceil($total/$limit);           //Seitenzahlen aufrunden
-  
-if(isset($_POST['start'])){
-#echo "hier|$total|$limit|$start";
-  $start    = ($_POST['start'] >= $total) ? $total - $limit : $start;
-}else{
-
-  $start = 0;
-}
-
-#echo "$row[Anz_limit]<br>";
-
-// Datenbankabfrage ausführen.
-$query    = "SELECT ufid, frage, multiple
+    $row    = $result->fetch_array();
+    $smarty->assign('umfrage_progress', $row['progress']);
+    
+    if ($row0['freitext'] == '0') {
+        $allcount = $row['total'];
+    } else {
+        $allcount = $row['total'] + $freitext;
+    }
+    
+    
+    $smarty->assign('pagination_allcount', $allcount);
+    
+    // Zurück- und Vorblättern Buttons
+    if ($row_page > 0) {
+        $smarty->assign('umfrage_start0', "1");
+    } else {
+        $smarty->assign('umfrage_start0', "2");
+    }
+    
+    if ($row_page + $limit < $allcount) {
+        $smarty->assign('umfrage_end0', "1");
+    } else {
+        $smarty->assign('umfrage_end0', "2");
+    }
+    
+    #echo "$row[Anz_limit]<br>";
+    
+    // Datenbankabfrage ausführen.
+    $query  = "SELECT ufid, frage, multiple
                FROM jumi_umfragen_fragen
               WHERE umid = 1
               ORDER BY ufid ASC
-              LIMIT ".$row1234.",1";
-$result = $db->query( $query);
-
-// Ergebnisse lesen und an den Client ausgeben
-
-while ($row = $result->fetch_array()){
-$value2 = '';
-
-    $query2 = "SELECT uaid, antwort
+              LIMIT " . $row_page . ",1";
+    $result = $db->query($query);
+    
+    # Letzte Frage ggf. Freitext, wenn Ergebnis der Abfrage 0 ist und Freitext=1
+    if (mysqli_num_rows($result) == '0' AND $row0['freitext'] == '1') {
+        # Jetzt Freitext einblenden, auf letzter Seite
+        $smarty->assign('umfrage_showfreitext', "1");
+        $result_antw = $db->query("SELECT freitext
+                                   FROM jumi_umfragen_erg_freitext
+                                  WHERE umid = $umid
+                                    AND ip = '$ip'
+                                    AND session = '$session'");
+        $row_antw    = $result_antw->fetch_array();
+        $smarty->assign('umfrage_value_freitext', "$row_antw[freitext]");
+        
+    } else {
+        $smarty->assign('umfrage_showfreitext', "0");
+    }
+    
+    // Ergebnisse lesen und an den Client ausgeben
+    while ($row = $result->fetch_array()) {
+        $value2 = '';
+        
+        $query2 = "SELECT uaid, antwort
                  FROM jumi_umfragen_antworten
                 WHERE ufid = $row[ufid]
                 ORDER BY userorder ASC
               ";
-
-    $result2 = $db->query( $query2)
-              or die ("Cannot execute query2");
-    $ln2 = 0;
-    while ($row2 = $result2->fetch_array()){   
-      $inner1[$ln2]['uaid'] = $row2['uaid'];
-      $inner1[$ln2]['antwort'] = $row2['antwort'];
-      $value2 = $inner1;
-      $ln2++;
-     }
-  $row['inner']                = $value2;
-  
-
-  $table_data[]               = $row;
-}
-$smarty->assign('table_data', $table_data);
-
-#echo"<pre>";
-#print_r($table_data);
-#echo"</pre>";
-
-  // Zurück- und Vorblättern
-  if ($start > 0){
-    $newStart = ($start - $limit < 0) ? 0 : ($start-$limit); // wenn $start-$limit kleiner 0 dann $newstart=0 sonst $start-$limit
-echo "<br>1: ".$newStart;
-    $smarty->assign('umfrage_start0', "1");
-    $smarty->assign('umfrage_start_newstart', "$newStart");
-  }else{
-     $smarty->assign('umfrage_start0', "2");
-  }
-
-
-  if ($start + $limit < $total){
-    $newStart = $start + $limit;
-echo "<br>2: ".$newStart;
-    $smarty->assign('umfrage_end0', "1");
-    $smarty->assign('umfrage_end_newstart', "$newStart");
-    $smarty->assign('umfrage_end_last', "$last");
-  }else{
-    $smarty->assign('umfrage_end0', "2");
-  }
+        
+        $result2 = $db->query($query2) or die("Cannot execute query2");
+        $ln2 = 0;
+        while ($row2 = $result2->fetch_array()) {
+            $session = session_id();
+            $ip      = $_SERVER["REMOTE_ADDR"];
+            
+            $result_antw = $db->query("SELECT count(*) Anz
+                                        FROM jumi_umfragen_ergebnisse
+                                       WHERE ufid = $row[ufid]
+                                         AND uaid = $row2[uaid]
+                                         AND ip = '$ip'
+                                         AND session = '$session'");
+            $row_antw    = $result_antw->fetch_array();
+            if ($row_antw['Anz'] == '0') {
+                $selected = 0;
+            } else {
+                $selected = 1;
+            }
+            
+            $inner1[$ln2]['selected'] = $selected;
+            $inner1[$ln2]['uaid']     = $row2['uaid'];
+            $inner1[$ln2]['antwort']  = $row2['antwort'];
+            $value2                   = $inner1;
+            $ln2++;
+        }
+        $row['inner'] = $value2;
+        
+        
+        $table_data[] = $row;
+    }
+    $smarty->assign('table_data', $table_data);
+    
+    #echo"<pre>";
+    #print_r($table_data);
+    #echo"</pre>";
+    
 }
 
 $smarty->assign('action', "$action");
 $smarty->display("modern/survey/$templatename");
-?>
\ No newline at end of file
+?> 
\ No newline at end of file
diff --git a/templates/modern/survey/index.html b/templates/modern/survey/index.html
index 6387953..794330b 100644
--- a/templates/modern/survey/index.html
+++ b/templates/modern/survey/index.html
@@ -1,3 +1,4 @@
+{if $action == ''}
 <!doctype html>
 <html lang="de">
    <head>
@@ -9,7 +10,58 @@
       <!--
          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Zug+QiDoJOrZ5t4lssLdxGhVrurbmBWopoEl+M6BdEfwnCJZtKxi1KgxUyJq13dy" crossorigin="anonymous">
          -->
+      <style type="text/css">
+         body {
+         background-color	:	#FFF;
+         }
+         .headline {
+         padding-top: 10px;
+         padding-bottom: 10px;
+         padding-left: 20px;
+         }
+      </style>
+   </head>
+   <body>
+      <div class="container">
+         <div class="grid">
+            <div class="headline col-12 bg-white">
+               <p class="text-center"><img width="200" src="../media/jumi.png" class="rounded float-right" alt="JU & MI"></p>
+            </div>
+              <form action="?action=umfrage" method='post' name='start'>
+               {if $umfrage_anzeigen == '0'}
+                       <div class="col-12 ">
+                          <h4>
+                             <p class="text-center">Aktuell sind keine Umfragen verfügbar</p>
+                          </h4>
+                       </div>
+               {/if}
+               {if $umfrage_anzeigen == '1'}
+               <input type="hidden" name="umid" value="{$umfrage_umid}">
+               <script type="text/javascript">
+                   window.onload=function(){
+                       window.setTimeout(document.start.submit.bind(document.start), 5000);
+                   };
+               </script>
+              </form>
+              {/if}
+         </div>
+      </div>
+   </body>
+</html>
 
+{/if}
+{if $action == 'umfrage'}
+<!doctype html>
+<html lang="de">
+   <head>
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+      <title>Umfrage</title>
+      <!-- https://www.budde-mediendesign.de/blog/programmierung/das-bootstrap-4-grid-system-->
+      <link href="../bootstrap/node_modules/bootstrap/dist/css/bootstrap.ali.css" rel="stylesheet">
+      <!--
+         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Zug+QiDoJOrZ5t4lssLdxGhVrurbmBWopoEl+M6BdEfwnCJZtKxi1KgxUyJq13dy" crossorigin="anonymous">
+         -->
       <style type="text/css">
          body {
          background-color	:	#FFF;
@@ -35,7 +87,6 @@
          padding-bottom: 20px;
          padding-left: 20px;
          }
-
          .prog-col {
          background-color: #35B6BB;
          }
@@ -88,6 +139,7 @@
    <body >
       <!-- hier kommt der Inhalt der Seite hin -->
       <div class="container">
+         {if $umfrage_showende != '1'}
          <div class="progress"  style="height: 5px;">
             <div class="progress-bar prog-col" role="progressbar" style="width:{$umfrage_progress}%" aria-valuenow="{$umfrage_progress}" aria-valuemin="0" aria-valuemax="100"></div>
          </div>
@@ -97,65 +149,96 @@
                   <p class="text-center">{$umfrage_headline}</p>
                </h2>
             </div>
-            <form action="" method='post' name='erfassen'>
-            {section name=table_data loop=$table_data}
-            <div class="question col-12 ">
-               <h4>
-                  <p class="text-center">{$table_data[table_data].frage}</p>
-               </h4>
-               {if $table_data[table_data].multiple == '1'}<p class="text-center small">Mehrfachantworten möglich</p>{/if}
-
-            </div>
-            <br>
-            <div class="col-12 btn-group-vertical btn-toolbar" role="group" aria-label="Basic radio toggle button group">
-               {section name=inner loop=$table_data[table_data].inner}
-                 {if $table_data[table_data].multiple == '0'}
-                   <input value="{$table_data[table_data].inner[inner].uaid}" type="radio" class="btn-check" name="antwort" id="btnradio{$smarty.section.inner.rownum}" autocomplete="off">
-                 {else}
-                   <input value="{$table_data[table_data].inner[inner].uaid}" type="checkbox" class="btn-check" name="antwort_{$table_data[table_data].inner[inner].uaid}" id="btnradio{$smarty.section.inner.rownum}" autocomplete="off">
-                 {/if}
-                 <label class="answer btn btn-outline-primary" for="btnradio{$smarty.section.inner.rownum}">{$table_data[table_data].inner[inner].antwort}</label>
+            <form action="?action=umfrage" method='post' name='erfassen'>
+               {if $umfrage_showfreitext == '0'}
+               {section name=table_data loop=$table_data}
+               <div class="question col-12 ">
+                  <h4>
+                     <p class="text-center">{$table_data[table_data].frage}</p>
+                  </h4>
+                  {if $table_data[table_data].multiple == '1'}
+                  <p class="text-center small">Mehrfachantworten möglich</p>
+                  {/if}
+               </div>
+               <br>
+               <div class="col-12 btn-group-vertical btn-toolbar" role="group" aria-label="Basic radio toggle button group">
+                  {section name=inner loop=$table_data[table_data].inner}
+                  {if $table_data[table_data].multiple == '0'}
+                  <input value="{$table_data[table_data].inner[inner].uaid}" type="radio" class="btn-check" name="antwort" id="btnradio{$smarty.section.inner.rownum}" autocomplete="off" {if $table_data[table_data].inner[inner].selected == '1'} checked {/if}>
+                  {else}
+                  <input value="{$table_data[table_data].inner[inner].uaid}" type="checkbox" class="btn-check" name="antwort_{$table_data[table_data].inner[inner].uaid}" id="btnradio{$smarty.section.inner.rownum}" autocomplete="off" {if $table_data[table_data].inner[inner].selected == '1'} checked {/if}>
+                  {/if}
+                  <label class="answer btn btn-outline-primary" for="btnradio{$smarty.section.inner.rownum}">{$table_data[table_data].inner[inner].antwort}</label>
+                  {/section}
+               </div>
+               <div class="col-12 btn-group">
+                  <input type="hidden" name="row" value="{$pagination_row}">
+                  <input type="hidden" name="allcount" value="{$pagination_allcount}">
+                  {if $umfrage_start0 == '1'}
+                  <input type="submit" class="btn btn-light" name="but_prev" value="Zurück">
+                  {/if}
+                  {if $umfrage_start0 == '2'}
+                  <a disabled class="btn btn-light">Zurück</a>
+                  {/if}
+                  {if $umfrage_end0 == '1'}
+                  <input type="hidden" name="save" value="{$table_data[table_data].ufid}">
+                  <input type="hidden" name="exit" value="0">
+                  <input type="submit" class="btn btn-primary" name="but_next" value="Weiter">
+                  {/if}
+                  {if $umfrage_end0 == '2'}
+                  <input type="hidden" name="save" value="{$table_data[table_data].ufid}">
+                  <input type="hidden" name="exit" value="1">
+                  <input type="submit" class="btn btn-primary" name="but_next" value="Umfrage beenden">
+                  {/if}
+               </div>
                {/section}
-            </div>
-
-
-<!--
-            <div class="col-12 btn-group">
-               {if $umfrage_start0 == '1'}
-                <input type="hidden" name="start" value="{$umfrage_start_newstart}">
-                {$umfrage_start_newstart}
-                <input type='submit' class="btn btn-light" name='senden' value="Zurück">
                {/if}
-               {if $umfrage_start0 == '2'}
-                 <a disabled class="btn btn-light">Zurück</a>
+               {if $umfrage_showfreitext == '1'}
+               <div class="question col-12 ">
+                  <h4>
+                     <p class="text-center">Raum für Hinweise/Bemerkungen</p>
+                  </h4>
+               </div>
+               <br>
+               <div class="col-12 btn-group-vertical btn-toolbar" role="group" aria-label="Basic radio toggle button group">
+                  <textarea class="form-control" id="freitext" name="freitext" rows="6">{$umfrage_value_freitext}</textarea>
+               </div>
+               <div class="col-12 btn-group">
+                  <input type="hidden" name="row" value="{$pagination_row}">
+                  <input type="hidden" name="allcount" value="{$pagination_allcount}">
+                  {if $umfrage_start0 == '1'}
+                  <input type="submit" class="btn btn-light" name="but_prev" value="Zurück">
+                  {/if}
+                  {if $umfrage_start0 == '2'}
+                  <a disabled class="btn btn-light">Zurück</a>
+                  {/if}
+                  {if $umfrage_end0 == '1'}
+                  <input type="hidden" name="save" value="freitext">
+                  <input type="hidden" name="exit" value="0">
+                  <input type="submit" class="btn btn-primary" name="but_next" value="Weiter">
+                  {/if}
+                  {if $umfrage_end0 == '2'}
+                  <input type="hidden" name="save" value="freitext">
+                  <input type="hidden" name="exit" value="1">
+                  <input type="submit" class="btn btn-primary" name="but_next" value="Umfrage beenden">
+                  {/if}
+               </div>
                {/if}
-               {if $umfrage_end0 == '1'}
-               <input type="hidden" name="start" value="{$umfrage_end_newstart}">
-               <input type="hidden" name="save" value="{$table_data[table_data].ufid}">
-               {$umfrage_end_newstart}
-               <input type='submit' class="btn btn-primary" name='senden' value="Weiter">
-               {/if}
-               {if $umfrage_end0 == '2'}
-               <input type="hidden" name="start" value="{$umfrage_end_newstart}">
-               {$umfrage_end_newstart}
-               <input type="hidden" name="save" value="{$table_data[table_data].ufid}">
-               <input type="hidden" name="exit" value="1">
-               <input type='submit' class="btn btn-primary" name='senden' value="Umfrage beenden">
-
-               {/if}
-            </div>
--->
-            <div id="div_pagination">
-            {$pagination_row} / {$pagination_allcount}
-                <input type="hidden" name="row" value="{$pagination_row}">
-                <input type="hidden" name="allcount" value="{$pagination_allcount}">
-                <input type="submit" class="button" name="but_prev" value="Previous">
-                <input type="submit" class="button" name="but_next" value="Next">
-            </div>
-            {/section}
-
          </div>
          </form>
+         {/if}
+         {if $umfrage_showende == '1'}
+         <div class="grid">
+            <div class="headline col-12 bg-white">
+               <p class="text-center"><img width="200" src="../media/jumi.png" class="rounded float-right" alt="JU & MI"></p>
+            </div>
+            <div class="col-12 ">
+               <h4>
+                  <p class="text-center">Herzlichen Dank für deine Teilnahme</p>
+               </h4>
+            </div>
+         </div>
+         {/if}
       </div>
       <!--
          <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
@@ -167,3 +250,4 @@
       <script src="../bootstrap/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
    </body>
 </html>
+{/if}
\ No newline at end of file
diff --git a/templates_c/2b06f8f36ebdb45c10ebd7bf157223e300660449_0.file.index.html.php b/templates_c/2b06f8f36ebdb45c10ebd7bf157223e300660449_0.file.index.html.php
index 45b2404..fbc9194 100644
--- a/templates_c/2b06f8f36ebdb45c10ebd7bf157223e300660449_0.file.index.html.php
+++ b/templates_c/2b06f8f36ebdb45c10ebd7bf157223e300660449_0.file.index.html.php
@@ -1,18 +1,18 @@
 <?php
-/* Smarty version 3.1.39, created on 2023-03-18 12:48:53
+/* Smarty version 3.1.39, created on 2023-03-19 19:58:42
   from 'F:\git\survey\templates\modern\survey\index.html' */
 
 /* @var Smarty_Internal_Template $_smarty_tpl */
 if ($_smarty_tpl->_decodeProperties($_smarty_tpl, array (
   'version' => '3.1.39',
-  'unifunc' => 'content_6415a5253b6db4_22747192',
+  'unifunc' => 'content_64175b626c3dc2_11111328',
   'has_nocache_code' => false,
   'file_dependency' => 
   array (
     '2b06f8f36ebdb45c10ebd7bf157223e300660449' => 
     array (
       0 => 'F:\\git\\survey\\templates\\modern\\survey\\index.html',
-      1 => 1679140131,
+      1 => 1679252315,
       2 => 'file',
     ),
   ),
@@ -20,8 +20,9 @@ if ($_smarty_tpl->_decodeProperties($_smarty_tpl, array (
   array (
   ),
 ),false)) {
-function content_6415a5253b6db4_22747192 (Smarty_Internal_Template $_smarty_tpl) {
-?><!doctype html>
+function content_64175b626c3dc2_11111328 (Smarty_Internal_Template $_smarty_tpl) {
+if ($_smarty_tpl->tpl_vars['action']->value == '') {?>
+<!doctype html>
 <html lang="de">
    <head>
       <meta charset="utf-8">
@@ -32,7 +33,61 @@ function content_6415a5253b6db4_22747192 (Smarty_Internal_Template $_smarty_tpl)
       <!--
          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Zug+QiDoJOrZ5t4lssLdxGhVrurbmBWopoEl+M6BdEfwnCJZtKxi1KgxUyJq13dy" crossorigin="anonymous">
          -->
+      <style type="text/css">
+         body {
+         background-color	:	#FFF;
+         }
+         .headline {
+         padding-top: 10px;
+         padding-bottom: 10px;
+         padding-left: 20px;
+         }
+      </style>
+   </head>
+   <body>
+      <div class="container">
+         <div class="grid">
+            <div class="headline col-12 bg-white">
+               <p class="text-center"><img width="200" src="../media/jumi.png" class="rounded float-right" alt="JU & MI"></p>
+            </div>
+              <form action="?action=umfrage" method='post' name='start'>
+               <?php if ($_smarty_tpl->tpl_vars['umfrage_anzeigen']->value == '0') {?>
+                       <div class="col-12 ">
+                          <h4>
+                             <p class="text-center">Aktuell sind keine Umfragen verfügbar</p>
+                          </h4>
+                       </div>
+               <?php }?>
+               <?php if ($_smarty_tpl->tpl_vars['umfrage_anzeigen']->value == '1') {?>
+               <input type="hidden" name="umid" value="<?php echo $_smarty_tpl->tpl_vars['umfrage_umid']->value;?>
+">
+               <?php echo '<script'; ?>
+ type="text/javascript">
+                   window.onload=function(){
+                       window.setTimeout(document.start.submit.bind(document.start), 5000);
+                   };
+               <?php echo '</script'; ?>
+>
+              </form>
+              <?php }?>
+         </div>
+      </div>
+   </body>
+</html>
 
+<?php }
+if ($_smarty_tpl->tpl_vars['action']->value == 'umfrage') {?>
+<!doctype html>
+<html lang="de">
+   <head>
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+      <title>Umfrage</title>
+      <!-- https://www.budde-mediendesign.de/blog/programmierung/das-bootstrap-4-grid-system-->
+      <link href="../bootstrap/node_modules/bootstrap/dist/css/bootstrap.ali.css" rel="stylesheet">
+      <!--
+         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Zug+QiDoJOrZ5t4lssLdxGhVrurbmBWopoEl+M6BdEfwnCJZtKxi1KgxUyJq13dy" crossorigin="anonymous">
+         -->
       <style type="text/css">
          body {
          background-color	:	#FFF;
@@ -58,7 +113,6 @@ function content_6415a5253b6db4_22747192 (Smarty_Internal_Template $_smarty_tpl)
          padding-bottom: 20px;
          padding-left: 20px;
          }
-
          .prog-col {
          background-color: #35B6BB;
          }
@@ -111,6 +165,7 @@ function content_6415a5253b6db4_22747192 (Smarty_Internal_Template $_smarty_tpl)
    <body >
       <!-- hier kommt der Inhalt der Seite hin -->
       <div class="container">
+         <?php if ($_smarty_tpl->tpl_vars['umfrage_showende']->value != '1') {?>
          <div class="progress"  style="height: 5px;">
             <div class="progress-bar prog-col" role="progressbar" style="width:<?php echo $_smarty_tpl->tpl_vars['umfrage_progress']->value;?>
 %" aria-valuenow="<?php echo $_smarty_tpl->tpl_vars['umfrage_progress']->value;?>
@@ -123,25 +178,27 @@ function content_6415a5253b6db4_22747192 (Smarty_Internal_Template $_smarty_tpl)
 </p>
                </h2>
             </div>
-            <form action="" method='post' name='erfassen'>
-            <?php
+            <form action="?action=umfrage" method='post' name='erfassen'>
+               <?php if ($_smarty_tpl->tpl_vars['umfrage_showfreitext']->value == '0') {?>
+               <?php
 $__section_table_data_0_loop = (is_array(@$_loop=$_smarty_tpl->tpl_vars['table_data']->value) ? count($_loop) : max(0, (int) $_loop));
 $__section_table_data_0_total = $__section_table_data_0_loop;
 $_smarty_tpl->tpl_vars['__smarty_section_table_data'] = new Smarty_Variable(array());
 if ($__section_table_data_0_total !== 0) {
 for ($__section_table_data_0_iteration = 1, $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] = 0; $__section_table_data_0_iteration <= $__section_table_data_0_total; $__section_table_data_0_iteration++, $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']++){
 ?>
-            <div class="question col-12 ">
-               <h4>
-                  <p class="text-center"><?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['frage'];?>
+               <div class="question col-12 ">
+                  <h4>
+                     <p class="text-center"><?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['frage'];?>
 </p>
-               </h4>
-               <?php if ($_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['multiple'] == '1') {?><p class="text-center small">Mehrfachantworten möglich</p><?php }?>
-
-            </div>
-            <br>
-            <div class="col-12 btn-group-vertical btn-toolbar" role="group" aria-label="Basic radio toggle button group">
-               <?php
+                  </h4>
+                  <?php if ($_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['multiple'] == '1') {?>
+                  <p class="text-center small">Mehrfachantworten möglich</p>
+                  <?php }?>
+               </div>
+               <br>
+               <div class="col-12 btn-group-vertical btn-toolbar" role="group" aria-label="Basic radio toggle button group">
+                  <?php
 $__section_inner_1_loop = (is_array(@$_loop=$_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner']) ? count($_loop) : max(0, (int) $_loop));
 $__section_inner_1_total = $__section_inner_1_loop;
 $_smarty_tpl->tpl_vars['__smarty_section_inner'] = new Smarty_Variable(array());
@@ -149,78 +206,102 @@ if ($__section_inner_1_total !== 0) {
 for ($__section_inner_1_iteration = 1, $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] = 0; $__section_inner_1_iteration <= $__section_inner_1_total; $__section_inner_1_iteration++, $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']++){
 $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum'] = $__section_inner_1_iteration;
 ?>
-                 <?php if ($_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['multiple'] == '0') {?>
-                   <input value="<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner'][(isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] : null)]['uaid'];?>
+                  <?php if ($_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['multiple'] == '0') {?>
+                  <input value="<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner'][(isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] : null)]['uaid'];?>
 " type="radio" class="btn-check" name="antwort" id="btnradio<?php echo (isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum'] : null);?>
-" autocomplete="off">
-                 <?php } else { ?>
-                   <input value="<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner'][(isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] : null)]['uaid'];?>
+" autocomplete="off" <?php if ($_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner'][(isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] : null)]['selected'] == '1') {?> checked <?php }?>>
+                  <?php } else { ?>
+                  <input value="<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner'][(isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] : null)]['uaid'];?>
 " type="checkbox" class="btn-check" name="antwort_<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner'][(isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] : null)]['uaid'];?>
 " id="btnradio<?php echo (isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum'] : null);?>
-" autocomplete="off">
-                 <?php }?>
-                 <label class="answer btn btn-outline-primary" for="btnradio<?php echo (isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum'] : null);?>
+" autocomplete="off" <?php if ($_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner'][(isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] : null)]['selected'] == '1') {?> checked <?php }?>>
+                  <?php }?>
+                  <label class="answer btn btn-outline-primary" for="btnradio<?php echo (isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum'] : null);?>
 "><?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['inner'][(isset($_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['index'] : null)]['antwort'];?>
 </label>
+                  <?php
+}
+}
+?>
+               </div>
+               <div class="col-12 btn-group">
+                  <input type="hidden" name="row" value="<?php echo $_smarty_tpl->tpl_vars['pagination_row']->value;?>
+">
+                  <input type="hidden" name="allcount" value="<?php echo $_smarty_tpl->tpl_vars['pagination_allcount']->value;?>
+">
+                  <?php if ($_smarty_tpl->tpl_vars['umfrage_start0']->value == '1') {?>
+                  <input type="submit" class="btn btn-light" name="but_prev" value="Zurück">
+                  <?php }?>
+                  <?php if ($_smarty_tpl->tpl_vars['umfrage_start0']->value == '2') {?>
+                  <a disabled class="btn btn-light">Zurück</a>
+                  <?php }?>
+                  <?php if ($_smarty_tpl->tpl_vars['umfrage_end0']->value == '1') {?>
+                  <input type="hidden" name="save" value="<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['ufid'];?>
+">
+                  <input type="hidden" name="exit" value="0">
+                  <input type="submit" class="btn btn-primary" name="but_next" value="Weiter">
+                  <?php }?>
+                  <?php if ($_smarty_tpl->tpl_vars['umfrage_end0']->value == '2') {?>
+                  <input type="hidden" name="save" value="<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['ufid'];?>
+">
+                  <input type="hidden" name="exit" value="1">
+                  <input type="submit" class="btn btn-primary" name="but_next" value="Umfrage beenden">
+                  <?php }?>
+               </div>
                <?php
 }
 }
 ?>
-            </div>
-
-
-<!--
-            <div class="col-12 btn-group">
-               <?php if ($_smarty_tpl->tpl_vars['umfrage_start0']->value == '1') {?>
-                <input type="hidden" name="start" value="<?php echo $_smarty_tpl->tpl_vars['umfrage_start_newstart']->value;?>
-">
-                <?php echo $_smarty_tpl->tpl_vars['umfrage_start_newstart']->value;?>
-
-                <input type='submit' class="btn btn-light" name='senden' value="Zurück">
                <?php }?>
-               <?php if ($_smarty_tpl->tpl_vars['umfrage_start0']->value == '2') {?>
-                 <a disabled class="btn btn-light">Zurück</a>
+               <?php if ($_smarty_tpl->tpl_vars['umfrage_showfreitext']->value == '1') {?>
+               <div class="question col-12 ">
+                  <h4>
+                     <p class="text-center">Raum für Hinweise/Bemerkungen</p>
+                  </h4>
+               </div>
+               <br>
+               <div class="col-12 btn-group-vertical btn-toolbar" role="group" aria-label="Basic radio toggle button group">
+                  <textarea class="form-control" id="freitext" name="freitext" rows="6"><?php echo $_smarty_tpl->tpl_vars['umfrage_value_freitext']->value;?>
+</textarea>
+               </div>
+               <div class="col-12 btn-group">
+                  <input type="hidden" name="row" value="<?php echo $_smarty_tpl->tpl_vars['pagination_row']->value;?>
+">
+                  <input type="hidden" name="allcount" value="<?php echo $_smarty_tpl->tpl_vars['pagination_allcount']->value;?>
+">
+                  <?php if ($_smarty_tpl->tpl_vars['umfrage_start0']->value == '1') {?>
+                  <input type="submit" class="btn btn-light" name="but_prev" value="Zurück">
+                  <?php }?>
+                  <?php if ($_smarty_tpl->tpl_vars['umfrage_start0']->value == '2') {?>
+                  <a disabled class="btn btn-light">Zurück</a>
+                  <?php }?>
+                  <?php if ($_smarty_tpl->tpl_vars['umfrage_end0']->value == '1') {?>
+                  <input type="hidden" name="save" value="freitext">
+                  <input type="hidden" name="exit" value="0">
+                  <input type="submit" class="btn btn-primary" name="but_next" value="Weiter">
+                  <?php }?>
+                  <?php if ($_smarty_tpl->tpl_vars['umfrage_end0']->value == '2') {?>
+                  <input type="hidden" name="save" value="freitext">
+                  <input type="hidden" name="exit" value="1">
+                  <input type="submit" class="btn btn-primary" name="but_next" value="Umfrage beenden">
+                  <?php }?>
+               </div>
                <?php }?>
-               <?php if ($_smarty_tpl->tpl_vars['umfrage_end0']->value == '1') {?>
-               <input type="hidden" name="start" value="<?php echo $_smarty_tpl->tpl_vars['umfrage_end_newstart']->value;?>
-">
-               <input type="hidden" name="save" value="<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['ufid'];?>
-">
-               <?php echo $_smarty_tpl->tpl_vars['umfrage_end_newstart']->value;?>
-
-               <input type='submit' class="btn btn-primary" name='senden' value="Weiter">
-               <?php }?>
-               <?php if ($_smarty_tpl->tpl_vars['umfrage_end0']->value == '2') {?>
-               <input type="hidden" name="start" value="<?php echo $_smarty_tpl->tpl_vars['umfrage_end_newstart']->value;?>
-">
-               <?php echo $_smarty_tpl->tpl_vars['umfrage_end_newstart']->value;?>
-
-               <input type="hidden" name="save" value="<?php echo $_smarty_tpl->tpl_vars['table_data']->value[(isset($_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index']) ? $_smarty_tpl->tpl_vars['__smarty_section_table_data']->value['index'] : null)]['ufid'];?>
-">
-               <input type="hidden" name="exit" value="1">
-               <input type='submit' class="btn btn-primary" name='senden' value="Umfrage beenden">
-
-               <?php }?>
-            </div>
--->
-            <div id="div_pagination">
-            <?php echo $_smarty_tpl->tpl_vars['pagination_row']->value;?>
- / <?php echo $_smarty_tpl->tpl_vars['pagination_allcount']->value;?>
-
-                <input type="hidden" name="row" value="<?php echo $_smarty_tpl->tpl_vars['pagination_row']->value;?>
-">
-                <input type="hidden" name="allcount" value="<?php echo $_smarty_tpl->tpl_vars['pagination_allcount']->value;?>
-">
-                <input type="submit" class="button" name="but_prev" value="Previous">
-                <input type="submit" class="button" name="but_next" value="Next">
-            </div>
-            <?php
-}
-}
-?>
-
          </div>
          </form>
+         <?php }?>
+         <?php if ($_smarty_tpl->tpl_vars['umfrage_showende']->value == '1') {?>
+         <div class="grid">
+            <div class="headline col-12 bg-white">
+               <p class="text-center"><img width="200" src="../media/jumi.png" class="rounded float-right" alt="JU & MI"></p>
+            </div>
+            <div class="col-12 ">
+               <h4>
+                  <p class="text-center">Herzlichen Dank für deine Teilnahme</p>
+               </h4>
+            </div>
+         </div>
+         <?php }?>
       </div>
       <!--
          <?php echo '<script'; ?>
@@ -246,3 +327,4 @@ $_smarty_tpl->tpl_vars['__smarty_section_inner']->value['rownum'] = $__section_i
 </html>
 <?php }
 }
+}