diff --git a/caotek_mesavoirs/models/actifs.py b/caotek_mesavoirs/models/actifs.py new file mode 100644 index 0000000..65c64d0 --- /dev/null +++ b/caotek_mesavoirs/models/actifs.py @@ -0,0 +1,57 @@ +# -*- coding: utf8 -*- +from sqlalchemy import text +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import ( + scoped_session, + sessionmaker, +) + +from zope.sqlalchemy import ZopeTransactionExtension, mark_changed + +from datetime import * +import transaction + +from .default import ( + execute_query, +) + +def get_actifs(request, no_id): + if no_id == '0': + query = "SELECT * FROM actifs ORDER BY symbole" + results = request.dbsession.execute(query).fetchall() + else: + # lire le actif par son identifiant + query = """SELECT * FROM actifs WHERE no_id=:no_id;""" + results = request.dbsession.execute(query, {'no_id': no_id}).first() + return results + +def update_actif(request, no_id, new_values): + # formater les champs + s = '' + for param in new_values.keys(): + if param == 'symbole': + new_values['symbole'] = new_values['symbole'].upper() + + if s: + s += ",%s=:%s" % (param, param) + else: + s = "%s=:%s" % (param, param) + + if no_id == '0': + query = "INSERT INTO actifs SET %s" % s + else: + new_values['no_id'] = no_id + query = "UPDATE actifs SET %s WHERE no_id = :no_id;" % s + execute_query(request, query, new_values) + +def update_actif_devise(request, devise, taux): + query = "UPDATE actifs SET parite = :taux WHERE devise = :devise;" + execute_query(request, query, {'taux': taux, 'devise': devise}) + +def update_actif_valeur(request, symbole, cours): + query = "UPDATE actifs SET cours = :cours WHERE symbole = :symbole;" + execute_query(request, query, {'symbole': symbole, 'cours': cours}) + +def delete_actif(request, no_id): + query = "DELETE FROM actifs WHERE no_id = :no_id ;" + execute_query(request, query, {'no_id': no_id}) \ No newline at end of file diff --git a/caotek_mesavoirs/models/default.py b/caotek_mesavoirs/models/default.py index 6b57fd0..c3c0beb 100644 --- a/caotek_mesavoirs/models/default.py +++ b/caotek_mesavoirs/models/default.py @@ -44,16 +44,6 @@ def delete_doc(request, doc_id): query = "delete from docs where doc_id = :doc_id;" results = request.dbsession.execute(query, {'doc_id': doc_id}) -def get_actifs(request, no_id): - if no_id == '0': - query = "SELECT * FROM actifs ORDER BY symbole" - results = request.dbsession.execute(query).fetchall() - else: - # lire le actif par son identifiant - query = """SELECT * FROM actifs WHERE no_id=:no_id;""" - results = request.dbsession.execute(query, {'no_id': no_id}).first() - return results - def get_categories(request, cat_id): if cat_id == '0': query = "SELECT * FROM categories ORDER BY categorie" @@ -64,25 +54,3 @@ def get_categories(request, cat_id): results = request.dbsession.execute(query, {'cat_id': cat_id}).first() return results -def update_actif(request, no_id, new_values): - # formater les champs - s = '' - for param in new_values.keys(): - if param == 'symbole': - new_values['symbole'] = new_values['symbole'].upper() - - if s: - s += ",%s=:%s" % (param, param) - else: - s = "%s=:%s" % (param, param) - - if no_id == '0': - query = "INSERT INTO actifs SET %s" % s - else: - new_values['no_id'] = no_id - query = "UPDATE actifs SET %s WHERE no_id = :no_id;" % s - execute_query(request, query, new_values) - -def delete_actif(request, no_id): - query = "DELETE FROM actifs WHERE no_id = :no_id ;" - execute_query(request, query, {'no_id': no_id}) \ No newline at end of file diff --git a/caotek_mesavoirs/routes.py b/caotek_mesavoirs/routes.py index e1c701b..d7af096 100644 --- a/caotek_mesavoirs/routes.py +++ b/caotek_mesavoirs/routes.py @@ -4,6 +4,8 @@ def includeme(config): config.add_route('doc_edit', '/doc_edit/{doc_id}') config.add_route('doc_list', '/doc_list') config.add_route('doc_view', '/doc_view/{doc_id}') + # actifs + config.add_route('actifs_list', '/actifs_list') config.add_route('actif_edit', '/actif_edit/{no_id}') # members config.add_route('changer_mdp', '/changer_mdp') diff --git a/caotek_mesavoirs/static/css/style.less b/caotek_mesavoirs/static/css/style.less index 2e2bce5..126143c 100644 --- a/caotek_mesavoirs/static/css/style.less +++ b/caotek_mesavoirs/static/css/style.less @@ -54,6 +54,10 @@ } } +#doc-text { + font-family: Monaco, "Courier New", Courier, monospace; +} + #bg { position: fixed; top: 0; diff --git a/caotek_mesavoirs/templates/actif_edit.pt b/caotek_mesavoirs/templates/actifs/actif_edit.pt similarity index 97% rename from caotek_mesavoirs/templates/actif_edit.pt rename to caotek_mesavoirs/templates/actifs/actif_edit.pt index ff7da1c..dccd359 100644 --- a/caotek_mesavoirs/templates/actif_edit.pt +++ b/caotek_mesavoirs/templates/actifs/actif_edit.pt @@ -55,7 +55,8 @@
- Retour + + Retour + Nouvel actif +
+
+ + + + + + + + + + + + + + + + +
CatégorieSymboleLibelléNombreCoursPRUValeurPlus-ValueNo
+ +
+
+ + + + + +
+ + diff --git a/caotek_mesavoirs/templates/home.pt b/caotek_mesavoirs/templates/home.pt index 2b09d7f..aff4bdd 100644 --- a/caotek_mesavoirs/templates/home.pt +++ b/caotek_mesavoirs/templates/home.pt @@ -1,52 +1,7 @@
-

- - Nouvel actif -

- - - - - - - - - - - - - - - -
NoSymboleLibelléCatégorieNombreCoursPRUValeurPlus-Value
- -
-
- - +
diff --git a/caotek_mesavoirs/templates/layouts/global_layout.pt b/caotek_mesavoirs/templates/layouts/global_layout.pt index d00d5df..864e3f4 100644 --- a/caotek_mesavoirs/templates/layouts/global_layout.pt +++ b/caotek_mesavoirs/templates/layouts/global_layout.pt @@ -50,12 +50,12 @@ -  MES AVOIRS +  MON PORTEFEUILLE