diff --git a/bd.properties b/bd.properties index 21f5177..3cb3e93 100644 --- a/bd.properties +++ b/bd.properties @@ -1,4 +1,4 @@ #HSQL Database Engine 2.3.0 -#Sun Dec 08 14:09:00 CET 2013 +#Sun Dec 08 15:15:04 CET 2013 version=2.3.0 modified=no diff --git a/bd.script b/bd.script index b001d5f..edac624 100644 --- a/bd.script +++ b/bd.script @@ -36,7 +36,7 @@ SET SCHEMA PUBLIC CREATE MEMORY TABLE PUBLIC.MEMBRES(IDMEMBRE INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,NOM VARCHAR(20),PRENOM VARCHAR(20),ADRESSE VARCHAR(50),DTN DATE,NUMTEL VARCHAR(20),DROIT INTEGER,DATEADHESION DATE,PASSWORD VARCHAR(20)) ALTER TABLE PUBLIC.MEMBRES ALTER COLUMN IDMEMBRE RESTART WITH 0 CREATE MEMORY TABLE PUBLIC.EVENEMENTS(IDEVENEMENT INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,TYPE INTEGER,DATEE DATE,LIEU VARCHAR(20)) -ALTER TABLE PUBLIC.EVENEMENTS ALTER COLUMN IDEVENEMENT RESTART WITH 12 +ALTER TABLE PUBLIC.EVENEMENTS ALTER COLUMN IDEVENEMENT RESTART WITH 17 CREATE MEMORY TABLE PUBLIC.PARTICIPER(IDEVENEMENT INTEGER,IDMEMBRE INTEGER,ROLE INTEGER,PRIMARY KEY(IDMEMBRE,IDEVENEMENT),FOREIGN KEY(IDMEMBRE) REFERENCES PUBLIC.MEMBRES(IDMEMBRE),FOREIGN KEY(IDEVENEMENT) REFERENCES PUBLIC.EVENEMENTS(IDEVENEMENT)) CREATE MEMORY TABLE PUBLIC.DISCIPLINES(NOMDISIPLINE VARCHAR(20) PRIMARY KEY,IDEVENEMENT INTEGER,FOREIGN KEY(IDEVENEMENT) REFERENCES PUBLIC.EVENEMENTS(IDEVENEMENT)) ALTER SEQUENCE SYSTEM_LOBS.LOB_ID RESTART WITH 1 @@ -62,3 +62,8 @@ INSERT INTO EVENEMENTS VALUES(8,1,'2012-11-20','toulouse') INSERT INTO EVENEMENTS VALUES(9,1,'2012-11-20','toulouse') INSERT INTO EVENEMENTS VALUES(10,1,'2012-11-20','toulouse') INSERT INTO EVENEMENTS VALUES(11,0,'2013-10-12','lol') +INSERT INTO EVENEMENTS VALUES(12,1,'2012-11-20','toulouse') +INSERT INTO EVENEMENTS VALUES(13,1,'2012-11-20','toulouse') +INSERT INTO EVENEMENTS VALUES(14,1,'2012-11-20','toulouse') +INSERT INTO EVENEMENTS VALUES(15,1,'2012-11-20','toulouse') +INSERT INTO EVENEMENTS VALUES(16,1,'2012-11-20','toulouse') diff --git a/bin/controleur/CtrlAccesListe.class b/bin/controleur/CtrlAccesListe.class index f4b322a..e40a835 100644 Binary files a/bin/controleur/CtrlAccesListe.class and b/bin/controleur/CtrlAccesListe.class differ diff --git a/bin/controleur/CtrlLogin.class b/bin/controleur/CtrlLogin.class index 0ff2cbf..a1f0702 100644 Binary files a/bin/controleur/CtrlLogin.class and b/bin/controleur/CtrlLogin.class differ diff --git a/bin/controleur/CtrlSaisieMembre.class b/bin/controleur/CtrlSaisieMembre.class index 7a862fb..b64c1ac 100644 Binary files a/bin/controleur/CtrlSaisieMembre.class and b/bin/controleur/CtrlSaisieMembre.class differ diff --git a/bin/controleur/TocToac.class b/bin/controleur/TocToac.class new file mode 100644 index 0000000..168d811 Binary files /dev/null and b/bin/controleur/TocToac.class differ diff --git a/src/controleur/CtrlAccesListe.java b/src/controleur/CtrlAccesListe.java index 7e486cd..be29322 100644 --- a/src/controleur/CtrlAccesListe.java +++ b/src/controleur/CtrlAccesListe.java @@ -6,6 +6,7 @@ import java.sql.SQLException; import javax.swing.JFrame; +import vue.AfficherListeMembre; import vue.Planning; import modele.Evenements; @@ -13,7 +14,9 @@ import modele.Evenements; public class CtrlAccesListe { - public static void main(String[] args) throws SQLException, InstantiationException, IllegalAccessException, ClassNotFoundException{ + + + public void ctrl() throws SQLException, InstantiationException, IllegalAccessException, ClassNotFoundException{ Evenements e; ResultSet r; @@ -55,6 +58,7 @@ public class CtrlAccesListe { + } } diff --git a/src/controleur/CtrlLogin.java b/src/controleur/CtrlLogin.java index d65d095..01e06bf 100644 --- a/src/controleur/CtrlLogin.java +++ b/src/controleur/CtrlLogin.java @@ -4,8 +4,9 @@ public class CtrlLogin { //attributs //Constructeurs + public CtrlLogin (){}; //méthodes - + } diff --git a/src/controleur/CtrlSaisieMembre.java b/src/controleur/CtrlSaisieMembre.java index 8a2a251..ea436d3 100644 --- a/src/controleur/CtrlSaisieMembre.java +++ b/src/controleur/CtrlSaisieMembre.java @@ -1,14 +1,15 @@ package controleur; +import vue.AfficherListeMembre; import vue.AjoutPersonne; public class CtrlSaisieMembre { - public static void main(String[] args) + public void ctrl() { AjoutPersonne fen = new AjoutPersonne("Ajout nouveau membre", 500, 500); fen.setVisible(true); - + } diff --git a/src/controleur/TocToac.java b/src/controleur/TocToac.java new file mode 100644 index 0000000..9d75088 --- /dev/null +++ b/src/controleur/TocToac.java @@ -0,0 +1,16 @@ +package controleur; + +import java.sql.SQLException; + +public class TocToac { + public static void main(String[] args) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException + { + CtrlAccesListe l = new CtrlAccesListe(); + l.ctrl(); + + CtrlSaisieMembre m = new CtrlSaisieMembre(); + m.ctrl(); + + } + +}