opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +18 -7
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 02168b8032 - Show all commits

4
app/forms/main/config_apo.py
View File

@ -65,6 +65,7 @@ class CodesDecisionsForm(FlaskForm):
ADJ = _build_code_field("ADJ") ADJ = _build_code_field("ADJ")
ADJR = _build_code_field("ADJR") ADJR = _build_code_field("ADJR")
ADM = _build_code_field("ADM") ADM = _build_code_field("ADM")
ADSUP = _build_code_field("ADSUP")
AJ = _build_code_field("AJ") AJ = _build_code_field("AJ")
ATB = _build_code_field("ATB") ATB = _build_code_field("ATB")
ATJ = _build_code_field("ATJ") ATJ = _build_code_field("ATJ")
@ -81,7 +82,8 @@ class CodesDecisionsForm(FlaskForm):
NOTES_FMT = StringField( NOTES_FMT = StringField(
label="Format notes exportées", label="Format notes exportées",
description="""Format des notes. Par défaut <tt style="font-family: monotype;">%3.2f</tt> (deux chiffres après la virgule)""", description="""Format des notes. Par défaut
<tt style="font-family: monotype;">%3.2f</tt> (deux chiffres après la virgule)""",
validators=[ validators=[
validators.Length( validators.Length(
max=SHORT_STR_LEN, max=SHORT_STR_LEN,

2
app/models/config.py
View File

@ -17,6 +17,7 @@ from app.scodoc.codes_cursus import (
ADJ, ADJ,
ADJR, ADJR,
ADM, ADM,
ADSUP,
AJ, AJ,
ATB, ATB,
ATJ, ATJ,
@ -39,6 +40,7 @@ CODES_SCODOC_TO_APO = {
ADJ: "ADM", ADJ: "ADM",
ADJR: "ADM", ADJR: "ADM",
ADM: "ADM", ADM: "ADM",
ADSUP: "ADM",
AJ: "AJ", AJ: "AJ",
ATB: "AJAC", ATB: "AJAC",
ATJ: "AJAC", ATJ: "AJAC",

15
app/static/css/scodoc.css
View File

@ -65,13 +65,14 @@ div#gtrcontent {
} }
div.flashes { div.flashes {
transition: opacity 0.5s ease;
margin-top: 8px;
left: 50%; left: 50%;
margin-top: 8px;
max-width: 800px;
position: fixed; position: fixed;
text-align: center;
top: 8px; top: 8px;
transform: translateX(-50%); transform: translateX(-50%);
width: auto; transition: opacity 0.5s ease;
z-index: 1000; z-index: 1000;
} }
@ -79,7 +80,7 @@ div.alert {
padding: 16px; padding: 16px;
border-radius: 12px; border-radius: 12px;
font-size: 200%; font-size: 200%;
opacity: 0.8; opacity: 0.9;
} }
div.alert-info { div.alert-info {
@ -88,6 +89,12 @@ div.alert-info {
border-color: #208d3b; border-color: #208d3b;
} }
div.alert-warning {
color: #ef5c00;
background-color: #fbfb00d4;
border-color: #767676;
}
div.alert-error { div.alert-error {
color: #ef0020; color: #ef0020;
background-color: #ffff00; background-color: #ffff00;

2
app/views/scodoc.py
View File

@ -247,7 +247,7 @@ def config_codes_decisions():
if form.validate_on_submit(): if form.validate_on_submit():
for code in models.config.CODES_SCODOC_TO_APO: for code in models.config.CODES_SCODOC_TO_APO:
ScoDocSiteConfig.set_code_apo(code, getattr(form, code).data) ScoDocSiteConfig.set_code_apo(code, getattr(form, code).data)
flash("Codes décisions enregistrés.") flash("Codes décisions enregistrés")
return redirect(url_for("scodoc.index")) return redirect(url_for("scodoc.index"))
elif request.method == "GET": elif request.method == "GET":
for code in models.config.CODES_SCODOC_TO_APO: for code in models.config.CODES_SCODOC_TO_APO:

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.4.92" SCOVERSION = "9.4.93"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"