[mod] auto pep8
This commit is contained in:
parent
121095dc7c
commit
c250636583
|
|
@ -1,6 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
import sys, os
|
import sys
|
||||||
|
import os
|
||||||
import sqlite3
|
import sqlite3
|
||||||
import locale
|
import locale
|
||||||
import ntpath
|
import ntpath
|
||||||
|
|
@ -16,6 +17,7 @@ __BDD__ = "bdd/main.db"
|
||||||
__CONFDIR__ = os.path.dirname(os.path.realpath("MesCigares.py"))
|
__CONFDIR__ = os.path.dirname(os.path.realpath("MesCigares.py"))
|
||||||
__CONFIGFILE__ = "conf/mescigares.conf"
|
__CONFIGFILE__ = "conf/mescigares.conf"
|
||||||
|
|
||||||
|
|
||||||
class MesCigares:
|
class MesCigares:
|
||||||
|
|
||||||
def on_window_main_destroy(self, widget, data=None):
|
def on_window_main_destroy(self, widget, data=None):
|
||||||
|
|
@ -377,7 +379,6 @@ class MesCigares:
|
||||||
self.scaleq12m.set_value(1)
|
self.scaleq12m.set_value(1)
|
||||||
self.scaleq13m.set_value(1)
|
self.scaleq13m.set_value(1)
|
||||||
|
|
||||||
|
|
||||||
# Calcul de la note globale pour modification d'une note de dégustation
|
# Calcul de la note globale pour modification d'une note de dégustation
|
||||||
def on_scaleqm_change_value(self, scale, enum, new_value):
|
def on_scaleqm_change_value(self, scale, enum, new_value):
|
||||||
# On récupère les notes
|
# On récupère les notes
|
||||||
|
|
@ -476,10 +477,9 @@ class MesCigares:
|
||||||
self.tree.grab_focus()
|
self.tree.grab_focus()
|
||||||
self.tree.set_cursor(path, col, 0)
|
self.tree.set_cursor(path, col, 0)
|
||||||
# On affiche le popup
|
# On affiche le popup
|
||||||
self.popup.show_all();
|
self.popup.show_all()
|
||||||
self.popup.popup(None, None, None, None, event.button, event.time)
|
self.popup.popup(None, None, None, None, event.button, event.time)
|
||||||
|
|
||||||
|
|
||||||
def text_edited(self, widget, path, text):
|
def text_edited(self, widget, path, text):
|
||||||
self.liststore[path][1] = text
|
self.liststore[path][1] = text
|
||||||
|
|
||||||
|
|
@ -525,7 +525,6 @@ class MesCigares:
|
||||||
if len(self.tablemodules) != 0:
|
if len(self.tablemodules) != 0:
|
||||||
self.tablemodules.clear()
|
self.tablemodules.clear()
|
||||||
|
|
||||||
|
|
||||||
cursor = db.cursor()
|
cursor = db.cursor()
|
||||||
cursor.execute('Select id, libelle, provenance from marques order by lower(libelle)')
|
cursor.execute('Select id, libelle, provenance from marques order by lower(libelle)')
|
||||||
rs = cursor.fetchall()
|
rs = cursor.fetchall()
|
||||||
|
|
@ -554,7 +553,6 @@ class MesCigares:
|
||||||
except IndexError:
|
except IndexError:
|
||||||
self.lbl_marque.set_text("")
|
self.lbl_marque.set_text("")
|
||||||
|
|
||||||
|
|
||||||
# Changement dans la liste déroulante des modules
|
# Changement dans la liste déroulante des modules
|
||||||
def on_cbmodules_changed(self, widget):
|
def on_cbmodules_changed(self, widget):
|
||||||
try:
|
try:
|
||||||
|
|
@ -584,7 +582,6 @@ class MesCigares:
|
||||||
# table stocks : id_cigare = max id + 1
|
# table stocks : id_cigare = max id + 1
|
||||||
#print (str(self.entry_nom_cigare.get_text()))
|
#print (str(self.entry_nom_cigare.get_text()))
|
||||||
|
|
||||||
|
|
||||||
cursor = db.cursor()
|
cursor = db.cursor()
|
||||||
cursor.execute('Select max(id) from cigares')
|
cursor.execute('Select max(id) from cigares')
|
||||||
try:
|
try:
|
||||||
|
|
@ -612,7 +609,6 @@ class MesCigares:
|
||||||
if len(self.tablechoixcig) != 0:
|
if len(self.tablechoixcig) != 0:
|
||||||
self.tablechoixcig.clear()
|
self.tablechoixcig.clear()
|
||||||
|
|
||||||
|
|
||||||
cursor = db.cursor()
|
cursor = db.cursor()
|
||||||
cursor.execute('Select c.id, c.designation from cigares c order by c.designation asc')
|
cursor.execute('Select c.id, c.designation from cigares c order by c.designation asc')
|
||||||
rs = cursor.fetchall()
|
rs = cursor.fetchall()
|
||||||
|
|
@ -754,7 +750,6 @@ class MesCigares:
|
||||||
model = self.cbchoixcigqte.get_model()
|
model = self.cbchoixcigqte.get_model()
|
||||||
idc = model[item]
|
idc = model[item]
|
||||||
|
|
||||||
|
|
||||||
cursor = db.cursor()
|
cursor = db.cursor()
|
||||||
cursor.execute("Update stocks set quantite = '{0}' where id_cigare = '{1}'".format(int(self.scaleqte.get_value()), idc[0]))
|
cursor.execute("Update stocks set quantite = '{0}' where id_cigare = '{1}'".format(int(self.scaleqte.get_value()), idc[0]))
|
||||||
db.commit()
|
db.commit()
|
||||||
|
|
@ -807,7 +802,6 @@ class MesCigares:
|
||||||
|
|
||||||
note = int(self.scaleq1.get_value()) + int(self.scaleq2.get_value()) + int(self.scaleq3.get_value()) + int(self.scaleq4.get_value()) + int(self.scaleq5.get_value()) + int(self.scaleq6.get_value()) + int(self.scaleq7.get_value()) + int(self.scaleq8.get_value()) + int(self.scaleq9.get_value()) + int(self.scaleq10.get_value()) + int(self.scaleq11.get_value()) + int(self.scaleq12.get_value()) + int(self.scaleq13.get_value())
|
note = int(self.scaleq1.get_value()) + int(self.scaleq2.get_value()) + int(self.scaleq3.get_value()) + int(self.scaleq4.get_value()) + int(self.scaleq5.get_value()) + int(self.scaleq6.get_value()) + int(self.scaleq7.get_value()) + int(self.scaleq8.get_value()) + int(self.scaleq9.get_value()) + int(self.scaleq10.get_value()) + int(self.scaleq11.get_value()) + int(self.scaleq12.get_value()) + int(self.scaleq13.get_value())
|
||||||
|
|
||||||
|
|
||||||
cursor = db.cursor()
|
cursor = db.cursor()
|
||||||
cursor.execute("insert into degustation (id_cigare,date,commentaires,q1,q2,q3,q4,q5,q6,q7,q8,q9,q10,q11,q12,q13,note) values ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}','{11}','{12}','{13}','{14}','{15}','{16}')".format(itemchoixcig[0], DateDegustation, textlines, int(self.scaleq1.get_value()), int(self.scaleq2.get_value()), int(self.scaleq3.get_value()), int(self.scaleq4.get_value()), int(self.scaleq5.get_value()), int(self.scaleq6.get_value()), int(self.scaleq7.get_value()), int(self.scaleq8.get_value()), int(self.scaleq9.get_value()), int(self.scaleq10.get_value()), int(self.scaleq11.get_value()), int(self.scaleq12.get_value()), int(self.scaleq13.get_value()), note))
|
cursor.execute("insert into degustation (id_cigare,date,commentaires,q1,q2,q3,q4,q5,q6,q7,q8,q9,q10,q11,q12,q13,note) values ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}','{11}','{12}','{13}','{14}','{15}','{16}')".format(itemchoixcig[0], DateDegustation, textlines, int(self.scaleq1.get_value()), int(self.scaleq2.get_value()), int(self.scaleq3.get_value()), int(self.scaleq4.get_value()), int(self.scaleq5.get_value()), int(self.scaleq6.get_value()), int(self.scaleq7.get_value()), int(self.scaleq8.get_value()), int(self.scaleq9.get_value()), int(self.scaleq10.get_value()), int(self.scaleq11.get_value()), int(self.scaleq12.get_value()), int(self.scaleq13.get_value()), note))
|
||||||
# - 1 sur le stock
|
# - 1 sur le stock
|
||||||
|
|
@ -893,10 +887,9 @@ class MesCigares:
|
||||||
self.treeview_wishes.grab_focus()
|
self.treeview_wishes.grab_focus()
|
||||||
self.treeview_wishes.set_cursor(path, col, 0)
|
self.treeview_wishes.set_cursor(path, col, 0)
|
||||||
# On affiche le popup
|
# On affiche le popup
|
||||||
self.popup_test.show_all();
|
self.popup_test.show_all()
|
||||||
self.popup_test.popup(None, None, None, None, event.button, event.time)
|
self.popup_test.popup(None, None, None, None, event.button, event.time)
|
||||||
|
|
||||||
|
|
||||||
# Ouvrir l'url dans le navigateur au clic droit sur une ligne de la treeview des cigares à tester
|
# Ouvrir l'url dans le navigateur au clic droit sur une ligne de la treeview des cigares à tester
|
||||||
def on_gtk_copier_test_activate(self, widget):
|
def on_gtk_copier_test_activate(self, widget):
|
||||||
try:
|
try:
|
||||||
|
|
@ -970,6 +963,7 @@ class MesCigares:
|
||||||
pass
|
pass
|
||||||
return False
|
return False
|
||||||
# Filtrer au changement sur entry_search
|
# Filtrer au changement sur entry_search
|
||||||
|
|
||||||
def on_entry_search_changed(self, data=None):
|
def on_entry_search_changed(self, data=None):
|
||||||
self.tree_filter.refilter()
|
self.tree_filter.refilter()
|
||||||
|
|
||||||
|
|
@ -1034,7 +1028,6 @@ class MesCigares:
|
||||||
self.filechooser_image = self.builder.get_object("filechooser_image")
|
self.filechooser_image = self.builder.get_object("filechooser_image")
|
||||||
self.filechooser_bdd = self.builder.get_object("filechooser_bdd")
|
self.filechooser_bdd = self.builder.get_object("filechooser_bdd")
|
||||||
|
|
||||||
|
|
||||||
# Fenêtre d'ajout d'une marque
|
# Fenêtre d'ajout d'une marque
|
||||||
self.entry_marque = self.builder.get_object("entry_marque")
|
self.entry_marque = self.builder.get_object("entry_marque")
|
||||||
self.entry_provenance = self.builder.get_object("entry_provenance")
|
self.entry_provenance = self.builder.get_object("entry_provenance")
|
||||||
|
|
@ -1196,6 +1189,8 @@ class MesCigares:
|
||||||
self.loadtreeview()
|
self.loadtreeview()
|
||||||
|
|
||||||
# Vérifier qu'il s'agit d'un nombre
|
# Vérifier qu'il s'agit d'un nombre
|
||||||
|
|
||||||
|
|
||||||
def is_number(s):
|
def is_number(s):
|
||||||
try:
|
try:
|
||||||
float(s)
|
float(s)
|
||||||
|
|
@ -1203,6 +1198,7 @@ def is_number(s):
|
||||||
except ValueError:
|
except ValueError:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def createdb(new_bdd):
|
def createdb(new_bdd):
|
||||||
db = sqlite3.connect(new_bdd)
|
db = sqlite3.connect(new_bdd)
|
||||||
cursor = db.cursor()
|
cursor = db.cursor()
|
||||||
|
|
@ -1459,6 +1455,7 @@ def createdb(new_bdd):
|
||||||
|
|
||||||
db.commit()
|
db.commit()
|
||||||
|
|
||||||
|
|
||||||
def checkconfig():
|
def checkconfig():
|
||||||
"""Récupérer la configuration ou la créer"""
|
"""Récupérer la configuration ou la créer"""
|
||||||
# Fichier de configuration
|
# Fichier de configuration
|
||||||
|
|
@ -1492,6 +1489,7 @@ def checkconfig():
|
||||||
createdb(bdd)
|
createdb(bdd)
|
||||||
return(bdd)
|
return(bdd)
|
||||||
|
|
||||||
|
|
||||||
def setconfig(new_bdd):
|
def setconfig(new_bdd):
|
||||||
"""Mettre à jour la configuration"""
|
"""Mettre à jour la configuration"""
|
||||||
config = configparser.RawConfigParser()
|
config = configparser.RawConfigParser()
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
[MesCigares]
|
[MesCigares]
|
||||||
bdd = /home/jlaunay/git/Cigares/app_gestion/MesCigares/bdd/jerome.db
|
bdd = /home/jlaunay/git/Cigares/app_gestion/bdd/jerome.db
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue