-
+
+
+
+
{% endblock %}
diff --git a/templates/kit_composition.html b/templates/kit_composition.html
new file mode 100644
index 0000000..0cc1996
--- /dev/null
+++ b/templates/kit_composition.html
@@ -0,0 +1,67 @@
+
+ Nombre maximum de kits: {{ max_kit }}
+ Composition:
+
+
+
+
+
+
+
+
+ {% set row_class = cycler('odd', 'even') %}
+ {% for componant in kit_composition %}
+ {% set qclass='' %}
+ {% if componant.needed > componant.quantity %}
+ {% set qclass='red' %}
+ {% endif %}
+
+ {{ componant.reference }}
+ {{ componant.designation }}
+ {{ componant.needed }}
+ {{ componant.quantity }}
+
+
+ {% endfor %}
+
+ Ajouter un composant:
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/kits.html b/templates/kits.html
index e02145a..c01421b 100644
--- a/templates/kits.html
+++ b/templates/kits.html
@@ -2,7 +2,7 @@
{% block bodyheader %}
{% endblock %}
-{% block title %}Liste des fournisseurs{% endblock %}
+{% block title %}Liste des Kits{% endblock %}
{% block top_menu %}
{% endblock %}
diff --git a/templates/result_componants.html b/templates/result_componants.html
index 024c014..92a5f90 100644
--- a/templates/result_componants.html
+++ b/templates/result_componants.html
@@ -1,5 +1,5 @@
- Résultat:
+ Résultat:
{% set ss='' %}
{% if row_count > 1 %}
{% set ss='s' %}
diff --git a/templates/result_kit_componants.html b/templates/result_kit_componants.html
new file mode 100644
index 0000000..c22e641
--- /dev/null
+++ b/templates/result_kit_componants.html
@@ -0,0 +1,26 @@
+
+ Résultat:
+
diff --git a/templates/result_providers.html b/templates/result_providers.html
index 18d9818..2a5f00f 100644
--- a/templates/result_providers.html
+++ b/templates/result_providers.html
@@ -1,5 +1,5 @@
+
+
+
+
+
+
+ {% set row_class = cycler('odd', 'even') %}
+ {% for componant in componants %}
+
+ {{ componant.reference }}
+ {{ componant.designation }}
+ {{ componant.quantity }}
+ {{ componant.place }}
+
+
+ {% endfor %}
+
- Résultat:
+ Résultat:
{% set ss='' %}
{% if row_count > 1 %}
{% set ss='s' %}
diff --git a/tetastock.py b/tetastock.py
index aad9731..bbf46f5 100755
--- a/tetastock.py
+++ b/tetastock.py
@@ -26,12 +26,14 @@ db = SQLAlchemy(app)
# Database
########################################################################
class Stock_users(db.Model):
+ __tablename__ = 'stock_users'
id = db.Column(db.Integer, primary_key=True)
mail = db.Column(db.Text, nullable=False)
password = db.Column(db.Text, nullable=False)
name = db.Column(db.Text, nullable=False)
class Stock_componants(db.Model):
+ __tablename__ = 'stock_componants'
id = db.Column(db.Integer, primary_key=True)
reference = db.Column(db.Text, nullable=False)
designation = db.Column(db.Text, nullable=False)
@@ -43,6 +45,7 @@ class Stock_componants(db.Model):
provider_id = db.Column(db.Integer, nullable=False)
class Stock_providers(db.Model):
+ __tablename__ = 'stock_providers'
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.Text, nullable=False)
address = db.Column(db.Text)
@@ -51,26 +54,32 @@ class Stock_providers(db.Model):
comment = db.Column(db.Text)
class Stock_kits(db.Model):
+ __tablename__ = 'stock_kits'
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.Text, nullable=False)
designation = db.Column(db.Text, nullable=False)
class Stock_kit_compositions(db.Model):
+ __tablename__ = 'stock_kit_compositions'
id = db.Column(db.Integer, primary_key=True)
- kit_id = db.Column(db.Integer, db.ForeignKey('Stock_kits.id'), nullable=False)
- componant_id = db.Column(db.Integer, db.ForeignKey('Stock_componants.id'), nullable=False)
+ kit_id = db.Column(db.Integer, db.ForeignKey('stock_kits.id'), nullable=False)
+ componant_id = db.Column(db.Integer, db.ForeignKey('stock_componants.id'), nullable=False)
quantity = db.Column(db.Integer, nullable=False)
- price = db.Column(db.Integer, nullable=False)
class Stock_orders(db.Model):
+ __tablename__ = 'stock_orders'
id = db.Column(db.Integer, primary_key=True)
- componant_id = db.Column(db.Integer, db.ForeignKey('Stock_componants.id'))
+ componant_id = db.Column(db.Integer, db.ForeignKey('stock_componants.id'))
componant_quantity = db.Column(db.Integer, nullable=False)
date = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
injected = db.Column(db.Boolean, nullable=False, default=False)
+########################################################################
+# Here comes the fun
+########################################################################
+
def sync_cookies(response, session):
- """ Sync cookies from session """
+ """ Sync cookies with session """
for key in session:
response.set_cookie(key, value=str(session[key]))
if key != u'session':
@@ -126,9 +135,10 @@ def check_user(request, session):
def resume_session(func):
+ """ Resume pending session """
@wraps(func)
def check(*args, **kwargs):
- # Motherfuckin' bunch of defaults values
+ # A motherfuckin' bunch of defaults values
empty=u''
limit = 10
offset = 0
@@ -144,6 +154,8 @@ def resume_session(func):
p_count = 0
k_sort = u'name'
k_count = 0
+ kc_quantity = 0
+ kc_limit = 3
offset_reset = [u'c_reference', u'c_designation', u'c_place',
u'c_provider', u'p_name', u'p_address', u'p_mail', u'p_url',
u'k_name', u'k_designation']
@@ -237,7 +249,16 @@ def resume_session(func):
session[u'k_designation'] = empty
if not u'k_count' in session:
session[u'k_count'] = k_count
-
+ if not u'kc_limit' in session:
+ session[u'kc_limit'] = kc_limit
+ if not u'kc_componant_id' in session:
+ session[u'kc_componant_id'] = empty
+ if not u'kc_quantity' in session:
+ session[u'kc_quantity'] = kc_quantity
+ if not u'kc_designation' in session:
+ session[u'kc_designation'] = empty
+ if not u'kc_reference' in session:
+ session[u'kc_reference'] = empty
# Cookies/session sync
sync_session(request, session, offset_reset)
@@ -266,11 +287,13 @@ def resume_session(func):
########################################################################
@app.errorhandler(404)
def page_not_found(e):
- return render_template('error.html'), 404
+ """ 404 not found """
+ return render_template('error.html'), 404
@app.route("/", methods=['GET', 'POST'])
@resume_session
def authenticate():
+ """ Friend or foo ? """
response = app.make_response(render_template('index.html'))
sync_cookies(response, session)
return response
@@ -283,7 +306,7 @@ def authenticate():
@app.route('/componants', methods=['GET', 'POST'])
@resume_session
def componants():
- """ Main page """
+ """ Componants list """
providers = Stock_providers.query.order_by(Stock_providers.id).all()
return render_template('componants.html',
providers=providers,
@@ -336,6 +359,7 @@ def delete_componant(componant_id):
except ValueError as e:
return render_template('error.html'), 404
except Exception as e:
+ db.session.rollback()
print "[+] Error at delete_componant:"
print "------------------------------"
print "%s" % e.message
@@ -358,6 +382,7 @@ def new_componant():
db.session.add(componant)
commit = db.session.commit()
except Exception as e:
+ db.session.rollback()
print "[+] Error at new_componant:"
print "------------------------------"
print "%s" % e.message
@@ -440,6 +465,7 @@ def update_componants():
@app.route('/providers', methods=['GET', 'POST'])
@resume_session
def providers():
+ """ Providers list """
return render_template('providers.html',
name=session[u'p_name'].decode('utf8'),
address=session[u'p_address'].decode('utf8'),
@@ -491,6 +517,7 @@ def new_provider():
db.session.add(provider)
commit = db.session.commit()
except Exception as e:
+ db.session.rollback()
print "[+] Error at new_provider:"
print "------------------------------"
print "%s" % e.message
@@ -511,6 +538,7 @@ def delete_provider(provider_id):
except ValueError as e:
return render_template('error.html'), 404
except Exception as e:
+ db.session.rollback()
print "[+] Error at delete_provider:"
print "------------------------------"
print "%s" % e.message
@@ -627,6 +655,7 @@ def new_kit():
db.session.add(kit)
commit = db.session.commit()
except Exception as e:
+ db.session.rollback()
print "[+] Error at new_kit:"
print "------------------------------"
print "%s" % e.message
@@ -648,6 +677,7 @@ def delete_kit(kit_id):
except ValueError as e:
return render_template('error.html'), 404
except Exception as e:
+ db.session.rollback()
print "[+] Error at delete_kit:"
print "------------------------------"
print "%s" % e.message
@@ -705,6 +735,129 @@ def search_kits():
print '[c]', key, session[key]
return response
+@app.route('/kits/composition/', methods=['POST'])
+@resume_session
+def get_kit_composition(kit_id):
+ default_max_kit = 999999999999999
+ kit_composition = []
+ max_kit = default_max_kit
+ composition = Stock_kit_compositions.query.filter_by(kit_id=kit_id).with_entities(
+ Stock_kit_compositions.componant_id,
+ Stock_kit_compositions.quantity).all()
+ # FIXME: Use join rather than this ugly work around
+ # FIXME: Good luck !
+ for c_componant in composition:
+ componant = Stock_componants.query.filter_by(id=c_componant.componant_id).first()
+ if componant:
+ c = {u'id': componant.id,
+ u'reference': componant.reference,
+ u'designation': componant.designation,
+ u'quantity': componant.quantity,
+ u'needed': c_componant.quantity
+ }
+ kit_composition.append(c)
+ try:
+ mkit = int(componant.quantity) / int(c_componant.quantity)
+ except ZeroDivisionError as e:
+ print "[+] Error at get_kit_composition:"
+ print "------------------------------"
+ print "%s" % e.message
+ print "------------------------------"
+ if mkit < max_kit:
+ max_kit = mkit
+ if max_kit == default_max_kit:
+ max_kit = 0
+ if len(kit_composition) > 0:
+ return render_template('kit_composition.html', kit_composition=kit_composition, max_kit=max_kit, kit_id=kit_id)
+ return "Aucun composant"
+
+@app.route('/kits/remove//', methods=['GET'])
+@resume_session
+def remove_componant_from_kit(kit_id, componant_id):
+ """ Remove componant from kit """
+ try:
+ kit_id = int(kit_id)
+ Stock_kit_compositions.query.filter_by(kit_id=kit_id).filter_by(componant_id=componant_id).delete()
+ db.session.commit()
+ except ValueError as e:
+ return render_template('error.html'), 404
+ except Exception as e:
+ db.session.rollback()
+ print "[+] Error at remove_componant_from_kit:"
+ print "------------------------------"
+ print "%s" % e.message
+ print "------------------------------"
+ return get_kit(kit_id)
+
+@app.route('/kits/add//', methods=['POST', 'GET'])
+@resume_session
+def add_componant_to_kit(kit_id, componant_id):
+ """ Add componant to kit """
+ try:
+ kit_id = int(kit_id)
+ count = Stock_kit_compositions.query.filter_by(kit_id=kit_id, componant_id=componant_id).count()
+ if count > 0:
+ # Componant already in kit composition
+ # => Updating with new quantity
+ return update_kit_composition(kit_id)
+
+ composition = Stock_kit_compositions(kit_id=kit_id,
+ componant_id=componant_id,
+ quantity=session[u'kc_quantity'])
+ db.session.add(composition)
+ commit = db.session.commit()
+ except ValueError as e:
+ return render_template('error.html'), 404
+ except Exception as e:
+ db.session.rollback()
+ print "[+] Error at add_componant_to_kit:"
+ print "------------------------------"
+ print "%s" % e.message
+ print "------------------------------"
+ return 'KO'
+ if commit != None:
+ return 'KO'
+ return 'OK'
+
+@app.route('/kits/composition/update/', methods=['GET', 'POST'])
+@resume_session
+def update_kit_composition(kit_id):
+ """ Update componant quantity """
+ try:
+ kit_id = int(kit_id)
+ composition = Stock_kit_compositions.query.filter_by(
+ kit_id=kit_id, componant_id=session[u'kc_componant_id']).first()
+ composition.quantity = session[u'kc_quantity']
+ db.session.commit()
+ except ValueError as e:
+ return render_template('error.html'), 404
+ except Exception as e:
+ db.session.rollback()
+ print "[+] Error at update_kit_composition:"
+ print "------------------------------"
+ print "%s" % e.message
+ print "------------------------------"
+ return get_kit(kit_id)
+
+## Componants update result set
+@app.route('/kits/componants/update/', methods=['POST'])
+@resume_session
+def update_kit_componants(kit_id):
+ """ Display componants list """
+ # search by reference
+ like = '%s%s%s' % ('%', str(session[u'kc_reference']), '%')
+ componants = Stock_componants.query.filter(Stock_componants.reference.like(like))
+ # search by designation
+ like = '%s%s%s' % ('%', str(session[u'kc_designation']), '%')
+ componants = componants.filter(Stock_componants.designation.like(like))
+ # Applying limit
+ componants = componants.limit(session[u'kc_limit'])
+ # Get result
+ componants = componants.all()
+ response = app.make_response(render_template('result_kit_componants.html', kit_id=kit_id, componants=componants))
+ sync_cookies(response, session)
+ return response
+
# Main #######################################
if __name__ == '__main__':