[Fix] plus de lignes de + de 80
This commit is contained in:
parent
5a53067805
commit
db47d92589
|
|
@ -1,6 +1,9 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
# pylint: disable=line-too-long
|
||||
"""
|
||||
Application de gestion de cave à cigares
|
||||
WTFPL @ Jérôme LAUNAY
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
|
@ -21,14 +24,18 @@ __BDD__ = "bdd/main.db"
|
|||
__CONFDIR__ = os.path.dirname(os.path.realpath("MesCigares.py"))
|
||||
__CONFIGFILE__ = "conf/mescigares.conf"
|
||||
|
||||
|
||||
"""
|
||||
Class MesCigares
|
||||
"""
|
||||
class MesCigares(object):
|
||||
|
||||
def on_window_main_destroy(self, widget, data=None):
|
||||
@classmethod
|
||||
def on_window_main_destroy(cls, widget, data=None):
|
||||
db.close()
|
||||
gtk.main_quit()
|
||||
|
||||
def on_gtk_quit_activate(self, menuitem, data=None):
|
||||
@classmethod
|
||||
def on_gtk_quit_activate(cls, menuitem, data=None):
|
||||
db.close()
|
||||
gtk.main_quit()
|
||||
|
||||
|
|
@ -338,13 +345,13 @@ class MesCigares(object):
|
|||
def on_modsupp_degustation_activate(self, widget):
|
||||
# On commence par vider la liststore_date_modif_degustation (2ème
|
||||
# utilisation)
|
||||
if len(self.liststore_date_modif_degustation) != 0:
|
||||
self.liststore_date_modif_degustation.clear()
|
||||
if len(self.lstore_dmodif_degust) != 0:
|
||||
self.lstore_dmodif_degust.clear()
|
||||
|
||||
cursor = db.cursor()
|
||||
# On regarde récupère le commentaire
|
||||
cursor.execute("select date, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10," +
|
||||
"q11, q12, q13, id, commentaires from degustation " +
|
||||
cursor.execute("select date,q1,q2,q3,q4,q5,q6,q7,q8,q9,q10," +
|
||||
"q11,q12,q13,id,commentaires from degustation " +
|
||||
"where id_cigare = " +
|
||||
"'{0}'".format(self.treeview_selection[5]))
|
||||
rs = cursor.fetchall()
|
||||
|
|
@ -378,8 +385,8 @@ class MesCigares(object):
|
|||
q13 = item[13]
|
||||
idcomm = item[14]
|
||||
commentaire = item[15]
|
||||
itr = self.liststore_date_modif_degustation.append()
|
||||
self.liststore_date_modif_degustation.set(
|
||||
itr = self.lstore_dmodif_degust.append()
|
||||
self.lstore_dmodif_degust.set(
|
||||
itr, 0, date, 1, q1, 2, q2, 3, q3, 4, q4, 5, q5, 6,
|
||||
q6, 7, q7, 8, q8, 9, q9, 10, q10, 11, q11, 12, q12,
|
||||
13, q13, 14, idcomm, 15, commentaire)
|
||||
|
|
@ -397,14 +404,14 @@ class MesCigares(object):
|
|||
q = list()
|
||||
try:
|
||||
for i in range(1, 14):
|
||||
q.append(self.liststore_date_modif_degustation[index][i])
|
||||
idcomm = self.liststore_date_modif_degustation[index][14]
|
||||
q.append(self.lstore_dmodif_degust[index][i])
|
||||
# idcomm = self.lstore_dmodif_degust[index][14]
|
||||
|
||||
except IndexError:
|
||||
pass
|
||||
|
||||
try:
|
||||
commentaire = self.liststore_date_modif_degustation[index][15]
|
||||
commentaire = self.lstore_dmodif_degust[index][15]
|
||||
self.txtview_commentaire_modif.get_buffer().set_text(commentaire)
|
||||
except IndexError:
|
||||
self.txtview_commentaire_modif.get_buffer().set_text("")
|
||||
|
|
@ -459,7 +466,8 @@ class MesCigares(object):
|
|||
note.append(int(self.scaleq13m.get_value()))
|
||||
|
||||
# On affiche la note / 100 temporaire
|
||||
self.lbl_note_totale.set_text("Nouvelle note: {0}/100".format(sum(note)))
|
||||
self.lbl_note_totale.set_text(
|
||||
"Nouvelle note: {0}/100".format(sum(note)))
|
||||
|
||||
# Validation de la modification d'une dégustation
|
||||
def on_btvalid_degustation_clicked(self, widget):
|
||||
|
|
@ -488,7 +496,7 @@ class MesCigares(object):
|
|||
note.append(int(self.scaleq13m.get_value()))
|
||||
|
||||
# Le commentaire et l'id
|
||||
idcomm = self.liststore_date_modif_degustation[index][14]
|
||||
idcomm = self.lstore_dmodif_degust[index][14]
|
||||
id_cigare = self.treeview_selection[5]
|
||||
|
||||
# On met à jour la base de données
|
||||
|
|
@ -512,7 +520,7 @@ class MesCigares(object):
|
|||
self.msgdialog.format_secondary_text(
|
||||
"Modification de la dégustation pour " +
|
||||
"{0}.\nNouvelle note: {1}".format(
|
||||
self.treeview_selection[1],sum(note)))
|
||||
self.treeview_selection[1], sum(note)))
|
||||
|
||||
self.msgdialog.run()
|
||||
self.msgdialog.hide()
|
||||
|
|
@ -586,16 +594,20 @@ class MesCigares(object):
|
|||
cursor = db.cursor()
|
||||
# update cigares.designation
|
||||
if operation == 'nom':
|
||||
sql = "update cigares set designation = '{0}' where id = '{1}'".format(
|
||||
new_text.replace("'", "''"), str(indice))
|
||||
sql = (
|
||||
"update cigares set designation =" +
|
||||
"'{0}' where id = '{1}'".format(
|
||||
new_text.replace("'", "''"), str(indice)))
|
||||
# print(sql)
|
||||
cursor.execute(sql)
|
||||
db.commit()
|
||||
|
||||
# update quantité dans table stock
|
||||
if operation == 'id':
|
||||
sql = "update stocks set quantite = '{0}' where id_cigare='{1}'".format(
|
||||
new_text, str(indice))
|
||||
sql = (
|
||||
"update stocks set quantite = " +
|
||||
"'{0}' where id_cigare='{1}'".format(
|
||||
new_text, str(indice)))
|
||||
# print(sql)
|
||||
cursor.execute(sql)
|
||||
db.commit()
|
||||
|
|
@ -613,8 +625,11 @@ class MesCigares(object):
|
|||
self.tablemodules.clear()
|
||||
|
||||
cursor = db.cursor()
|
||||
cursor.execute(
|
||||
'Select id, libelle, provenance from marques order by lower(libelle)')
|
||||
|
||||
sql = ('Select id,libelle,provenance '
|
||||
'from marques order by lower(libelle)')
|
||||
|
||||
cursor.execute(sql)
|
||||
rs = cursor.fetchall()
|
||||
# On alimente la combobox des marques
|
||||
for item in rs:
|
||||
|
|
@ -622,8 +637,11 @@ class MesCigares(object):
|
|||
self.tablemarques.set(iter, 0, item[0], 1,
|
||||
item[1].title(), 2, item[2].title())
|
||||
|
||||
cursor.execute(
|
||||
'Select id, module, longueur, diametre, calibre from modules order by lower(module)')
|
||||
sql = ('Select id, module, longueur, diametre, calibre '
|
||||
'from modules order by lower(module)')
|
||||
|
||||
cursor.execute(sql)
|
||||
|
||||
rs = cursor.fetchall()
|
||||
# Et celle des modules
|
||||
for item in rs:
|
||||
|
|
@ -674,8 +692,8 @@ class MesCigares(object):
|
|||
itemmodel = model[index]
|
||||
# item[0] = id à insérer dans champ marque de la table cigares
|
||||
# print (str(itemmodel[0]), str(itemmodel[1]))
|
||||
# Il faudra faire une requete sur cigares pour obtenir le dernier id et faire
|
||||
# + 1 : Select max(id) from cigares
|
||||
# Il faudra faire une requete sur cigares pour obtenir le dernier id
|
||||
# et faire + 1 : Select max(id) from cigares
|
||||
# table stocks : id_cigare = max id + 1
|
||||
# print (str(self.entry_nom_cigare.get_text()))
|
||||
|
||||
|
|
@ -742,14 +760,16 @@ class MesCigares(object):
|
|||
self.msgdialog.hide()
|
||||
return
|
||||
# Mauvais prix unité
|
||||
if self.notebook_achats.get_current_page() == 0 and not is_number(self.entry_prix_achats.get_text()):
|
||||
if self.notebook_achats.get_current_page() == 0 \
|
||||
and not is_number(self.entry_prix_achats.get_text()):
|
||||
self.msgdialog.format_secondary_text(
|
||||
"Saisie erronée pour le prix du cigare.")
|
||||
self.msgdialog.run()
|
||||
self.msgdialog.hide()
|
||||
return
|
||||
# Mauvais prix boite
|
||||
if self.notebook_achats.get_current_page() == 1 and not is_number(self.entry_prix_boite.get_text()):
|
||||
if self.notebook_achats.get_current_page() == 1 \
|
||||
and not is_number(self.entry_prix_boite.get_text()):
|
||||
self.msgdialog.format_secondary_text(
|
||||
"Saisie erronée pour le prix de la boite.")
|
||||
self.msgdialog.run()
|
||||
|
|
@ -798,10 +818,11 @@ class MesCigares(object):
|
|||
cursor.close()
|
||||
|
||||
# Afficher un message d'infos pour confirmer
|
||||
#self.msgdialog.format_secondary_text("Achats ajoutés avec succés " +
|
||||
#"pour {0}".format(itemchoixcig[1]))
|
||||
#self.msgdialog.run()
|
||||
#self.msgdialog.hide()
|
||||
self.msgdialog.format_secondary_text(
|
||||
"Achats ajoutés avec succés " +
|
||||
"pour {0}".format(itemchoixcig[1]))
|
||||
self.msgdialog.run()
|
||||
self.msgdialog.hide()
|
||||
|
||||
# On recharge la liste des cigares
|
||||
self.loadtreeview()
|
||||
|
|
@ -853,8 +874,12 @@ class MesCigares(object):
|
|||
self.tablechoixcig.clear()
|
||||
|
||||
cursor = db.cursor()
|
||||
cursor.execute(
|
||||
'Select c.id, c.designation from cigares c order by c.designation asc')
|
||||
|
||||
sql = ('Select c.id, c.designation '
|
||||
'from cigares c order by c.designation asc')
|
||||
|
||||
cursor.execute(sql)
|
||||
|
||||
rs = cursor.fetchall()
|
||||
for item in rs:
|
||||
iter = self.tablechoixcig.append()
|
||||
|
|
@ -910,12 +935,12 @@ class MesCigares(object):
|
|||
def on_btvalid_clicked(self, widget):
|
||||
|
||||
# On formate la date (ajout d'un 0 si besoin)
|
||||
j = str(self.DegustationDate.get_date()[2])
|
||||
if len(str(self.DegustationDate.get_date()[1] + 1)) == 1:
|
||||
m = "0" + str(self.DegustationDate.get_date()[1] + 1)
|
||||
j = str(self.degustationdate.get_date()[2])
|
||||
if len(str(self.degustationdate.get_date()[1] + 1)) == 1:
|
||||
m = "0" + str(self.degustationdate.get_date()[1] + 1)
|
||||
else:
|
||||
m = str(self.DegustationDate.get_date()[1] + 1)
|
||||
a = self.DegustationDate.get_date()[0]
|
||||
m = str(self.degustationdate.get_date()[1] + 1)
|
||||
a = self.degustationdate.get_date()[0]
|
||||
|
||||
# Formatage de la date du calendar au format %d/%m/%Y
|
||||
DateDegustation = "{0}/{1}/{2}".format(j, m, a)
|
||||
|
|
@ -964,8 +989,8 @@ class MesCigares(object):
|
|||
db.commit()
|
||||
cursor.close()
|
||||
|
||||
# TODO(jlaunay) ajouter une checkbox sur le formulaire pour choisir si retirer 1
|
||||
# du stock ou non
|
||||
# TODO(jlaunay) ajouter une checkbox sur le formulaire
|
||||
# pour choisir si retirer 1 du stock ou non
|
||||
self.msgdialog.format_secondary_text(
|
||||
"Note de dégustation ajoutée avec succès pour : " +
|
||||
"{0}.\n1 cigare retiré du stock.".format(itemchoixcig[1]))
|
||||
|
|
@ -1158,7 +1183,7 @@ class MesCigares(object):
|
|||
# Modification/Suppression d'une note de dégustation
|
||||
self.window_modif_degustation = self.builder.get_object(
|
||||
"window_modif_degustation")
|
||||
self.liststore_date_modif_degustation = self.builder.get_object(
|
||||
self.lstore_dmodif_degust = self.builder.get_object(
|
||||
"liststore_date_modif_degustation")
|
||||
self.cbchoix_date_modif_degustation = self.builder.get_object(
|
||||
"cbchoix_date_modif_degustation")
|
||||
|
|
@ -1236,7 +1261,7 @@ class MesCigares(object):
|
|||
# Image pour afficher le preview dans la zone rétractable
|
||||
self.image_preview = self.builder.get_object("image_preview")
|
||||
# Date pour la dégustation
|
||||
self.DegustationDate = self.builder.get_object("calendar_degustation")
|
||||
self.degustationdate = self.builder.get_object("calendar_degustation")
|
||||
|
||||
# Fenêtre de gestion des achats
|
||||
self.dialog_achats = self.builder.get_object("dialog_achats")
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue