Master brunch 'master' of 0xbit:fsfahrttoolteam/registration-system

registration-system/admin/pages_list.php

@@ -108,10 +108,10 @@ END;
 
 $people = $admin_db->select('bachelor',$columns, array("fahrt_id"=>$config_current_fahrt_id));
 foreach($people as $person) {
-    $text .= "<tr>";
+    $text .= "<tr>"; //".((explode(',',$columnFunctions['PaidReBack']($person))[2]==0) ? "" : "class='list-backstepped'")."
     foreach($columnFunctions as $key => $value)
     {
-        $text .= "<td class='".$key."'>".$value($person)."</td>";
+        $text .= "<td class='".$key.((explode(',',$columnFunctions['PaidReBack']($person))[2]==0) ? '' : ' list-backstepped')."'>".$value($person)."</td>";
     }
     $text .= "</tr>";
 }

registration-system/admin/pages_overview.php

@@ -6,7 +6,7 @@
  * Time: 8:04 PM
  */
 
-global $text, $headers, $admin_db, $config_current_fahrt_id, $ajax, $config_reisearten, $config_admin_verbose_level, $config_verbose_level;
+global $text, $headers, $admin_db, $config_current_fahrt_id, $ajax, $config_reisearten, $config_admin_verbose_level, $config_verbose_level, $config_essen;
 $config_admin_verbose_level = 4;
 $config_verbose_level = 4;
 $text .= "<h1>Übersichtsseite</h1>";
@@ -15,6 +15,7 @@ $text .= "<h1>Übersichtsseite</h1>";
 $mitfahrer['gesam'] = $admin_db->count("bachelor", ["AND"=>
                                         ["backstepped" => NULL,
                                          "fahrt_id"    => $config_current_fahrt_id]]);
+$mitfahrer['gesaa'] = $admin_db->count("bachelor", ["fahrt_id"    => $config_current_fahrt_id]);
 
 $antag = $admin_db->query("SELECT date_format(von, '%j') as von FROM fahrten WHERE fahrt_id=$config_current_fahrt_id")->fetchAll()[0]['von'];
 $abtag = date('z', DateTime::createFromFormat('Y-m-d',$admin_db->get("fahrten","bis", ["fahrt_id"=>$config_current_fahrt_id]))->getTimestamp());
@@ -29,7 +30,7 @@ $mitfahrer['zweit'] = $admin_db->count("bachelor", ["AND"=>
 $mitfahrer['veget'] = $admin_db->count("bachelor", ["AND"=>
                                         ["backstepped" => NULL,
                                          "fahrt_id"    => $config_current_fahrt_id,
-                                         ""]]);
+                                         "essen[!]" => $config_essen[0]]]);
 $mitfahrer['backs'] = $admin_db->count("bachelor", ["AND"=>
                                         ["backstepped[!]" => NULL,
                                          "fahrt_id"    => $config_current_fahrt_id]]);
@@ -41,7 +42,7 @@ $mitfahrer['treff'] = $admin_db->count("bachelor", ["AND" =>
 
 $text .= "<div style='float:left; margin-left: 15px'><h2>Mitfahrer</h2>
         <ul class='list-nodeco'>
-            <li>Gesamt: ".$mitfahrer['gesam']."</li>
+            <li>Gesamt: ".$mitfahrer['gesam']." (".$mitfahrer['gesaa'].")</li>
             <ul>
                 <li>Erste Nacht: ".$mitfahrer['erste']."</li>
                 <li>Zweite Nacht: ".$mitfahrer['zweit']."</li>

registration-system/config.inc.php

@@ -39,6 +39,12 @@ $config_reisearten = array(
     //,"mit Kamel"
 );
 
+$config_reisearten_destroyed = array(
+    "mit Kamel",
+    "mit Esel",
+    "mit Schlauchboot"
+);
+
 $config_admins = array(
     // username => password
     "george" => "peter",

registration-system/index.php

@@ -381,12 +381,19 @@ echo '<h2>Angemeldet</h2>';
                 <!--td>'.$d["studityp"].'</td-->
                 <td>'.$d["pseudo"].'</td>
                 <td>'.date('d.m.Y', $d["anday"]).'</td>
-                <td>'.$d["antyp"].'</td>
+                <td>'.index_show_signupTable_destroyTypes($d["antyp"]).'</td>
                 <td>'.date('d.m.Y', $d["abday"]).'</td>
-                <td>'.$d["abtyp"].'</td>
+                <td>'.index_show_signupTable_destroyTypes($d["abtyp"]).'</td>
                 <td>'.$d["comment"].'</td>
             </tr>';
         }
         echo '</table>';
     }
 }
+
+function index_show_signupTable_destroyTypes($anabtyp){
+    global $config_reisearten, $config_reisearten_destroyed;
+    if(array_search($anabtyp, $config_reisearten)>=2)
+        return $config_reisearten_destroyed[array_rand($config_reisearten_destroyed)];
+    return $anabtyp;
+}
\ No newline at end of file

registration-system/view/admin_style.css

@@ -56,6 +56,12 @@ form table tr td{
     padding: 0 5px;
 }
 
+.list-backstepped{
+    color: #d3d3d3 !important;
+}
+.list-backstepped a{
+    color: #d3d3d3 !important;
+}
 .cost-table{
     padding: 5px;
 }