ScoDoc/ScoDoc
ScoDoc
/
ScoDoc
8
2
Fork 15
Code Issues 143 Pull Requests Projects 3 Releases 107 Wiki Activity

adapt sco_pdf ; discard BACKGROUNF_PREFIX_FILE

This commit is contained in:
Jean-Marie Place 2021-11-05 10:39:02 +01:00
parent dca2486ecc
commit 475d7637a1
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/scodoc/sco_logos.py
View File

@ -129,11 +129,12 @@ class Logo:
def __init__(self, logoname, dept_id=None, prefix=scu.LOGO_FILE_PREFIX): def __init__(self, logoname, dept_id=None, prefix=scu.LOGO_FILE_PREFIX):
"""Initialisation des noms et département des logos. """Initialisation des noms et département des logos.
if prefix = None on recherche simplement une image 'logoname.*'
Le format est renseigné au moment de la lecture (read) ou de la création (create) de l'objet Le format est renseigné au moment de la lecture (read) ou de la création (create) de l'objet
""" """
self.logoname = secure_filename(logoname) self.logoname = secure_filename(logoname)
self.scodoc_dept = dept_id self.scodoc_dept = dept_id
self.prefix = prefix self.prefix = prefix or ""
self.suffix = None self.suffix = None
self.dimensions = None self.dimensions = None
if self.scodoc_dept: if self.scodoc_dept:

19
app/scodoc/sco_pdf.py
View File

@ -60,6 +60,7 @@ from reportlab.lib.pagesizes import letter, A4, landscape
from flask import g from flask import g
import app.scodoc.sco_utils as scu import app.scodoc.sco_utils as scu
from app.scodoc.sco_logos import find_logo
from app.scodoc.sco_utils import ( from app.scodoc.sco_utils import (
CONFIG, CONFIG,
SCODOC_LOGOS_DIR, SCODOC_LOGOS_DIR,
@ -221,18 +222,12 @@ class ScolarsPageTemplate(PageTemplate):
self.logo = None self.logo = None
# XXX COPIED from sco_pvpdf, to be refactored (no time now) # XXX COPIED from sco_pvpdf, to be refactored (no time now)
# Search background in dept specific dir, then in global config dir # Search background in dept specific dir, then in global config dir
for image_dir in ( logo = find_logo(logoname="bul_pdf_background", dept_id=g.scodoc_dept_id, global_if_not_found=, prefix=None)
SCODOC_LOGOS_DIR + "/logos_" + g.scodoc_dept + "/", if logo is None:
SCODOC_LOGOS_DIR + "/", # global logos # Also try to use PV background
): logo = find_logo(logoname="letter_background", dept_id=g.scodoc_dept_id, global_if_not_found=, prefix=None)
for suffix in LOGOS_IMAGES_ALLOWED_TYPES: if logo is not None:
fn = image_dir + "/bul_pdf_background" + "." + suffix self.background_image_filename = logo.filepath
if not self.background_image_filename and os.path.exists(fn):
self.background_image_filename = fn
# Also try to use PV background
fn = image_dir + "/letter_background" + "." + suffix
if not self.background_image_filename and os.path.exists(fn):
self.background_image_filename = fn
def beforeDrawPage(self, canvas, doc): def beforeDrawPage(self, canvas, doc):
"""Draws (optional) background, logo and contribution message on each page. """Draws (optional) background, logo and contribution message on each page.

1
app/scodoc/sco_utils.py
View File

@ -230,7 +230,6 @@ SCODOC_LOGOS_DIR = os.path.join(SCODOC_CFG_DIR, "logos")
LOGOS_IMAGES_ALLOWED_TYPES = ("jpg", "jpeg", "png") # remind that PIL does not read pdf LOGOS_IMAGES_ALLOWED_TYPES = ("jpg", "jpeg", "png") # remind that PIL does not read pdf
LOGOS_DIR_PREFIX = "logos_" LOGOS_DIR_PREFIX = "logos_"
LOGO_FILE_PREFIX = "logo_" LOGO_FILE_PREFIX = "logo_"
BACKGROUND_FILE_PREFIX = ""
# forme générale des noms des fichiers logos/background: # forme générale des noms des fichiers logos/background:
# SCODOC_LOGO_DIR/LOGO_FILE_PREFIX<name>.<suffix> (fichier global) ou # SCODOC_LOGO_DIR/LOGO_FILE_PREFIX<name>.<suffix> (fichier global) ou