Commit 66eb2295 authored by Georges Gressot's avatar Georges Gressot 💬
Browse files

edition enhanced

parent cbd1adc9
......@@ -44,14 +44,14 @@
<p><b>{% trans "Collection mère" %} :</b><font color= #e74c3c > {{ mothercollection }}</font> /
{% trans "Autre(s) collection(s) participante(s)" %} :
{% trans "Collection(s) participante(s)" %} :
{% for i in coliblist %}
{{ i.name }} -
{% endfor %}
/ {% trans "Collection(s) exclue(s)" %} :
{% for k in exliblist %}
{{ exliblist.0 }} [ {{ exclulist.0 }} ] -
{% for k in exlist %}
{{ k.0 }} [{{ k.1 }}, {{ k.2 }}] -
{% endfor %}
</p>
......
epl_version ="v1.18.0 (Gomatrude)"
date_version ="February 01, 2021"
# Mise au niveau de :
epl_version ="v1.19-beta.0 (~Nantechilde )"
date_version ="February 01, 2021"
# epl_version ="v1.19-beta.0 (~Nantechilde )"
# date_version ="February 01, 2021"
from django.shortcuts import render
......@@ -2611,17 +2611,14 @@ def edition(request, sid, lid):
# Contributing collections (lib) ordered by 'rank'
coliblist = []
coitemlist =ItemRecord.objects.filter(sid =sid).exclude(rank =0).order_by("-rank")
coitemlist =ItemRecord.objects.filter(sid =sid).exclude(rank =0).order_by("rank")
for co in coitemlist:
coliblist.append(Library.objects.get(lid = co.lid))
# Not Contributing collections (lib) ordered by 'rank'
exliblist = []
exclulist = []
exitemlist =ItemRecord.objects.filter(sid =sid, rank =0)
for ex in exitemlist:
exliblist.append((Library.objects.get(lid = ex.lid)).name)
exclulist.append(ex.excl)
exlist = []
for elmt in ItemRecord.objects.filter(sid =sid, rank =0):
exlist.append(((Library.objects.get(lid = elmt.lid)).name, elmt.excl, elmt.comm))
return render(request, 'epl/edition.html', locals())
......
......@@ -73,13 +73,15 @@ def pdfedition(request, sid, lid):
datacoll =[]
datacoll.append([_("rang"), _("bibliothèque"), _("info"), _("commentaire")])
for e in ItemRecord.objects.filter(sid =sid).order_by("rank"):
if e.rank ==1:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère"), e.comm])
elif e.rank ==0:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl, e.comm])
else:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part"), e.comm])
tcoll=Table(datacoll)
......@@ -206,13 +208,15 @@ def edallpdf(request, lid):
datacoll =[]
datacoll.append([_("rang"), _("bibliothèque"), _("info"), _("commentaire")])
for e in ItemRecord.objects.filter(sid =sid).order_by("rank"):
if e.rank ==1:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère"), e.comm])
elif e.rank ==0:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl, e.comm])
else:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part"), e.comm])
tcoll=Table(datacoll)
......@@ -342,13 +346,15 @@ def motherpdf(request, lid):
datacoll =[]
datacoll.append([_("rang"), _("bibliothèque"), _("info"), _("commentaire")])
for e in ItemRecord.objects.filter(sid =sid).order_by("rank"):
if e.rank ==1:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère"), e.comm])
elif e.rank ==0:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl, e.comm])
else:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part"), e.comm])
tcoll=Table(datacoll)
......@@ -478,13 +484,15 @@ def notmotherpdf(request, lid):
datacoll =[]
datacoll.append([_("rang"), _("bibliothèque"), _("info"), _("commentaire")])
for e in ItemRecord.objects.filter(sid =sid).order_by("rank"):
if e.rank ==1:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère"), e.comm])
elif e.rank ==0:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl, e.comm])
else:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part"), e.comm])
tcoll=Table(datacoll)
......@@ -614,13 +622,15 @@ def xmotherpdf(request, lid, xlid):
datacoll =[]
datacoll.append([_("rang"), _("bibliothèque"), _("info"), _("commentaire")])
for e in ItemRecord.objects.filter(sid =sid).order_by("rank"):
if e.rank ==1:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère"), e.comm])
elif e.rank ==0:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl, e.comm])
else:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part"), e.comm])
tcoll=Table(datacoll)
......@@ -750,13 +760,15 @@ def xnotmotherpdf(request, lid, xlid):
datacoll =[]
datacoll.append([_("rang"), _("bibliothèque"), _("info"), _("commentaire")])
for e in ItemRecord.objects.filter(sid =sid).order_by("rank"):
if e.rank ==1:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("collection mère"), e.comm])
elif e.rank ==0:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, e.excl, e.comm])
else:
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part")])
datacoll.append([e.rank, Library.objects.get(lid =e.lid).name, _("a pris part"), e.comm])
tcoll=Table(datacoll)
......
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment