functions prv and next acte working only for Charle Ist Bourbon

main
jgenero 3 years ago
parent a1174e6409
commit 2abbf6f9a2

@ -49,7 +49,7 @@ def prince_corpus(house=None, prince=None):
&(Involved_in.invol_in_interv == 1))] &(Involved_in.invol_in_interv == 1))]
prince_acte = [] prince_acte = []
for acte in actes: for acte in actes:
info = [(t.numb_acte, t.date) for t in Acte.select().where( info = [(t.filename, t.date) for t in Acte.select().where(
Acte.id_acte == acte)] Acte.id_acte == acte)]
prince_acte.append(info[0]) prince_acte.append(info[0])
prince_acte = sorted(prince_acte) prince_acte = sorted(prince_acte)
@ -58,10 +58,14 @@ def prince_corpus(house=None, prince=None):
@main.route("/actes/<house>/<prince>/<acte_id>") # don't put a slash at the end @main.route("/actes/<house>/<prince>/<acte_id>") # don't put a slash at the end
def acte(house=None, prince=None, acte_id=None): def acte(house=None, prince=None, acte_id=None):
"""acte route""" """acte route"""
# q_acte = [(t.numb_acte, t.date, t.analysis) for t in Acte.select().where( # q_acte = [(t.filename, t.date, t.analysis) for t in Acte.select().where(
# Acte.numb_acte == acte_id)] # Acte.filename == acte_id)]
q_acte = Acte.select().where(Acte.numb_acte == acte_id) q_acte = Acte.select().where(Acte.filename == acte_id)
return render_template("acte.html", infos=q_acte) acte = Acte.get(Acte.filename == acte_id)
prev_acte = Acte.get_or_none(Acte.id_acte == acte.num_acte - 1)
next_acte = Acte.get_or_none(Acte.id_acte == acte.num_acte + 1)
return render_template("acte.html", house=house, prince=prince, infos=q_acte,
next=next_acte, prev=prev_acte)
@main.route("/contact") @main.route("/contact")
def contact() -> t.Text: def contact() -> t.Text:

@ -6,6 +6,7 @@
<h2>{{item.date}}. — {{item.prod_place_acte}}</h2> <h2>{{item.date}}. — {{item.prod_place_acte}}</h2>
<p>{{item.analysis}}</p> <p>{{item.analysis}}</p>
<p>{{item.diplo_type_acte}}, {{item.state_doc}}. {{item.doc_acte}}, {{item.ref_acte}}</p> <p>{{item.diplo_type_acte}}, {{item.state_doc}}. {{item.doc_acte}}, {{item.ref_acte}}</p>
<p><a href="{{url_for('main.acte', house=house, prince=prince, acte_id=prev.filename)}}">Précédent</a> et <a href="{{url_for('main.acte', house=house, prince=prince, acte_id=next.filename)}}">Suivant</a></p>
{% endfor %} {% endfor %}
</div><!-- /.container --> </div><!-- /.container -->
{% endblock %} {% endblock %}
Loading…
Cancel
Save