diff --git a/src/Launchme.py b/Launchme.py similarity index 100% rename from src/Launchme.py rename to Launchme.py diff --git a/src/c/Borne.py b/src/c/Borne.py index 088f55e..aec2709 100644 --- a/src/c/Borne.py +++ b/src/c/Borne.py @@ -267,9 +267,11 @@ class Borne: ## Gestion du payeent def payer(self): + self.nonVoiture() + self.__ui.btn_quitter.setDisabled(False) + self.__ui.btn_Voiture.setDisabled(False) self.ticketRetrait(self.__placementAPayer, Service.getAllServicePlacement(self.__placementAPayer)) self.__main.activity(self.__nomBorne + " : Recuperation Anonyme : " + str(self.__placementAPayer), self.__main.lvl.INFO) - self.nonVoiture() ## generation ticket depot def ticketDepot(self, id): diff --git a/src/c/Parking.py b/src/c/Parking.py index c0eed27..cafc607 100644 --- a/src/c/Parking.py +++ b/src/c/Parking.py @@ -99,13 +99,15 @@ class DetailsPlaces(CreaParking): super(DetailsPlaces, self).__init__(main) self._ui.lineEdit_nom.setText(parking.nom) - for p in parking.typePlaces : + for p in parking.listeTypePlace : row = self._ui.tableWidget.rowCount() - 1 if row != 0: self._ui.tableWidget.insertRow(row) self._ui.tableWidget.setItem(row, 0, QTableWidgetItem(str(p.hauteur))) self._ui.tableWidget.setItem(row, 1, QTableWidgetItem(str(p.longueur))) - self._ui.tableWidget.setItem(row, 2, QTableWidgetItem(str(p.nb))) + self._ui.tableWidget.setItem(row, 2, QTableWidgetItem(str(p.nombre))) + self._ui.tableWidget.setItem(row, 3, QTableWidgetItem(str(p.niveau))) + self._ui.tableWidget.setItem(row, 4, QTableWidgetItem(str(p.prix))) self._ui.lineEdit_nom.setDisabled(True) self._ui.tableWidget.setDisabled(True) diff --git a/src/c/utils/connexionBDD.py b/src/c/utils/connexionBDD.py index 1447757..1f5a1b1 100644 --- a/src/c/utils/connexionBDD.py +++ b/src/c/utils/connexionBDD.py @@ -6,8 +6,8 @@ import sqlite3 ## Classe de connexion a la bd class connexionBDD: - __chemin = "m/BDDprojetPython.sq3" - __sql = "m/table.sql" + __chemin = "src/m/BDDprojetPython.sq3" + __sql = "src/m/table.sql" ## Construeur de la connexion. Initialise la bd en cas d'inexistance def __init__(self): diff --git a/src/m/Parking.py b/src/m/Parking.py index 457d107..23e09ec 100644 --- a/src/m/Parking.py +++ b/src/m/Parking.py @@ -101,6 +101,18 @@ class Parking: def nbSuperAbo(self): return Place.nbSuperAbo(self.__id) + ## propriete : listeTypePlace + @property + def listeTypePlace(self): + c = connexionBDD() + r = c.execute("SELECT idTypePlace FROM typePlace WHERE idTypePlace in (SELECT idTypePlace FROM place WHERE idParking = '" + str(self.__id) + "')") + rows = r.fetchall() + c.seDeconnecter() + l = [] + for row in rows: + l.append(TypePlace(row["idTypePlace"])) + return l + ## Recherche une place pour une voiture # @param voiture voiture pour laquel on recherche la place # @return Place Si touvé : Place sinon : None diff --git a/src/m/Service.py b/src/m/Service.py index bcec74f..15d9b20 100644 --- a/src/m/Service.py +++ b/src/m/Service.py @@ -21,7 +21,6 @@ class Service: l = [] for row in rows: l.append(Service(row["idService"])) - print("l = " + str(l)) return l ## Retourne tout les services associé a un Placement diff --git a/src/m/test/TestParking.py b/src/m/test/TestParking.py index 11a20d2..635c119 100644 --- a/src/m/test/TestParking.py +++ b/src/m/test/TestParking.py @@ -12,8 +12,8 @@ class TestParking: def TestParking(self): p = Parking(None, "test", [TypePlace(None, 220, 200, 4, 2.5, 1), TypePlace(None, 200, 130, 5, 2.5, 1)]) id = p.id - assert_equal(p.nbPlacesLibresParking, 9, "Nombre de place libre non valide") - assert_equal(p.nbPlaces, 9, "Nombre de place non valide") + assert_equal(p.nbPlacesLibresParking, 13, "Nombre de place libre non valide") + assert_equal(p.nbPlaces, 13, "Nombre de place non valide") assert_equal(p.nbSuperAbo, 0, "Nombre de place super abo") def TestRecherchePlace(self): @@ -23,17 +23,20 @@ class TestParking: place = p.recherchePlace(v) assert_equal(place, None, "Aucune place devrait etre trouve") + p = Parking(None, "test", [TypePlace(None, 220, 200, 4, 2.5, 1)]) v = Voiture(None,None,100,300) place = p.recherchePlace(v) assert_equal(place, None, "Aucune place devrait etre trouve") + p = Parking(None, "test", [TypePlace(None, 220, 200, 4, 2.5, 1)]) v = Voiture(None,None,300,100) place = p.recherchePlace(v) assert_equal(place, None, "Aucune place devrait estre trouve") - v = Voiture(None,None,100,100) + p = Parking(None, "test", [TypePlace(None, 220, 200, 4, 2.5, 1)]) + v = Voiture(None,None,10,10,"lol") place = p.recherchePlace(v) - assert_not_equal(place, None, "Une place devrait etre trouve") + assert_not_equal(place is None, False, "Une place devrait etre trouve") ## Test Place class TestPlace: diff --git a/src/m/test/TestService.py b/src/m/test/TestService.py index e4c5a4c..07f9c6b 100644 --- a/src/m/test/TestService.py +++ b/src/m/test/TestService.py @@ -1,15 +1,49 @@ """ Test Module m/Service """ +import datetime +from nose.tools import assert_equal,assert_not_equal from src.m.Abonnement import Client, TypeAbonnement -from src.m.Parking import Placement - +from src.m.Parking import Placement, Place, Parking, TypePlace from src.m.Service import Service, TypeService +from src.m.Voiture import Voiture ## Test des Service class TestService: ## Test instanciation def TestService(self): - pass - #c = Client(None,"Jean","Paul","1225233",TypeAbonnement.ABONNE) - #Service(None,c ,Placement(),TypeService.ENTRETIEN) \ No newline at end of file + v = Voiture(None, None, 120, 100, "IMMA") + t = TypePlace(None, 220, 200, 4, 2.5, 1) + place = Place(None,Parking(None, "test", [t]),t,2) + placemnent = Placement(None,v,place) + c = Client(None,"Jean","Paul","1225233",TypeAbonnement.ABONNE) + s = Service(None, c, placemnent, TypeService.ENTRETIEN) + assert_equal(s.estRealise, False) + assert_equal(s.typeService, TypeService.ENTRETIEN) + assert_equal(s.placement,placemnent) + + def TestModifService(self): + v = Voiture(None, None, 120, 100, "IMMA") + t = TypePlace(None, 220, 200, 4, 2.5, 1) + place = Place(None,Parking(None, "test", [t]),t,2) + placemnent = Placement(None,v,place) + c = Client(None,"Jean","Paul","1225233",TypeAbonnement.ABONNE) + s = Service(None, c, placemnent, TypeService.LIVRAISON, datetime.time(),"Miraol") + + time = datetime.time() + s.maj(time,"autre") + assert_equal(s.lieu,"autre") + assert_equal(s.dateService,time) + + def TestDoService(self): + v = Voiture(None, None, 120, 100, "IMMA") + t = TypePlace(None, 220, 200, 4, 2.5, 1) + place = Place(None,Parking(None, "test", [t]),t,2) + placemnent = Placement(None,v,place) + c = Client(None,"Jean","Paul","1225233",TypeAbonnement.ABONNE) + s = Service(None, c, placemnent, TypeService.LIVRAISON, datetime.time(),"Miraol") + assert_equal(s.estRealise, False) + s.doService() + assert_equal(s.estRealise, True) + +