BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kickup/ @ 1085

  → /kickup/ @ 1086

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1085 → Rev 1086

/kickup/trunk/src/ak/kickup/core/model/Event.java
151,7 → 151,7
/**
*
* @hibernate.property
* @hibernate.property column="estart"
*/
public Date getStart()
{
165,7 → 165,7
/**
*
* @hibernate.property
* @hibernate.property column="estop"
*/
public Date getStop()
{

/kickup/trunk/bin/dos2unix.sh
1,4 → 1,4
#!/bin/sh
find . -not -path '*/.svn/*' \( -name '*.java' -or -name '*.jsp' -or -name '*.tld' -or -name '*.xml' -or -name '*.sample' \) -exec sh -c 'tr -d "\r" < {} > tmp; mv tmp {}' \;
find . -not -path '*/.svn/*' \( -name '*.java' -or -name '*.jsp' -or -name '*.tld' -or -name '*.xml' -or -name '*.sample' -or -name '*.sql' \) -exec sh -c 'tr -d "\r" < {} > tmp; mv tmp {}' \;

/kickup/trunk/sql/00.tables.sql
2,172 → 2,173
-- kickup sql tables
--
create sequence hibernate_sequence;
/* removed in this version
create table participants
(
id integer not null,
nick varchar(255) not null,
email varchar(255) not null,
name varchar(255),
phone varchar(255),
create sequence hibernate_sequence;
/* removed in this version
create table participants
(
id integer not null,
nick varchar(255) not null,
email varchar(255) not null,
name varchar(255),
phone varchar(255),
comment text,
mod_stamp timestamp,
constraint participants_prim primary key (id),
constraint participants_email unique(email)
);
*/
create table acts
(
id integer not null,
name varchar(255) not null,
mod_stamp timestamp,
constraint participants_prim primary key (id),
constraint participants_email unique(email)
);
*/
create table acts
(
id integer not null,
name varchar(255) not null,
comment text,
mod_stamp timestamp,
constraint acts_prim primary key (id),
constraint acts_name unique(name)
);
create table apartments
(
id integer not null,
name varchar(255) not null,
address text,
price decimal,
url varchar(4000),
mod_stamp timestamp,
constraint acts_prim primary key (id),
constraint acts_name unique(name)
);
create table apartments
(
id integer not null,
name varchar(255) not null,
address text,
price decimal,
url varchar(4000),
comment text,
mod_stamp timestamp,
constraint apartments_prim primary key (id),
constraint apartments_name unique(name)
);
create table events
(
id integer not null,
name varchar(255) not null,
email varchar(255) not null,
admins varchar(255) not null,
phones varchar(255),
place varchar(255),
address text,
transport_desc text,
start date,
stop date,
last_register date,
last_unregister date,
price decimal,
money_account text,
enabled char(1) default '1',
mod_stamp timestamp,
constraint apartments_prim primary key (id),
constraint apartments_name unique(name)
);
create table events
(
id integer not null,
name varchar(255) not null,
email varchar(255) not null,
admins varchar(255) not null,
phones varchar(255),
place varchar(255),
address text,
transport_desc text,
estart date,
estop date,
last_register date,
last_unregister date,
price decimal,
money_account text,
enabled char(1) default '1',
comment text,
mod_stamp timestamp,
constraint events_prim primary key (id),
constraint events_name unique(name)
);
/*
create table event_files
(
id integer not null,
event integer not null,
name varchar(255) not null,
data file,
type char(1),
mod_stamp timestamp,
constraint events_prim primary key (id),
constraint events_name unique(name)
);
/*
create table event_files
(
id integer not null,
event integer not null,
name varchar(255) not null,
data file,
type char(1),
comment text,
mod_stamp timestamp,
constraint event_files_prim primary key (id)
);
*/
create table event_apartments
(
id integer not null,
event integer not null,
apartment integer not null,
distance decimal,
mod_stamp timestamp,
constraint event_files_prim primary key (id)
);
*/
create table event_apartments
(
id integer not null,
event integer not null,
apartment integer not null,
distance decimal,
comment text,
mod_stamp timestamp,
constraint event_apartments_prim primary key (id),
constraint event_apartments_event foreign key (event) references events(id),
constraint event_apartments_apartment foreign key (apartment) references apartments(id)
);
create table event_acts
(
id integer not null,
event integer not null,
act integer not null,
mod_stamp timestamp,
constraint event_apartments_prim primary key (id),
constraint event_apartments_event foreign key (event) references events(id),
constraint event_apartments_apartment foreign key (apartment) references apartments(id)
);
create table event_acts
(
id integer not null,
event integer not null,
act integer not null,
comment text,
mod_stamp timestamp,
constraint event_acts_prim primary key (id),
constraint event_acts_event foreign key (event) references events(id),
constraint event_acts_act foreign key (act) references acts(id)
);
/* removed in this version
create table participant_events
(
participant integer not null,
event integer not null,
persons integer,
from_zip varchar(10),
from_city varchar(10),
departure datetime,
free_transport integer,
transport_comment integer,
free_sleep integer,
sleep_comment text,
payed char(1) default ' ',
mod_stamp timestamp,
constraint event_acts_prim primary key (id),
constraint event_acts_event foreign key (event) references events(id),
constraint event_acts_act foreign key (act) references acts(id)
);
/* removed in this version
create table participant_events
(
participant integer not null,
event integer not null,
persons integer,
from_zip varchar(10),
from_city varchar(10),
departure datetime,
free_transport integer,
transport_comment integer,
free_sleep integer,
sleep_comment text,
payed char(1) default ' ',
comment text,
mod_stamp timestamp,
constraint participant_events_prim primary key (participant, event)
);
*/
create table participants
(
id integer not null,
ident varchar(255) not null,
nick varchar(255) not null,
email varchar(255) not null,
email_public char(1) default ' ',
name varchar(255),
phone varchar(255),
event integer not null,
persons integer not null,
from_zip varchar(10),
from_city varchar(100),
departure timestamp,
free_transport integer,
transport_comment text,
free_sleep integer,
sleep_comment text,
payed decimal,
mod_stamp timestamp,
constraint participant_events_prim primary key (participant, event)
);
*/
create table participants
(
id integer not null,
ident varchar(255) not null,
nick varchar(255) not null,
email varchar(255) not null,
email_public char(1) default ' ',
name varchar(255),
phone varchar(255),
event integer not null,
persons integer not null,
from_zip varchar(10),
from_city varchar(100),
departure timestamp,
free_transport integer,
transport_comment text,
free_sleep integer,
sleep_comment text,
payed decimal,
comment text,
private_comment text,
mod_stamp timestamp,
constraint participants_prim primary key (id),
constraint participants_email unique(email, event)
);
create table participant_acts
(
id integer not null,
participant integer not null,
act integer not null,
mod_stamp timestamp,
constraint participants_prim primary key (id),
constraint participants_email unique(email, event)
);
create table participant_acts
(
id integer not null,
participant integer not null,
act integer not null,
comment text,
mod_stamp timestamp,
constraint participant_acts_prim primary key (id),
constraint participant_acts_participant foreign key (participant) references participants(id),
constraint participant_acts_act foreign key (act) references acts(id)
);
mod_stamp timestamp,
constraint participant_acts_prim primary key (id),
constraint participant_acts_participant foreign key (participant) references participants(id),
constraint participant_acts_act foreign key (act) references acts(id)
);