MAj
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
from src.m.service import Service
|
||||
from src.m.Service import Service
|
||||
from src.m.connexionBDD import connexionBDD
|
||||
class Entretien(Service):
|
||||
def __init__(self, jourService, moisService, anneeService, jourDemande, moisDemande, anneeDemande, rapport, categorie, idClient):
|
||||
|
@ -1,3 +1,5 @@
|
||||
from src.m.TypePlace import TypePlace
|
||||
|
||||
__author__ = 'sidya'
|
||||
|
||||
class ListeTypePlace:
|
||||
|
@ -1,8 +1,8 @@
|
||||
from src.m.service import Service
|
||||
from src.m.Service import Service
|
||||
from src.m.connexionBDD import connexionBDD
|
||||
import calendar
|
||||
class Livraison(Service):
|
||||
def __init__(self, jourService, moisService, anneeService, jourDemande, moisDemande, anneeDemande, rapport, categorie, idClient):
|
||||
def __init__(self, jourService, moisService, anneeService, jourDemande, moisDemande, anneeDemande, rapport, categorie, idClient):
|
||||
super(Service, self).__init__(self, jourService, moisService, anneeService, jourDemande, moisDemande, anneeDemande, rapport, categorie)
|
||||
self.categorie = 3
|
||||
self.etat = 0
|
||||
@ -14,7 +14,8 @@ class Livraison(Service):
|
||||
idVoiturier = int(''.join(map(str,indiceVoiturier )))
|
||||
connexion.cur.execute("UPDATE service SET idVoiturier= ? WHERE idService = ?", (idVoiturier, self.idService))
|
||||
connexion.seDeconnecter()
|
||||
def effectuerLivraison(self):
|
||||
|
||||
def effectuerLivraison(self):
|
||||
self.etat = 1
|
||||
connexion = connexionBDD()
|
||||
connexion.cur.execute("UPDATE service SET etat= 1 WHERE idService = ?", (self.idService))
|
||||
|
@ -1,4 +1,4 @@
|
||||
from src.m.service import Service
|
||||
from src.m.Service import Service
|
||||
from src.m.connexionBDD import connexionBDD
|
||||
class Maintenance(Service):
|
||||
def __init__(self, jourService, moisService, anneeService, jourDemande, moisDemande, anneeDemande, rapport, categorie, idClient):
|
||||
@ -6,7 +6,8 @@ class Maintenance(Service):
|
||||
self.categorie = 1
|
||||
self.etat = 0
|
||||
self.idService=self.enregistrerService(self, idClient, self.categorie, self.etat)
|
||||
def effectuerMaintenance(self):
|
||||
|
||||
def effectuerMaintenance(self):
|
||||
self.etat = 1
|
||||
connexion = connexionBDD()
|
||||
connexion.cur.execute("UPDATE service SET etat= 1 WHERE idService = ?", (self.idService))
|
@ -50,7 +50,7 @@ class Parking:
|
||||
"""
|
||||
place = None
|
||||
for p in self.__Places:
|
||||
if p.estLibre and p.dimValide(voiture.hauteur, voiture.longueur) :
|
||||
if p.estLibre and p.dimValide(voiture.getHauteur, voiture.getLongueur) :
|
||||
pass
|
||||
place = p
|
||||
break
|
||||
|
@ -16,6 +16,7 @@ class Service:
|
||||
except:
|
||||
print ("la date de service n\'est pas correcte")
|
||||
self.rapport = rapport
|
||||
|
||||
def enregistrerService(self, idClient, categorie, etat):
|
||||
try:
|
||||
connection = connexionBDD()
|
@ -1,23 +1,28 @@
|
||||
__author__ = 'sidya'
|
||||
|
||||
class Voiture:
|
||||
|
||||
class Voiture():
|
||||
def __init__(self, longueur, hauteur, imma):
|
||||
self.__longueur = longueur
|
||||
self.__hauteur = hauteur
|
||||
self.__imma = imma
|
||||
self.__estDansParking = False
|
||||
self._hauteur = hauteur
|
||||
self._longueur = longueur
|
||||
self._immatriculation = imma
|
||||
self._estDansParking = False
|
||||
|
||||
@property
|
||||
def longueur(self):
|
||||
return self.__longueur
|
||||
def getHauteur(self):
|
||||
return self._hauteur
|
||||
|
||||
@property
|
||||
def hauteur(self):
|
||||
return self.__hauteur
|
||||
|
||||
def __str__(self):
|
||||
return "Voiture : hauteur " + str(self.__longueur) + ", largeur" + str(self.hauteur) + ", Imma : " + self.__imma +", est dans parking :" + str(self.__estDansParking)
|
||||
|
||||
def getLongueur(self):
|
||||
return self._longueur
|
||||
|
||||
@property
|
||||
def getImmatriculation(self):
|
||||
return self._immatriculation
|
||||
|
||||
@property
|
||||
def estDansParking(self):
|
||||
return self._estDansParking == True
|
||||
|
||||
#def addPlacement(self, placement):
|
||||
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
import sqlite3
|
||||
class connexionBDD:
|
||||
def __init__(self):
|
||||
self.chemin = "/Users/nadiel/SQLite/BDDprojetPython.sq3"
|
||||
self.chemin = "BDDprojetPython.sq3"
|
||||
self.conn =sqlite3.connect(self.chemin)
|
||||
self.cur =self.conn.cursor()
|
||||
def seDeconnecter(self):
|
||||
|
@ -1,35 +0,0 @@
|
||||
import datetime
|
||||
class Placement:
|
||||
|
||||
def __init__(self):
|
||||
self._dateDebut
|
||||
self._dateFin
|
||||
self._estEnCours
|
||||
|
||||
@property
|
||||
def getDateDebut(self):
|
||||
return self._dateDebut
|
||||
|
||||
#@self._dateDebut.setter
|
||||
def setDateDebut(self, jour, mois, annee):
|
||||
self._dateDebut= datetime.date(jour, mois,annee)
|
||||
|
||||
#@self._DateFin.setter
|
||||
def setDateFin(self, jour, mois, annee):
|
||||
self._dateFin= datetime.date(jour, mois,annee)
|
||||
|
||||
#@estEnCours.setter
|
||||
def setEstEnCours(self, value):
|
||||
self._estEnCours = value
|
||||
|
||||
@property
|
||||
def estEnCours(self):
|
||||
return self._estEnCours
|
||||
|
||||
|
||||
def partirPlace(self, value):
|
||||
self.setEstEnCours(self, False)
|
||||
|
||||
@estEnCours.deleter
|
||||
def partirPlace(self):
|
||||
del self
|
@ -1,40 +0,0 @@
|
||||
|
||||
|
||||
class Voiture():
|
||||
def __init__(self):
|
||||
self._hauteur
|
||||
self._longueur
|
||||
self._immatriculation
|
||||
self._estDansParking
|
||||
|
||||
# @hauteur.setter
|
||||
def setHauteur(self, value):
|
||||
self._hauteur=value
|
||||
|
||||
@property
|
||||
def getHauteur(self):
|
||||
return self._hauteur
|
||||
|
||||
# @longueur.setter
|
||||
def setLongueur(self, value):
|
||||
self._longueur=value
|
||||
|
||||
# @immatriculation.setter
|
||||
def setImmatriculation(self, chaine):
|
||||
self._immatriculation = chaine
|
||||
|
||||
@property
|
||||
def getImmatriculation(self):
|
||||
return self._immatriculation
|
||||
|
||||
#@estDansParking.setter
|
||||
def setEstDansParking(self, value):
|
||||
self._estDansParking =value
|
||||
|
||||
@property
|
||||
def estDansParking(self):
|
||||
return self._estDansParking == True
|
||||
|
||||
#def addPlacement(self, placement):
|
||||
|
||||
|
Reference in New Issue
Block a user