jmplace/DocScoDoc
1
0
Fork 0
forked from ScoDoc/DocScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

modif gestion VERSION

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-08-21 17:07:44 +02:00
parent 3ca58019a4
commit ae46d29f01
33 changed files with 92 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1,2 +0,0 @@
9.0.0-alpha

13
app/__init__.py
View File

@ -6,7 +6,7 @@ import os
import sys
import logging
from logging.handlers import SMTPHandler, RotatingFileHandler
from logging.handlers import SMTPHandler, TimedRotatingFileHandler
from flask import request
from flask import Flask
@ -22,6 +22,7 @@ from flask_moment import Moment
from flask_caching import Cache
from config import DevConfig
import sco_version
db = SQLAlchemy()
migrate = Migrate()
@ -96,7 +97,7 @@ def create_app(config_class=DevConfig):
mailhost=(app.config["MAIL_SERVER"], app.config["MAIL_PORT"]),
fromaddr="no-reply@" + app.config["MAIL_SERVER"],
toaddrs=[app.config["ADMINS"]],
subject="ScoDoc8 Failure",
subject="ScoDoc Failure",
credentials=auth,
secure=secure,
)
@ -105,8 +106,10 @@ def create_app(config_class=DevConfig):
if not os.path.exists("logs"):
os.mkdir("logs")
file_handler = RotatingFileHandler(
"logs/scodoc.log", maxBytes=10240, backupCount=10
file_handler = TimedRotatingFileHandler(
"/opt/scodoc-data/log/scodoc.log",
when="W6", # Sunday
backupCount=53, # 1 an de logs
)
file_handler.setFormatter(
logging.Formatter(
@ -117,7 +120,7 @@ def create_app(config_class=DevConfig):
app.logger.addHandler(file_handler)
app.logger.setLevel(logging.INFO)
app.logger.info("ScoDoc8 startup")
app.logger.info(f"{sco_version.SCONAME} {sco_version.SCOVERSION} startup")
return app

4
app/scodoc/html_sco_header.py
View File

@ -37,7 +37,7 @@ from flask_login import current_user
import app.scodoc.sco_utils as scu
from app.scodoc.notes_log import log
from app.scodoc import html_sidebar
from app.scodoc import VERSION
import sco_version
# Some constants:
@ -165,7 +165,7 @@ def sco_header(
head_message = request.args.get("head_message", "")
params = {
"page_title": page_title or VERSION.SCONAME,
"page_title": page_title or sco_version.SCONAME,
"no_side_bar": no_side_bar,
"ScoURL": scu.ScoURL(),
"encoding": scu.SCO_ENCODING,

4
app/scodoc/sco_bulletins_generator.py
View File

@ -53,12 +53,12 @@ from reportlab.platypus import SimpleDocTemplate, Paragraph, Spacer, Frame, Page
from reportlab.platypus import Table, TableStyle, Image, KeepInFrame
from app.scodoc import sco_utils as scu
from app.scodoc import VERSION
from app.scodoc.sco_exceptions import NoteProcessError
from app.scodoc.notes_log import log
from app.scodoc import sco_formsemestre
from app.scodoc import sco_pdf
from app.scodoc.sco_pdf import PDFLOCK
import sco_version
# Liste des types des classes de générateurs de bulletins PDF:
BULLETIN_CLASSES = collections.OrderedDict()
@ -217,7 +217,7 @@ class BulletinGenerator(object):
sco_pdf.ScolarsPageTemplate(
document,
author="%s %s (E. Viennet) [%s]"
% (VERSION.SCONAME, VERSION.SCOVERSION, self.description),
% (sco_version.SCONAME, sco_version.SCOVERSION, self.description),
title="Bulletin %s de %s"
% (sem["titremois"], self.infos["etud"]["nomprenom"]),
subject="Bulletin de note",

4
app/scodoc/sco_bulletins_pdf.py
View File

@ -60,7 +60,6 @@ from reportlab.platypus.doctemplate import PageTemplate, BaseDocTemplate
from flask import g, url_for
from app.scodoc import VERSION
import app.scodoc.sco_utils as scu
from app.scodoc.notes_log import log
from app.scodoc import sco_cache
@ -68,6 +67,7 @@ from app.scodoc import sco_formsemestre
from app.scodoc import sco_pdf
from app.scodoc import sco_preferences
from app.scodoc import sco_etud
import sco_version
def pdfassemblebulletins(
@ -95,7 +95,7 @@ def pdfassemblebulletins(
document.addPageTemplates(
sco_pdf.ScolarsPageTemplate(
document,
author="%s %s (E. Viennet)" % (VERSION.SCONAME, VERSION.SCOVERSION),
author="%s %s (E. Viennet)" % (sco_version.SCONAME, sco_version.SCOVERSION),
title="Bulletin %s" % bul_title,
subject="Bulletin de note",
server_name=server_name,

2
app/scodoc/sco_config.py
View File

@ -49,7 +49,7 @@ CONFIG.LOGO_HEADER_HEIGHT = 28
# minute: Minute as a decimal number [00,59].
#
# server_url: URL du serveur ScoDoc
# scodoc_name: le nom du logiciel (ScoDoc actuellement, voir VERSION.py)
# scodoc_name: le nom du logiciel (ScoDoc actuellement, voir sco_version.py)
CONFIG.DEFAULT_PDF_FOOTER_TEMPLATE = "Edité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s sur %(server_url)s"
#

6
app/scodoc/sco_cost_formation.py
View File

@ -35,8 +35,8 @@ from app.scodoc.gen_tables import GenTable
from app.scodoc import sco_formsemestre
from app.scodoc import sco_moduleimpl
from app.scodoc import sco_formsemestre_status
from app.scodoc import VERSION
from app.scodoc import sco_preferences
import sco_version
def formsemestre_table_estim_cost(
@ -141,7 +141,9 @@ def formsemestre_table_estim_cost(
(dans ce cas, retoucher le tableau excel exporté).
</div>
""",
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
filename="EstimCout-S%s" % sem["semestre_id"],
)
return tab

6
app/scodoc/sco_debouche.py
View File

@ -34,7 +34,6 @@ from flask import url_for, g
import app.scodoc.sco_utils as scu
import app.scodoc.notesdb as ndb
from app.scodoc.notes_log import log
from app.scodoc import VERSION
from app.scodoc.sco_exceptions import AccessDenied
from app.scodoc.scolog import logdb
from app.scodoc.gen_tables import GenTable
@ -45,6 +44,7 @@ from app.scodoc import sco_permissions_check
from app.scodoc import sco_preferences
from app.scodoc import sco_tag_module
from app.scodoc import sco_etud
import sco_version
def report_debouche_date(start_year=None, format="html", REQUEST=None):
@ -60,7 +60,9 @@ def report_debouche_date(start_year=None, format="html", REQUEST=None):
tab = table_debouche_etudids(etudids, keep_numeric=keep_numeric)
tab.filename = scu.make_filename("debouche_scodoc_%s" % start_year)
tab.origin = "Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + ""
tab.origin = (
"Généré par %s le " % sco_version.SCONAME + scu.timedate_human_repr() + ""
)
tab.caption = "Récapitulatif débouchés à partir du 1/1/%s." % start_year
tab.base_url = "%s?start_year=%s" % (REQUEST.URL0, start_year)
return tab.make_page(

4
app/scodoc/sco_dump_db.py
View File

@ -58,7 +58,7 @@ from app.scodoc.notes_log import log
from app.scodoc import html_sco_header
from app.scodoc import sco_preferences
from app.scodoc import sco_users
from app.scodoc import VERSION
import sco_version
from app.scodoc.sco_exceptions import ScoValueError
SCO_DUMP_LOCK = "/tmp/scodump.lock"
@ -194,7 +194,7 @@ def _send_db(REQUEST, ano_db_name):
"sent_by": sco_users.user_info(str(REQUEST.AUTHENTICATED_USER))[
"nomcomplet"
],
"sco_version": VERSION.SCOVERSION,
"sco_version": sco_version.SCOVERSION,
"sco_fullversion": scu.get_scodoc_version(),
},
)

2
app/scodoc/sco_edit_ue.py
View File

@ -1022,7 +1022,7 @@ def formation_table_recap(formation_id, format="html", REQUEST=None):
columns_ids=columns_ids,
rows=T,
titles=titles,
origin="Généré par %s le " % scu.VERSION.SCONAME
origin="Généré par %s le " % scu.sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
caption=title,

4
app/scodoc/sco_emails.py
View File

@ -45,7 +45,7 @@ import time
import app.scodoc.sco_utils as scu
from app.scodoc.notes_log import log
from app.scodoc import VERSION
import sco_version
def sendEmail(msg): # TODO A REECRIRE ScoDoc8
@ -124,7 +124,7 @@ def _report_request(REQUEST, fmt="txt"):
HTTP_USER_AGENT=HTTP_USER_AGENT,
form=REQUEST.form,
HTTP_X_FORWARDED_FOR="?",
SCOVERSION=VERSION.SCOVERSION,
SCOVERSION=sco_version.SCOVERSION,
)
txt = (
"""

6
app/scodoc/sco_evaluations.py
View File

@ -42,7 +42,7 @@ from app.scodoc.notes_log import log, logCallStack
import app.scodoc.sco_utils as scu
import app.scodoc.notesdb as ndb
from app.scodoc.sco_exceptions import AccessDenied, ScoValueError
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
from app.scodoc.TrivialFormulator import TrivialFormulator
from app.scodoc import html_sco_header
@ -915,7 +915,9 @@ def formsemestre_evaluations_delai_correction(
caption="Correction des évaluations du semestre",
preferences=sco_preferences.SemPreferences(formsemestre_id),
base_url="%s?formsemestre_id=%s" % (REQUEST.URL0, formsemestre_id),
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
filename=scu.make_filename("evaluations_delais_" + sem["titreannee"]),
)
return tab.make_page(format=format, REQUEST=REQUEST)

6
app/scodoc/sco_export_results.py
View File

@ -40,7 +40,7 @@ from app.scodoc import sco_formations
from app.scodoc import sco_preferences
from app.scodoc import sco_pvjury
from app.scodoc import sco_etud
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
from app.scodoc.sco_codes_parcours import NO_SEMESTRE_ID
@ -99,7 +99,9 @@ def _build_results_table(start_date=None, end_date=None, types_parcours=[]):
columns_ids=columns_ids,
filename=scu.make_filename("scodoc-results-%s-%s" % (start_date, end_date)),
caption="Résultats ScoDoc de %s à %s" % (start_date, end_date),
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
html_class="table_leftalign",
html_sortable=True,
preferences=sco_preferences.SemPreferences(),

6
app/scodoc/sco_formations.py
View File

@ -46,7 +46,7 @@ from app.scodoc import sco_news
from app.scodoc import sco_preferences
from app.scodoc import sco_tag_module
from app.scodoc import sco_xml
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
from app.scodoc.sco_exceptions import ScoValueError
from app.scodoc.sco_permissions import Permission
@ -338,7 +338,9 @@ def formation_list_table(formation_id=None, args={}, REQUEST=None):
columns_ids=columns_ids,
rows=formations,
titles=titles,
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
caption=title,
html_caption=title,
table_id="formation_list_table",

6
app/scodoc/sco_formsemestre_status.py
View File

@ -39,7 +39,7 @@ import app.scodoc.sco_utils as scu
import app.scodoc.notesdb as ndb
from app.scodoc.sco_permissions import Permission
from app.scodoc.sco_exceptions import ScoValueError, ScoInvalidDateError
from app.scodoc import VERSION
import sco_version
from app.scodoc import html_sco_header
from app.scodoc import htmlutils
from app.scodoc import sco_abs
@ -697,7 +697,9 @@ def formsemestre_description_table(formsemestre_id, REQUEST=None, with_evals=Fal
columns_ids=columns_ids,
rows=R,
titles=titles,
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
caption=title,
html_caption=title,
html_class="table_leftalign formsemestre_description",

6
app/scodoc/sco_liste_notes.py
View File

@ -50,7 +50,7 @@ from app.scodoc import sco_groups
from app.scodoc import sco_moduleimpl
from app.scodoc import sco_preferences
from app.scodoc import sco_etud
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
from app.scodoc.htmlutils import histogram_notes
@ -472,7 +472,9 @@ def _make_table_notes(
html_sortable=True,
base_url=base_url,
filename=filename,
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
caption=caption,
html_next_section=html_next_section,
page_title="Notes de " + sem["titremois"],

6
app/scodoc/sco_lycee.py
View File

@ -40,7 +40,7 @@ from app.scodoc import sco_formsemestre
from app.scodoc import sco_preferences
from app.scodoc import sco_report
from app.scodoc import sco_etud
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
@ -163,7 +163,9 @@ def _table_etuds_lycees(etuds, group_lycees, title, preferences, no_links=False)
"nomlycee": "Lycée",
"villelycee": "Commune",
},
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
caption=title,
page_title="Carte lycées d'origine",
html_sortable=True,

7
app/scodoc/sco_pdf.py
View File

@ -62,8 +62,7 @@ from app.scodoc.sco_utils import (
)
from app.scodoc.notes_log import log
from app.scodoc.sco_exceptions import ScoGenError
from app.scodoc import VERSION
from .VERSION import SCOVERSION, SCONAME
import sco_version
import six
PAGE_HEIGHT = defaultPageSize[1]
@ -281,7 +280,7 @@ class ScolarsPageTemplate(PageTemplate):
self.preferences["SCOLAR_FONT"], self.preferences["SCOLAR_FONT_SIZE_FOOT"]
)
d = _makeTimeDict()
d["scodoc_name"] = VERSION.SCONAME
d["scodoc_name"] = sco_version.SCONAME
d["server_url"] = self.server_name
footer_str = SU(self.footer_template % d)
canvas.drawString(
@ -319,7 +318,7 @@ def pdf_basic_page(
ScolarsPageTemplate(
document,
title=title,
author="%s %s (E. Viennet)" % (SCONAME, SCOVERSION),
author="%s %s (E. Viennet)" % (sco_version.SCONAME, sco_version.SCOVERSION),
footer_template="Edité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s",
preferences=preferences,
)

4
app/scodoc/sco_placement.py
View File

@ -52,7 +52,7 @@ from app.scodoc import sco_permissions_check
from app.scodoc import sco_preferences
from app.scodoc import sco_saisie_notes
from app.scodoc import sco_etud
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
from app.scodoc.sco_excel import * # XXX à vérifier
from app.scodoc.TrivialFormulator import TrivialFormulator
@ -387,7 +387,7 @@ def do_placement(REQUEST):
columns_ids=columns_ids,
rows=rows,
filename=filename,
origin="Généré par %s le " % VERSION.SCONAME
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
pdf_title=pdf_title,

6
app/scodoc/sco_poursuite_dut.py
View File

@ -40,7 +40,7 @@ from app.scodoc import sco_formsemestre
from app.scodoc import sco_groups
from app.scodoc import sco_preferences
from app.scodoc import sco_etud
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
from app.scodoc.sco_codes_parcours import code_semestre_validant, code_semestre_attente
@ -206,7 +206,9 @@ def formsemestre_poursuite_report(formsemestre_id, format="html", REQUEST=None):
)
tab.filename = scu.make_filename("poursuite " + sem["titreannee"])
tab.origin = "Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + ""
tab.origin = (
"Généré par %s le " % sco_version.SCONAME + scu.timedate_human_repr() + ""
)
tab.caption = "Récapitulatif %s." % sem["titreannee"]
tab.html_caption = "Récapitulatif %s." % sem["titreannee"]
tab.base_url = "%s?formsemestre_id=%s" % (REQUEST.URL0, formsemestre_id)

4
app/scodoc/sco_prepajury.py
View File

@ -37,7 +37,7 @@ from app.scodoc import sco_excel
from app.scodoc import sco_formsemestre
from app.scodoc import sco_parcours_dut
from app.scodoc import sco_codes_parcours
from app.scodoc import VERSION
import sco_version
from app.scodoc import sco_etud
from app.scodoc import sco_preferences
from app.scodoc.sco_excel import ScoExcelSheet
@ -312,7 +312,7 @@ def feuille_preparation_jury(formsemestre_id, REQUEST):
ws.append_single_cell_row(
"Préparé par %s le %s sur %s pour %s"
% (
VERSION.SCONAME,
sco_version.SCONAME,
time.strftime("%d/%m/%Y"),
REQUEST.BASE0,
REQUEST.AUTHENTICATED_USER,

2
app/scodoc/sco_pvjury.py
View File

@ -523,7 +523,7 @@ def formsemestre_pvjury(formsemestre_id, format="html", publish=True, REQUEST=No
titles=titles,
columns_ids=columns_ids,
filename=scu.make_filename("decisions " + sem["titreannee"]),
origin="Généré par %s le " % scu.VERSION.SCONAME
origin="Généré par %s le " % scu.sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
caption="Décisions jury pour " + sem["titreannee"],

6
app/scodoc/sco_pvpdf.py
View File

@ -49,7 +49,7 @@ from app.scodoc import sco_formsemestre
from app.scodoc import sco_pdf
from app.scodoc import sco_preferences
from app.scodoc import sco_etud
from app.scodoc import VERSION
import sco_version
from app.scodoc.sco_pdf import PDFLOCK
from app.scodoc.sco_pdf import SU
@ -384,7 +384,7 @@ def pdf_lettres_individuelles(
document.addPageTemplates(
CourrierIndividuelTemplate(
document,
author="%s %s (E. Viennet)" % (VERSION.SCONAME, VERSION.SCOVERSION),
author="%s %s (E. Viennet)" % (sco_version.SCONAME, sco_version.SCOVERSION),
title="Lettres décision %s" % sem["titreannee"],
subject="Décision jury",
margins=margins,
@ -655,7 +655,7 @@ def pvjury_pdf(
document.addPageTemplates(
PVTemplate(
document,
author="%s %s (E. Viennet)" % (VERSION.SCONAME, VERSION.SCOVERSION),
author="%s %s (E. Viennet)" % (sco_version.SCONAME, sco_version.SCOVERSION),
title=SU("PV du jury de %s" % sem["titre_num"]),
subject="PV jury",
preferences=sco_preferences.SemPreferences(formsemestre_id),

14
app/scodoc/sco_report.py
View File

@ -54,7 +54,7 @@ from app.scodoc import sco_formsemestre_status
from app.scodoc import sco_parcours_dut
from app.scodoc import sco_pdf
from app.scodoc import sco_preferences
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
from app.scodoc.notes_log import log
from app.scodoc.sco_codes_parcours import code_semestre_validant
@ -239,7 +239,9 @@ def formsemestre_report(
#
tab.filename = scu.make_filename("stats " + sem["titreannee"])
tab.origin = "Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + ""
tab.origin = (
"Généré par %s le " % sco_version.SCONAME + scu.timedate_human_repr() + ""
)
tab.caption = "Répartition des résultats par %s, semestre %s" % (
category_name,
sem["titreannee"],
@ -644,7 +646,9 @@ def table_suivi_cohorte(
html_col_width="4em",
html_sortable=True,
filename=scu.make_filename("cohorte " + sem["titreannee"]),
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
caption="Suivi cohorte " + pp + sem["titreannee"] + dbac,
page_title="Suivi cohorte " + sem["titreannee"],
html_class="table_cohorte",
@ -1134,7 +1138,9 @@ def table_suivi_parcours(formsemestre_id, only_primo=False, grouped_parcours=Tru
columns_ids=columns_ids,
rows=L,
titles=titles,
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
caption="Parcours suivis, étudiants %s semestre " % primostr
+ sem["titreannee"],
page_title="Parcours " + sem["titreannee"],

6
app/scodoc/sco_undo_notes.py
View File

@ -55,7 +55,7 @@ from app.scodoc import sco_formsemestre
from app.scodoc import sco_moduleimpl
from app.scodoc import sco_preferences
from app.scodoc import sco_users
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
# deux notes (de même uid) sont considérées comme de la même opération si
@ -218,7 +218,9 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html", REQUEST=None
caption="Saisies de notes dans %s" % sem["titreannee"],
preferences=sco_preferences.SemPreferences(formsemestre_id),
base_url="%s?formsemestre_id=%s" % (REQUEST.URL0, formsemestre_id),
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr() + "",
origin="Généré par %s le " % sco_version.SCONAME
+ scu.timedate_human_repr()
+ "",
)
return tab.make_page(format=format, REQUEST=REQUEST)

2
app/scodoc/sco_utils.py
View File

@ -63,7 +63,7 @@ from app.scodoc.sco_xml import quote_xml_attr
from app.scodoc.sco_codes_parcours import NOTES_TOLERANCE, CODES_EXPL
from app.scodoc import sco_exceptions
from app.scodoc import sco_xml
from app.scodoc import VERSION
import sco_version
# ----- CALCUL ET PRESENTATION DES NOTES

7
app/views/entreprises.py
View File

@ -47,7 +47,6 @@ import calendar
# from sco_utils import SCO_ENCODING
# import app.scodoc.sco_utils as scu
# import html_sidebar
# import VERSION
# from app.scodoc.gen_tables import GenTable
# from app.scodoc.TrivialFormulator import TrivialFormulator, TF
# import sco_etud
@ -212,7 +211,7 @@ def index_html(REQUEST=None, etud_nom=None, limit=50, offset="", format="html"):
"nbcorr": "Corresp.",
"contacts": "Contacts",
},
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr(),
origin="Généré par %s le " % sco_version.SCONAME + scu.timedate_human_repr(),
filename=scu.make_filename(
"entreprises_%s" % context.get_preference("DeptName")
),
@ -288,7 +287,7 @@ def entreprise_contact_list(entreprise_id=None, format="html", REQUEST=None):
"etudnom": "Étudiant",
"description": "Description",
},
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr(),
origin="Généré par %s le " % sco_version.SCONAME + scu.timedate_human_repr(),
filename=scu.make_filename("contacts_%s" % context.get_preference("DeptName")),
caption="",
html_sortable=True,
@ -392,7 +391,7 @@ def entreprise_correspondant_list(
"modifier": "",
"supprimer": "",
},
origin="Généré par %s le " % VERSION.SCONAME + scu.timedate_human_repr(),
origin="Généré par %s le " % sco_version.SCONAME + scu.timedate_human_repr(),
filename=scu.make_filename(
"correspondants_%s_%s" % (E["nom"], context.get_preference("DeptName"))
),

1
app/views/notes.py
View File

@ -133,7 +133,6 @@ from app.scodoc.gen_tables import GenTable
from app.scodoc.sco_pdf import PDFLOCK
from app.scodoc.sco_permissions import Permission
from app.scodoc.TrivialFormulator import TrivialFormulator
import app.scodoc.VERSION as VERSION
def sco_publish(route, function, permission, methods=["GET"]):

4
app/views/scodoc.py
View File

@ -36,7 +36,7 @@ from flask import request
from flask_login.utils import login_required
from app.models import Departement
from app.scodoc import VERSION
import sco_version
from app.scodoc import sco_find_etud
from app.scodoc.sco_permissions import Permission
from app.views import scodoc_bp as bp
@ -50,7 +50,7 @@ def index():
depts = Departement.query.filter_by(visible=True).all()
return render_template(
"scodoc.html",
title=VERSION.SCONAME,
title=sco_version.SCONAME,
current_app=flask.current_app,
depts=depts,
Permission=Permission,

4
app/views/scolar.py
View File

@ -71,7 +71,7 @@ from app.scodoc.sco_exceptions import (
ScoInvalidDept,
)
from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message
from app.scodoc import VERSION
import sco_version
from app.scodoc.gen_tables import GenTable
from app.scodoc import html_sco_header
@ -146,7 +146,7 @@ def about(REQUEST):
H.append(
'<p>Logiciel libre écrit en <a href="http://www.python.org" target="_blank" rel="noopener noreferrer">Python</a>.</p>'
)
H.append("<h2>Dernières évolutions</h2>" + VERSION.SCONEWS)
H.append("<h2>Dernières évolutions</h2>" + sco_version.SCONEWS)
H.append(
'<div class="about-logo">'
+ scu.icontag("borgne_img")

2
app/scodoc/VERSION.py → sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*-
# -*- coding: utf-8 -*-
SCOVERSION = "8.1"
SCOVERSION = "9.0.0a"
SCONAME = "ScoDoc"

2
tools/scodoc_config.py
View File

@ -65,7 +65,7 @@ CONFIG.LOGO_HEADER_HEIGHT = 28 # taille verticale dans le document en millimetr
# minute: Minute as a decimal number [00,59].
#
# server_url: URL du serveur ScoDoc
# scodoc_name: le nom du logiciel (ScoDoc actuellement, voir VERSION.py)
# scodoc_name: le nom du logiciel (ScoDoc actuellement, voir sco_version.py)
CONFIG.DEFAULT_PDF_FOOTER_TEMPLATE = "Edité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s sur %(server_url)s"

2
tools/scodoc_config_tmpl.py
View File

@ -53,7 +53,7 @@ CONFIG = CFG()
# minute: Minute as a decimal number [00,59].
#
# server_url: URL du serveur ScoDoc
# scodoc_name: le nom du logiciel (ScoDoc actuellement, voir VERSION.py)
# scodoc_name: le nom du logiciel (ScoDoc actuellement, voir sco_version.py)
# CONFIG.DEFAULT_PDF_FOOTER_TEMPLATE = "Edité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s sur %(server_url)s"