diff --git a/fsfahrt.sql b/fsfahrt.sql
new file mode 100644
index 0000000000000000000000000000000000000000..f6339a95acf10c899c734473f0a85c175e0fda30
--- /dev/null
+++ b/fsfahrt.sql
@@ -0,0 +1,94 @@
+-- phpMyAdmin SQL Dump
+-- version 4.1.12
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost:3306
+-- Generation Time: Aug 08, 2014 at 07:42 PM
+-- Server version: 5.1.73-0ubuntu0.10.04.1
+-- PHP Version: 5.4.16
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+--
+-- Database: `fsfahrt`
+--
+CREATE DATABASE IF NOT EXISTS `fsfahrt` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+USE `fsfahrt`;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bachelor`
+--
+
+DROP TABLE IF EXISTS `bachelor`;
+CREATE TABLE IF NOT EXISTS `bachelor` (
+ `bachelor_id` varchar(15) NOT NULL,
+ `fahrt_id` int(11) NOT NULL,
+ `version` int(11) NOT NULL,
+ `forname` varchar(50) NOT NULL,
+ `sirname` varchar(50) NOT NULL,
+ `anday` varchar(10) NOT NULL,
+ `abday` varchar(10) NOT NULL,
+ `antyp` varchar(100) NOT NULL,
+ `abtyp` varchar(100) NOT NULL,
+ `pseudo` varchar(50) NOT NULL,
+ `mehl` varchar(100) NOT NULL,
+ `essen` varchar(50) NOT NULL,
+ `public` int(11) NOT NULL,
+ `virgin` int(11) NOT NULL,
+ `studityp` varchar(11) NOT NULL,
+ `comment` text NOT NULL,
+ PRIMARY KEY (`bachelor_id`,`fahrt_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `bachelor`
+--
+
+INSERT INTO `bachelor` (`bachelor_id`, `fahrt_id`, `version`, `forname`, `sirname`, `anday`, `abday`, `antyp`, `abtyp`, `pseudo`, `mehl`, `essen`, `public`, `virgin`, `studityp`, `comment`) VALUES
+('5b61b92044983e1', 2, 1, 'asd', 'ad', '12.03.2014', '14.03.2014', 'gemeinsam mit Bus/Bahn', 'gemeinsam mit Bus/Bahn', 'ffas', 'asdasd@asd.de', 'Alles', 1, 0, '0', 'dasd'),
+('f35f12ca7c55462', 2, 1, 'fcacs', 'ads', '12.03.2014', '14.03.2014', 'gemeinsam mit Bus/Bahn', 'gemeinsam mit Bus/Bahn', 'fas', 'asd@asd.de', 'Alles', 0, 0, '0', 'adasdasda'),
+('068e4198f255a1e', 2, 1, 'göll', 'asd', '12.03.2014', '14.03.2014', 'gemeinsam mit Bus/Bahn', 'gemeinsam mit Bus/Bahn', 'adsad', 'adskd@asdl.de', 'Alles', 1, 0, '0', 'adasd'),
+('d748d40c0d7e475', 2, 1, 'ad', 'adsd', '12.03.2014', '14.03.2014', 'gemeinsam mit Bus/Bahn', 'gemeinsam mit Bus/Bahn', 'asdadl', 'asdas@asd.de', 'Vegan', 1, 0, '0', 'ad'),
+('ec2cac23f915bf9', 2, 1, 'gbhg', 'ncvbx', '12.03.2014', '14.03.2014', 'gemeinsam mit Bus/Bahn', 'gemeinsam mit Bus/Bahn', 'cvxcvxsdfs', 'ads@asdl.de', 'Alles', 1, 0, '0', 'ycyxc'),
+('78a322842b66657', 2, 1, 'lkblka', 'kbvnfj', '12.03.2014', '14.03.2014', 'individuell', 'gemeinsam mit Rad', 'kmkm', 'sdkk@ksad.de', 'Vegan', 1, 0, 'MasterErsti', 'asda');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fahrten`
+--
+
+DROP TABLE IF EXISTS `fahrten`;
+CREATE TABLE IF NOT EXISTS `fahrten` (
+ `fahrt_id` int(11) NOT NULL AUTO_INCREMENT,
+ `titel` varchar(200) NOT NULL,
+ `ziel` varchar(100) NOT NULL,
+ `von` date NOT NULL,
+ `bis` date NOT NULL,
+ `regopen` int(1) NOT NULL,
+ `beschreibung` text NOT NULL,
+ `leiter` varchar(100) NOT NULL,
+ `kontakt` varchar(100) NOT NULL,
+ PRIMARY KEY (`fahrt_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
+
+--
+-- Dumping data for table `fahrten`
+--
+
+INSERT INTO `fahrten` (`fahrt_id`, `titel`, `ziel`, `von`, `bis`, `regopen`, `beschreibung`, `leiter`, `kontakt`) VALUES
+(1, 'Porno laut im Flur Fahrt', 'Irgendwo', '2012-10-17', '2012-10-19', 0, 'irgendein Text', 'Willi', 'hans@wurst.de'),
+(2, 'Vodka in Hand Fahrt', 'Halbinsel', '2013-10-18', '2013-10-20', 1, 'Mehr Text passt nicht!', 'Tim', 'wahr@gi.na');
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/registration-system/admin/index.php b/registration-system/admin/index.php
index be699b30e2a00022df84bbd21ef9cac468a0942b..4c36f4603eaf254d1696d3a468eded9b2bac35d5 100644
--- a/registration-system/admin/index.php
+++ b/registration-system/admin/index.php
@@ -76,4 +76,4 @@ else
if(isset($_REQUEST['ajax']))
echo $ajax;
else
- echo str_replace("{headers}", $headers, str_replace("{text}", $text, str_replace("{navigation}", $navigation, $template)));
\ No newline at end of file
+ echo str_replace("{headers}", $headers, str_replace("{text}", $text, str_replace("{navigation}", $navigation, $template)));
diff --git a/registration-system/admin/pages.php b/registration-system/admin/pages.php
index b2557fdecdb651254f1aa1d57cefb6295f269186..3d57dd608cd42ac6de0daa9905ae20ea0b58916f 100644
--- a/registration-system/admin/pages.php
+++ b/registration-system/admin/pages.php
@@ -24,24 +24,30 @@ END;
"fahrt_id",
"forname",
"sirname",
+ "mehl",
"pseudo",
"antyp",
"abtyp",
"anday",
"abday",
"comment",
- "studityp"
+ "studityp",
+ "paid",
+ "repaid",
+ "backstepped"
);
+
$columnFunctions = array(
"Anmelde-ID" => function($person) { return $person["bachelor_id"]; },
"FahrtID" => function($person) { return $person["fahrt_id"]; },
- "Name" => function($person) { return $person["forname"]." ".$person["sirname"]." (".$person["pseudo"].")"; },
- "Anreisetyp" => function($person) { return ""; },
- "Abreisetyp" => function($person) { return ""; },
- "Anreisetag" => function($person) { return ""; },
- "Abreisetag" => function($person) { return ""; },
- "Kommentar" => function($person) { return ""; },
- "StudiTyp" => function($person) { return ""; }
+ "Name" => function($person) { return "<a href='mailto:".$person["mehl"]."?subject=FS-Fahrt'>".$person["forname"]." ".$person["sirname"]." (".$person["pseudo"].")</a>"; },
+ "Anreisetyp" => function($person) { return $person["antyp"]; },
+ "Abreisetyp" => function($person) { return $person["abtyp"]; },
+ "Anreisetag" => function($person) { return $person["anday"]; },
+ "Abreisetag" => function($person) { return $person["abday"]; },
+ "Kommentar" => function($person) { return $person["comment"]; },
+ "StudiTyp" => function($person) { return $person["studityp"]; },
+ "PaidReBack" => function($person) { return ($person["paid"] ? "1" : "0") . ($person["repaid"] ? "1" : "0") . ($person["backstepped"] ? "1" : "0"); }
);
$text .=<<<END
diff --git a/registration-system/admin/pages_cost.php b/registration-system/admin/pages_cost.php
index 3bbfa97b74f0692e5a242569af1dad93e9744e8e..c3acf358bb285ee8f93b48b65e697a45776da44b 100644
--- a/registration-system/admin/pages_cost.php
+++ b/registration-system/admin/pages_cost.php
@@ -8,15 +8,27 @@
global $config_studitypen, $config_reisearten, $config_essen, $admin_db, $config_current_fahrt_id, $config_admin_verbose_level, $config_verbose_level, $text, $headers, $ajax;
+$text .= "<h2>Unterkunft</h2>";
$h = array("Position", "Anzahl", "Satz", "Summe");
-$d = array(array("Mett", 100, 3.2),
- array("Zwiebel", 300, 5),
- array("Brötchen", 200, 0.2));
$s[3] = array(1,2);
$t[2] = " €";
$t[3] = " €";
+
+$text .= "<h3>Kalkulation</h3>";
+$d = array(array("Ãœbernachtung", 2, 10.50),
+ array("Zwiebel", 300, 5),
+ array("Brötchen", 200, 0.2));
+
+
+$text .= html_table($h, $d, $s, $t);
+$text .= "<h3>Rechnung</h3>";
+$text .= html_table($h, $d, $s, $t);
+
+$text .= "<h2>Einkaufen</h2>";
$text .= html_table($h, $d, $s, $t);
+$text .= "<h2>Money In/Out</h2>";
+$text .= html_table($h, $d, $s, $t);
/**
@@ -108,4 +120,4 @@ function numeric_class($a,$b,$c){
}
if(isset($b[$c]))
return $d;
-}
\ No newline at end of file
+}
diff --git a/registration-system/admin/pages_mail.php b/registration-system/admin/pages_mail.php
index 43fae6f786aef010566feda1b55637d0538c8898..91d18b6daeb956b0f3f08bb1317d51c5bc4cc2e0 100644
--- a/registration-system/admin/pages_mail.php
+++ b/registration-system/admin/pages_mail.php
@@ -213,4 +213,4 @@ $text .= '</textarea>';
comm_admin_verbose(3,$_REQUEST);
-?>
\ No newline at end of file
+?>
diff --git a/registration-system/admin/pages_notes.php b/registration-system/admin/pages_notes.php
index 1f8962815a1481177d40facb4ac5617041a2ceec..f88938e729c15ab66ae9efe18b78340b0bbae92d 100644
--- a/registration-system/admin/pages_notes.php
+++ b/registration-system/admin/pages_notes.php
@@ -88,4 +88,3 @@ var editor = new wysihtml5.Editor("wysihtml5-editor", {
}
});
</script>';
-
diff --git a/registration-system/frameworks/commons.php b/registration-system/frameworks/commons.php
index 21b03fc77886b53c6a84500d7ab56d5cea4c2b25..bc64b2f999002bb29967fa8e8a01ea99d0ecc4bd 100644
--- a/registration-system/frameworks/commons.php
+++ b/registration-system/frameworks/commons.php
@@ -80,4 +80,4 @@ function comm_send_mail($db_handle, $addr, $cont, $from = NULL){
function comm_get_lang($lang, $replace){
global $$lang;
return str_replace(array_keys($replace), array_values($replace), $$lang);
-}
\ No newline at end of file
+}
diff --git a/registration-system/frameworks/medoo.php b/registration-system/frameworks/medoo.php
index 198552379d15af08a42ddb81f70d0fad16982187..da489d1d99fbc582a388e4aeec39604ad7a94178 100644
--- a/registration-system/frameworks/medoo.php
+++ b/registration-system/frameworks/medoo.php
@@ -691,4 +691,4 @@ class medoo
);
}
}
-?>
\ No newline at end of file
+?>
diff --git a/registration-system/frameworks/soft_protect.php b/registration-system/frameworks/soft_protect.php
index 7a720175941a085395511810028dbcc5738b8301..45db2eb8112675f3fdd5b4ab6a263f09ba6f7ee2 100644
--- a/registration-system/frameworks/soft_protect.php
+++ b/registration-system/frameworks/soft_protect.php
@@ -25,4 +25,4 @@ class soft_protect
return implode("\r\n", $lines);
}
}
-?>
\ No newline at end of file
+?>
diff --git a/registration-system/frameworks/template.php b/registration-system/frameworks/template.php
index bdf36687d1b0b3077d04dc3fa96e45657a4864bd..dfb56a252c4558f66497c922f1d2a8c3ee05786d 100644
--- a/registration-system/frameworks/template.php
+++ b/registration-system/frameworks/template.php
@@ -43,4 +43,4 @@ class template {
private function display_status(){
}
-}
\ No newline at end of file
+}
diff --git a/registration-system/index.php b/registration-system/index.php
index 4bcf3ad7f161506daa72bb32384760ba17e32e85..0e6debc3b592ad0d00db403c495d8b4904e70025 100644
--- a/registration-system/index.php
+++ b/registration-system/index.php
@@ -373,4 +373,4 @@ function index_show_signupTable($fid){
}
echo '</table>';
}
-}
\ No newline at end of file
+}
diff --git a/registration-system/info.php b/registration-system/info.php
index d94f789c7af4a70377ba8ca4108d91821a958535..39342e673f96d86e4174f64da077a5570452ce33 100644
--- a/registration-system/info.php
+++ b/registration-system/info.php
@@ -4,4 +4,4 @@
phpinfo();
// safe key generation:
//$bytes = openssl_random_pseudo_bytes(6);
-//$hex = bin2hex($bytes);
\ No newline at end of file
+//$hex = bin2hex($bytes);
diff --git a/registration-system/lang.php b/registration-system/lang.php
index e945633b26693d6756f9f09c7563d6df85f0d2eb..0d6d9a6a9138bc09e78f55080babccfd7a6cc1de 100644
--- a/registration-system/lang.php
+++ b/registration-system/lang.php
@@ -18,4 +18,4 @@ Viele Grüße,
{{organisator}}!
";
-?>
\ No newline at end of file
+?>
diff --git a/registration-system/status.php b/registration-system/status.php
index b3773579e7975d3ef5b803de39679a35a034fed8..c631be707c69dff52ba9a3908111c93739e062d0 100644
--- a/registration-system/status.php
+++ b/registration-system/status.php
@@ -66,4 +66,4 @@ function show_content(){
}
-?>
\ No newline at end of file
+?>
diff --git a/registration-system/view/admin_login_form.html b/registration-system/view/admin_login_form.html
index fe1603de3eb190afe31fa0b9706a1f9e91492623..bc6116e704357c903544fd388f010f7595aa4c49 100644
--- a/registration-system/view/admin_login_form.html
+++ b/registration-system/view/admin_login_form.html
@@ -2,4 +2,4 @@
<input name="user" type="text" />
<input name="password" type="password" />
<input type="submit" value="anmelden" />
-</form>
\ No newline at end of file
+</form>
diff --git a/registration-system/view/admin_style.css b/registration-system/view/admin_style.css
index 4f8dec9e1916a0307d0ab0a063be6dae010ca00d..b3c907606553d07667e64d479637a14e8a9ae8d8 100644
--- a/registration-system/view/admin_style.css
+++ b/registration-system/view/admin_style.css
@@ -69,4 +69,4 @@ form table tr td{
}
.cost-table-invisible{
border: 0;
-}
\ No newline at end of file
+}
diff --git a/registration-system/view/admin_template.html b/registration-system/view/admin_template.html
index 30fd191036fe91e4ccbf9ef97484590076221b6d..393e5546832a068696162fd349693ea250a24041 100644
--- a/registration-system/view/admin_template.html
+++ b/registration-system/view/admin_template.html
@@ -22,4 +22,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
\ No newline at end of file
diff --git a/registration-system/view/default_index.php b/registration-system/view/default_index.php
index e137bdd411522a621fc8b15a18e48834c8e58108..615dfb69c677fb231c1de2861e1f8f6f2c232788 100644
--- a/registration-system/view/default_index.php
+++ b/registration-system/view/default_index.php
@@ -26,4 +26,4 @@
<img src="view/graphics/studityp_5.gif" style="position: fixed;bottom: 5px;left:0px" />
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/registration-system/view/js/soft_protect.js b/registration-system/view/js/soft_protect.js
index a02220e7272ab2268ca51a82c1f299a73fbc4aec..0de6a2827a987f08e71a9c05733f530e67b869bf 100644
--- a/registration-system/view/js/soft_protect.js
+++ b/registration-system/view/js/soft_protect.js
@@ -9,4 +9,4 @@ function soft_protect(elementIds, regex)
event.target.style.backgroundColor="#fff";
});
}
-}
\ No newline at end of file
+}