phuoc/caotek_monaa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/ctphuoc/caotek_mesavoirs

Browse Source
This commit is contained in:
Phuoc
2017-07-26 14:48:37 +02:00
parent 2ac5de7779 dbeac03c37
commit c62de5d967
11 changed files with 122 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
caotek_mesavoirs/models/actifs.py
View File

@@ -17,7 +17,7 @@ from .default import (
def get_actifs(request, no_id):
if no_id == '0':
query = "SELECT actifs.*, classes.* FROM actifs INNER JOIN classes ON actifs.categorie = classes.classe ORDER BY ordre, libelle"
query = "SELECT actifs.*, classes.* FROM actifs INNER JOIN classes ON actifs.classe = classes.classe ORDER BY ordre, libelle"
results = request.dbsession.execute(query).fetchall()
else:
# lire le actif par son identifiant
@@ -60,26 +60,26 @@ def delete_actif(request, no_id):
query = "DELETE FROM actifs WHERE no_id = :no_id ;"
execute_query(request, query, {'no_id': no_id})
def get_categories(request, no_cat):
def get_allocation(request, no_cat):
if no_cat == '0':
query = """
SELECT categories.*, classes.* FROM categories INNER JOIN classes ON categories.categorie = classes.classe
SELECT allocation.*, classes.* FROM allocation INNER JOIN classes ON allocation.classe = classes.classe
ORDER BY ordre"""
results = request.dbsession.execute(query).fetchall()
else:
# lire le actif par son identifiant
query = """SELECT * FROM categories WHERE no_cat=:no_cat;"""
query = """SELECT * FROM allocation WHERE no_cat=:no_cat;"""
results = request.dbsession.execute(query, {'no_cat': no_cat}).first()
return results
def get_categories_bytype(request, type):
def get_allocation_bytype(request, type):
# lire le actif par son identifiant
query = """SELECT categories.*, classes.* FROM categories INNER JOIN classes ON categories.categorie = classes.classe
query = """SELECT allocation.*, classes.* FROM allocation INNER JOIN classes ON allocation.classe = classes.classe
WHERE type=:type ORDER by ordre;"""
results = request.dbsession.execute(query, {'type': type}).fetchall()
return results
def update_categorie(request, no_cat, new_values):
def update_allocation(request, no_cat, new_values):
# formater les champs
s = ''
for param in new_values.keys():
@@ -89,14 +89,14 @@ def update_categorie(request, no_cat, new_values):
s = "%s=:%s" % (param, param)
if no_cat == '0':
query = "INSERT INTO categories SET %s" % s
query = "INSERT INTO allocation SET %s" % s
else:
new_values['no_cat'] = no_cat
query = "UPDATE categories SET %s WHERE no_cat = :no_cat;" % s
query = "UPDATE allocation SET %s WHERE no_cat = :no_cat;" % s
execute_query(request, query, new_values)
def delete_categorie(request, no_cat):
query = "DELETE FROM categories WHERE no_cat = :no_cat ;"
def delete_allocation(request, no_cat):
query = "DELETE FROM allocation WHERE no_cat = :no_cat ;"
execute_query(request, query, {'no_cat': no_cat})
def get_classes(request, classe):