Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • fsini-informatik/fsfahrttool
  • kleemeis/fsfahrttool
2 results
Show changes
Showing
with 166 additions and 0 deletions
-- phpMyAdmin SQL Dump
-- version 4.2.5
-- http://www.phpmyadmin.net
--
-- Host: localhost:3306
-- Generation Time: Oct 12, 2014 at 02:03 AM
-- Server version: 5.5.38-0ubuntu0.14.04.1
-- PHP Version: 5.5.14
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`
--
-- --------------------------------------------------------
--
-- Table structure for table `cost`
--
CREATE TABLE IF NOT EXISTS `cost` (
`fahrt_id` int(11) NOT NULL COMMENT 'trip associated to calculation',
`tab1` text NOT NULL COMMENT 'JSON dump of tab1',
`tab2` text NOT NULL COMMENT 'JSON dump of tab2',
`tab3` text NOT NULL COMMENT 'JSON dump of tab3',
`moneyIO` text NOT NULL COMMENT 'JSON dump of money IO',
`collected` int(11) NOT NULL COMMENT 'amount collected per person before trip'
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
-- Dumping data for table `cost`
--
INSERT INTO `cost` (`fahrt_id`, `tab1`, `tab2`, `tab3`, `moneyIO`, `collected`) VALUES
(5, '{"ALL":{"B_FIX":"4","C_BW":"4.3","E_ESS":"5","REFRA":"42"},"VAR":{"F_FR":[{"val":"","ind":false,"an":false,"ab":false},{"val":"3","ind":true,"an":false,"ab":true},{"val":"3","ind":true,"an":true,"ab":true}],"G_MI":[{"val":"","ind":false,"an":false,"ab":false},{"val":"","ind":false,"an":false,"ab":false},{"val":"","ind":false,"an":false,"ab":false}],"H_AB":[{"val":"4","ind":true,"an":true,"ab":false},{"val":"4.5","ind":true,"an":true,"ab":false},{"val":"","ind":false,"an":false,"ab":false}],"D_UE":[{"val":"12.5","ind":true,"an":true,"ab":false},{"val":"12.5","ind":true,"an":true,"ab":false},{"val":"","ind":false,"an":false,"ab":false}],"A_FAHRT":[{"val":"2.5","ind":false,"an":true,"ab":false},{"val":"","ind":false,"an":false,"ab":false},{"val":"2.5","ind":false,"an":false,"ab":true}]}}', '[{"pos":"Limonade","cnt":"76","price":"1.43"},{"pos":"Brause","cnt":"42","price":"0.83"},{"pos":"Lutscher","cnt":"1","price":"0.5"}]', '[{"pos":"Bettwäsche","cnt":"1","mul":"40","price":"1.43"},{"pos":"Grillnutzung","cnt":"1","mul":"40","price":"0.3"},{"pos":"Halbpension","cnt":"2","mul":"40","price":"12.30"},{"pos":"Klodeckel","cnt":1,"mul":1,"price":"35"}]', '{"in":[{"pos":"Förderung","val":"1200"},{"pos":"Pfand","val":"31"},{"pos":"Kaution (Rückzahlung)","val":"100"}],"out":[{"pos":"Einkaufen","val":"354"},{"pos":"Busfahrt Hin","val":"35"},{"pos":"Busfahrt Rück","val":"40"},{"pos":"Kaution","val":"100"}]}', 60);
--
-- Indexes for dumped tables
--
--
-- Indexes for table `cost`
--
ALTER TABLE `cost`
ADD PRIMARY KEY (`fahrt_id`);
/*!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 */;
-- this adds new attributes to a trip
ALTER TABLE `fahrten`
ADD `wikilink` VARCHAR(255) NOT NULL DEFAULT 'https://wiki.fachschaft.informatik.hu-berlin.de/wiki/Erstsemesterfahrt',
ADD `paydeadline` DATE NOT NULL,
ADD `payinfo` TEXT NOT NULL DEFAULT '';
\ No newline at end of file
-- das attribut opentime setzt fest, ab wann die anmeldung möglich ist
ALTER TABLE `fahrten`
ADD `opentime` INT NOT NULL DEFAULT 0;
\ No newline at end of file
ALTER TABLE `waitlist` CHANGE `transferred` `transferred` INT( 11 ) NULL ;
\ No newline at end of file
-- this update merges the waitlist table with the bachelor table
-- first add necessary columns to the bachelor table
ALTER TABLE `bachelor`
ADD `on_waitlist` int(11) NOT NULL DEFAULT 0,
ADD `transferred` int(11) DEFAULT NULL;
-- first move those, that are not transferred yet
INSERT INTO `bachelor`
(`bachelor_id`, `fahrt_id`, `anm_time`, `forname`, `sirname`,
`anday`, `abday`, `antyp`,`abtyp`, `pseudo`,
`mehl`, `essen`,`public`, `virgin`, `studityp`, `comment`,
`transferred`, `on_waitlist`, `version`,
`paid`, `repaid`, `backstepped`)
SELECT `waitlist_id` AS `bachelor_id`,
`fahrt_id`, `anm_time`, `forname`, `sirname`,
`anday`, `abday`, `antyp`,`abtyp`, `pseudo`,
`mehl`, `essen`,`public`, `virgin`, `studityp`, `comment`,
NULL AS `transferred`, 1 AS `on_waitlist`, 0 AS `version`,
NULL AS `paid`, NULL AS `repaid`, NULL AS `backstepped`
FROM `waitlist` WHERE `transferred` IS NULL;
-- now update those, that were transferred already
UPDATE `bachelor` AS b, `waitlist` AS wl
SET
b.`transferred`=wl.`transferred`,
b.`on_waitlist`=1
WHERE
wl.`waitlist_id` = b.`bachelor_id` AND
wl.`fahrt_id` = b.`fahrt_id`;
-- remove deprecated waitlist table
DROP TABLE IF EXISTS `waitlist`;
\ No newline at end of file
-- Zeug in der Bachelor Datenbank sollte Keys aus der config nutzen!
-- Reiseart
-- "BUSBAHN" => "gemeinsam mit Bus/Bahn",
-- "RAD" => "gemeinsam mit Rad",
-- "AUTO" => "selbst mit Auto",
-- "INDIVIDUELL" => "Kamel/Individuell"
UPDATE `bachelor` SET `antyp` = 'BUSBAHN' WHERE `antyp` = 'gemeinsam mit Bus/Bahn';
UPDATE `bachelor` SET `antyp` = 'RAD' WHERE `antyp` = 'gemeinsam mit Rad';
UPDATE `bachelor` SET `antyp` = 'INDIVIDUELL' WHERE `antyp` = 'selbst mit Auto';
UPDATE `bachelor` SET `antyp` = 'INDIVIDUELL' WHERE `antyp` = 'Kamel/Individuell';
UPDATE `bachelor` SET `abtyp` = 'BUSBAHN' WHERE `abtyp` = 'gemeinsam mit Bus/Bahn';
UPDATE `bachelor` SET `abtyp` = 'RAD' WHERE `abtyp` = 'gemeinsam mit Rad';
UPDATE `bachelor` SET `abtyp` = 'INDIVIDUELL' WHERE `abtyp` = 'selbst mit Auto';
UPDATE `bachelor` SET `abtyp` = 'INDIVIDUELL' WHERE `abtyp` = 'Kamel/Individuell';
-- Essenswunsch
-- "ALLES" => "Alles",
-- "VEGE" => "Vegetarisch",
-- "VEGA" => "Vegan"
UPDATE `bachelor` SET `essen` = 'ALLES' WHERE `essen` = 'Alles';
UPDATE `bachelor` SET `essen` = 'VEGE' WHERE `essen` = 'Vegetarisch';
UPDATE `bachelor` SET `essen` = 'VEGA' WHERE `essen` = 'Vegan';
-- Studityp
-- "ERSTI" => "Ersti",
-- "HOERS" => "Hoersti",
-- "TUTTI" => "Tutor"
UPDATE `bachelor` SET `studityp` = 'ERSTI' WHERE `studityp` = 'Ersti';
UPDATE `bachelor` SET `studityp` = 'HOERS' WHERE `studityp` = 'Hoersti';
UPDATE `bachelor` SET `studityp` = 'TUTTI' WHERE `studityp` = 'Tutor';
UPDATE `bachelor` SET `studityp` = 'ERSTI' WHERE `studityp` = '0';
UPDATE `bachelor` SET `studityp` = 'HOERS' WHERE `studityp` = '1';
UPDATE `bachelor` SET `studityp` = 'TUTTI' WHERE `studityp` = '2';
ALTER TABLE `bachelor`
ADD `signupstats` TEXT DEFAULT NULL;
\ No newline at end of file
ALTER TABLE `fahrten`
ADD `disclaimlink` VARCHAR(255) NOT NULL DEFAULT '';
\ No newline at end of file
ALTER TABLE `bachelor`
MODIFY `bachelor_id` varchar(16) NOT NULL;
CREATE TABLE `archive` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`fahrt_id` int(11) NOT NULL,
`fahrt_name` text CHARACTER SET utf8 NOT NULL,
`tab1` text CHARACTER SET utf8 NOT NULL,
`tab2` text CHARACTER SET utf8 NOT NULL,
`tab3` text CHARACTER SET utf8 NOT NULL,
`moniTab1` text CHARACTER SET utf8 NOT NULL,
`moniTab2` text CHARACTER SET utf8 NOT NULL,
`moniTab3` text CHARACTER SET utf8 NOT NULL,
`moniTabIO` text CHARACTER SET utf8 NOT NULL,
`moniTabIOExtra` text CHARACTER SET utf8 NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
ALTER TABLE `fahrten` ADD `isSummer` TINYINT(1) NOT NULL DEFAULT '0' ;
ALTER TABLE `bachelor` ADD `mGame` TINYINT(1) NOT NULL DEFAULT '1' , ADD `isOrga` TINYINT(1) NOT NULL DEFAULT '0' ;
\ No newline at end of file
registration-system/other/wiki/main.png

976 KiB

<Files users.txt>
Require all denied
</Files>
\ No newline at end of file