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:
CAO Thien-An
2017-07-26 15:28:17 +02:00
parent ae59de4fe9 c62de5d967
commit 52949ec15b
3 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
caotek_mesavoirs/models/default.py
View File

@@ -22,14 +22,17 @@ def get_docs(request, doc_id):
if doc_id == 0: if doc_id == 0:
query = "SELECT * FROM docs ORDER BY theme, intitule;" query = "SELECT * FROM docs ORDER BY theme, intitule;"
results = request.dbsession.execute(query).fetchall() results = request.dbsession.execute(query).fetchall()
elif doc_id == -1:
query = "SELECT * FROM docs where theme <> 'INTERNE' ORDER BY theme, intitule;"
results = request.dbsession.execute(query).fetchall()
else: else:
query = "SELECT * FROM docs where doc_id = :doc_id;" query = "SELECT * FROM docs where doc_id = :doc_id;"
results = request.dbsession.execute(query, {'doc_id': doc_id}).first() results = request.dbsession.execute(query, {'doc_id': doc_id}).first()
return results return results
def get_docs_bytheme(request, theme):
"""Lire les doc"""
query = "SELECT * FROM docs WHERE theme=:theme ORDER BY intitule;"
results = request.dbsession.execute(query, {'theme': theme}).fetchall()
return results
def update_doc(request, doc_id, intitule, texte, theme): def update_doc(request, doc_id, intitule, texte, theme):
"""créér ou modifier le doc""" """créér ou modifier le doc"""
if doc_id == '0': if doc_id == '0':

43
caotek_mesavoirs/templates/doc_list.pt
View File

@@ -7,20 +7,39 @@
<span class="glyphicon glyphicon-plus"></span>&nbsp; <span class="glyphicon glyphicon-plus"></span>&nbsp;
Créér une nouvelle doc</a> Créér une nouvelle doc</a>
</p> </p>
<table class="table table-condensed table-striped table-bordered"> <div class="col-md-4">
<tr> <table class="table table-condensed table-striped table-bordered">
<th>Intitule</th> <tr>
<th>Thème</th> <th>FINANCE</th>
<th>Dernière mise à jour</th> </tr>
</tr>
<tr tal:repeat="ligne docs"> <tr tal:repeat="ligne docs_finance">
<td><a href="doc_view/${ligne.doc_id}">${ligne.intitule}</a></td> <td><a href="doc_view/${ligne.doc_id}">${ligne.intitule}</a></td>
<td>${ligne.theme}</td> </tr>
<td><span tal:content="ligne.modif_le.strftime('%d/%m/%Y %H:%M')" /></td> </table>
</tr> </div>
<div class="col-md-4">
<table class="table table-condensed table-striped table-bordered">
<tr>
<th>VOITURE</th>
</tr>
</table> <tr tal:repeat="ligne docs_voiture">
<td><a href="doc_view/${ligne.doc_id}">${ligne.intitule}</a></td>
</tr>
</table>
</div>
<div class="col-md-4">
<table class="table table-condensed table-striped table-bordered">
<tr>
<th class=text-center"">MAISON</th>
</tr>
<tr tal:repeat="ligne docs_maison">
<td><a href="doc_view/${ligne.doc_id}">${ligne.intitule}</a></td>
</tr>
</table>
</div>
</div> </div>
<br /> <br />

8
caotek_mesavoirs/views/default.py
View File

@@ -97,11 +97,15 @@ def home(request):
def doc_list(request): def doc_list(request):
# lire toutes les docs # lire toutes les docs
docs = get_docs(request, 0) docs_finance = get_docs_bytheme(request, 'FINANCE')
docs_maison = get_docs_bytheme(request, 'MAISON')
docs_voiture = get_docs_bytheme(request, 'VOITURE')
return { return {
'page_title': u"Documents", 'page_title': u"Documents",
'docs': docs, 'docs_finance': docs_finance,
'docs_maison': docs_maison,
'docs_voiture': docs_voiture,
} }
@view_config(route_name='doc_edit', renderer='../templates/doc_edit.pt', permission='view') @view_config(route_name='doc_edit', renderer='../templates/doc_edit.pt', permission='view')