From cef87901a475e8fd96e9d9a789b622c1820ba94d Mon Sep 17 00:00:00 2001
From: nadiel <nadielmehdi@gmail.com>
Date: Mon, 12 Jan 2015 16:04:14 +0100
Subject: [PATCH] ...

---
 src/m/abonnement.py | 10 ++++++++++
 src/m/contrat.py    | 18 +++++-------------
 src/m/place.py      | 23 ++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 src/m/abonnement.py

diff --git a/src/m/abonnement.py b/src/m/abonnement.py
new file mode 100644
index 0000000..53f1b29
--- /dev/null
+++ b/src/m/abonnement.py
@@ -0,0 +1,10 @@
+from src.m.connexionBDD import connexionBDD
+class Abonnement:
+    def __init__(self, libelle, prix, estPackGar):
+        self.libelle = libelle
+        self.prix = prix
+        self.estPackGar = estPackGar
+    def addContrat(self, contrat):
+        connexion = connexionBDD()
+       # indId= connexion.cur.execute("SELECT abonnement.idAbonnement FROM abonnement WHERE libelle = ? AND prix = ? AND estPackGar=?;"(self.libelle, self.prix, self.estPackGar))
+       # idAbonnement = int(''.join(map(str,indId)))
diff --git a/src/m/contrat.py b/src/m/contrat.py
index 8ef9f6c..b7d4fa7 100644
--- a/src/m/contrat.py
+++ b/src/m/contrat.py
@@ -4,20 +4,12 @@ class Contrat:
         self.dateDebut = dateDebut
         self.dateFin = dateFin
     def enregistrerContrat(self):
-
             connection = connexionBDD()
-            #1.obtenir id service (fonction max de sqlite ne marche pas bien...elle ne prend en compte que le premier chiffre. Ex: max(56,9)= 9... )
-            connection.cur.execute("SELECT count(service.idSercice) FROM service;")
-            #entrée dans la base de donnée
-            #2. obtenir l'idClient: définir une variable globale lors de l'execution du "jeu"
-            #3.Obtenir l'idVoiturier: en recherchant celui qui est disponible le jour en question
-
-            connection.cur.execute("INSERT INTO contrat (idContrat,dateDebut,dateFin, estEncours) VALUES (NULL,?,?,?);",( self.dateDebut, self.dateFin,1) )
+            connection.cur.execute("INSERT INTO contrat (idContrat,dateDebut,dateFin, estEncours) VALUES (NULL,?,?,1);",( self.dateDebut, self.dateFin,1) )
             connection.seDeconnecter()
-    def rompreContrat(self):
-
-
+    def rompreContrat(self, idCLient):
          connection = connexionBDD()
-         connection.cur.execute("SELECT count(service.idSercice) FROM service;")
-         connection.cur.execute("INSERT INTO contrat (idContrat,dateDebut,dateFin, estEncours) VALUES (NULL,?,?,?);",( self.dateDebut, self.dateFin,1) )
+         indContrat  =connection.cur.execute("SELECT Contrat.idContrat FROM contrat where idClient =? AND dateDebut = ? AND dateFin=? ;"(idCLient, self.dateDebut, self.dateFin))
+         idContrat= int(''.join(map(str,indContrat)))
+         connection.cur.execute("Update contrat where idContrat=? set estEnCours =0;",( idContrat) )
          connection.seDeconnecter()
diff --git a/src/m/place.py b/src/m/place.py
index 5e1e6b7..0dd919c 100644
--- a/src/m/place.py
+++ b/src/m/place.py
@@ -17,8 +17,29 @@ class Place:
     def longueur(self):
         return self.longueur
     @property
+<<<<<<< Updated upstream
+    def nbPlaceTotal(self):
+        i = 0
+        for t in self.l:
+            i += t.nb
+        return i
+
+    @property
+    def liste(self):
+        return self.l
+
+
+
+
+class Placement:
+    def __init__(self,debut,fin):
+        self.debut = debut
+        self.fin = fin
+
+=======
     def estLibre(self):
         return self.estLibre
+>>>>>>> Stashed changes
     @property
     def hauteur(self):
         return self.hauteur
@@ -35,4 +56,4 @@ class Place:
        newplace = Placement()
        newplace.setDateDebut(jourDeb, moisDeb, anneeDeb)
        newplace.setDateFin(jourFin, moisFin, anneeFin)
-       newplace.setEstEnCours(True)
\ No newline at end of file
+       newplace.setEstEnCours(True)