lyanis/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Actions Packages Activity

Supprime Flask-Moment (inutilisé). Utile pour assiduité seulement Moment 2.29.4.

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-10-07 09:32:35 +02:00
parent 1b4ec1880f
commit 874491d7c2
10 changed files with 71 additions and 3391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/__init__.py
View File

@ -29,7 +29,6 @@ from flask_json import FlaskJSON, json_response
from flask_login import LoginManager, current_user from flask_login import LoginManager, current_user
from flask_mail import Mail from flask_mail import Mail
from flask_migrate import Migrate from flask_migrate import Migrate
from flask_moment import Moment
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from jinja2 import select_autoescape from jinja2 import select_autoescape
@ -61,7 +60,7 @@ login.login_message = "Identifiez-vous pour accéder à cette page."
mail = Mail() mail = Mail()
bootstrap = Bootstrap() bootstrap = Bootstrap()
moment = Moment() # moment = Moment()
CACHE_TYPE = os.environ.get("CACHE_TYPE") CACHE_TYPE = os.environ.get("CACHE_TYPE")
cache = Cache( cache = Cache(
@ -306,7 +305,6 @@ def create_app(config_class=DevConfig):
mail.init_app(app) mail.init_app(app)
app.extensions["mail"].debug = 0 # disable copy of mails to stderr app.extensions["mail"].debug = 0 # disable copy of mails to stderr
bootstrap.init_app(app) bootstrap.init_app(app)
moment.init_app(app)
cache.init_app(app) cache.init_app(app)
sco_cache.CACHE = cache sco_cache.CACHE = cache
if CACHE_TYPE: # non default if CACHE_TYPE: # non default

114
app/scodoc/sco_edt_cal.py
View File

@ -145,62 +145,62 @@ def group_edt_json(group_id, start="", end=""): # actuellement inutilisé
return scu.sendJSON(J) return scu.sendJSON(J)
def experimental_calendar(group_id=None, formsemestre_id=None): # inutilisé # def experimental_calendar(group_id=None, formsemestre_id=None): # inutilisé
"""experimental page""" # """experimental page"""
return "\n".join( # return "\n".join(
[ # [
html_sco_header.sco_header( # html_sco_header.sco_header(
javascripts=[ # javascripts=[
"libjs/purl.js", # "libjs/purl.js",
"libjs/moment.min.js", # "libjs/moment.min.js",
"libjs/fullcalendar/fullcalendar.min.js", # "libjs/fullcalendar/fullcalendar.min.js",
], # ],
cssstyles=[ # cssstyles=[
# 'libjs/bootstrap-3.1.1-dist/css/bootstrap.min.css', # # 'libjs/bootstrap-3.1.1-dist/css/bootstrap.min.css',
# 'libjs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css', # # 'libjs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css',
# 'libjs/bootstrap-multiselect/bootstrap-multiselect.css' # # 'libjs/bootstrap-multiselect/bootstrap-multiselect.css'
"libjs/fullcalendar/fullcalendar.css", # "libjs/fullcalendar/fullcalendar.css",
# media='print' 'libjs/fullcalendar/fullcalendar.print.css' # # media='print' 'libjs/fullcalendar/fullcalendar.print.css'
], # ],
), # ),
"""<style> # """<style>
#loading { # #loading {
display: none; # display: none;
position: absolute; # position: absolute;
top: 10px; # top: 10px;
right: 10px; # right: 10px;
} # }
</style> # </style>
""", # """,
"""<form id="group_selector" method="get"> # """<form id="group_selector" method="get">
<span style="font-weight: bold; font-size:120%">Emplois du temps du groupe</span>""", # <span style="font-weight: bold; font-size:120%">Emplois du temps du groupe</span>""",
sco_groups_view.menu_group_choice( # sco_groups_view.menu_group_choice(
group_id=group_id, formsemestre_id=formsemestre_id # group_id=group_id, formsemestre_id=formsemestre_id
), # ),
"""</form><div id="loading">loading...</div> # """</form><div id="loading">loading...</div>
<div id="calendar"></div> # <div id="calendar"></div>
""", # """,
html_sco_header.sco_footer(), # html_sco_header.sco_footer(),
"""<script> # """<script>
$(document).ready(function() { # $(document).ready(function() {
var group_id = $.url().param()['group_id']; # var group_id = $.url().param()['group_id'];
$('#calendar').fullCalendar({ # $('#calendar').fullCalendar({
events: { # events: {
url: 'group_edt_json?group_id=' + group_id, # url: 'group_edt_json?group_id=' + group_id,
error: function() { # error: function() {
$('#script-warning').show(); # $('#script-warning').show();
} # }
}, # },
timeFormat: 'HH:mm', # timeFormat: 'HH:mm',
timezone: 'local', // heure locale du client # timezone: 'local', // heure locale du client
loading: function(bool) { # loading: function(bool) {
$('#loading').toggle(bool); # $('#loading').toggle(bool);
} # }
}); # });
}); # });
</script> # </script>
""", # """,
] # ]
) # )

2
app/scodoc/sco_formsemestre_status.py
View File

@ -851,7 +851,7 @@ def _make_listes_sem(formsemestre: FormSemestre) -> str:
f""" f"""
<div class="sem-groups-list"> <div class="sem-groups-list">
<div> <div>
<a href="{ <a class="stdlink" href="{
url_for("scolar.groups_view", url_for("scolar.groups_view",
group_ids=group.id, group_ids=group.id,
scodoc_dept=g.scodoc_dept, scodoc_dept=g.scodoc_dept,

2
app/static/libjs/moment-2.29.4.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
app/static/libjs/moment.min.js vendored
View File

File diff suppressed because one or more lines are too long

3309
app/static/libjs/moment.new.min.js vendored
View File

File diff suppressed because it is too large Load Diff

2
app/templates/base.j2
View File

@ -83,8 +83,6 @@
{% block scripts %} {% block scripts %}
{{ super() }} {{ super() }}
{{ moment.include_moment( local_js=scu.STATIC_DIR+"/libjs/moment.min.js") }}
{{ moment.lang(g.locale) }}
<script src="{{scu.STATIC_DIR}}/libjs/menu.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/menu.js"></script>
<script src="{{scu.STATIC_DIR}}/libjs/bubble.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/bubble.js"></script>
<script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script> <script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script>

2
app/templates/sco_page.j2
View File

@ -39,8 +39,6 @@
{% block scripts %} {% block scripts %}
{{ super() }} {{ super() }}
{{ moment.include_moment( local_js=scu.STATIC_DIR+"/libjs/moment.min.js") }}
{{ moment.lang(g.locale) }}
<script src="{{scu.STATIC_DIR}}/libjs/menu.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/menu.js"></script>
<script src="{{scu.STATIC_DIR}}/libjs/bubble.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/bubble.js"></script>
<script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script> <script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script>

20
app/views/assiduites.py
View File

@ -165,7 +165,7 @@ def bilan_dept():
page_title="Saisie de l'assiduité", page_title="Saisie de l'assiduité",
javascripts=[ javascripts=[
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
], ],
cssstyles=[ cssstyles=[
@ -253,7 +253,7 @@ def bilan_dept():
# init_qtip=True, # init_qtip=True,
# javascripts=[ # javascripts=[
# "js/assiduites.js", # "js/assiduites.js",
# "libjs/moment.new.min.js", # "libjs/moment-2.29.4.min.js",
# "libjs/moment-timezone.js", # "libjs/moment-timezone.js",
# ], # ],
# cssstyles=CSSSTYLES # cssstyles=CSSSTYLES
@ -318,7 +318,7 @@ def signal_assiduites_etud():
init_qtip=True, init_qtip=True,
javascripts=[ javascripts=[
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
"js/etud_info.js", "js/etud_info.js",
], ],
@ -395,7 +395,7 @@ def liste_assiduites_etud():
init_qtip=True, init_qtip=True,
javascripts=[ javascripts=[
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
], ],
cssstyles=CSSSTYLES cssstyles=CSSSTYLES
@ -442,7 +442,7 @@ def bilan_etud():
init_qtip=True, init_qtip=True,
javascripts=[ javascripts=[
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
], ],
cssstyles=CSSSTYLES cssstyles=CSSSTYLES
@ -498,7 +498,7 @@ def ajout_justificatif_etud():
init_qtip=True, init_qtip=True,
javascripts=[ javascripts=[
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
], ],
cssstyles=CSSSTYLES cssstyles=CSSSTYLES
@ -545,7 +545,7 @@ def calendrier_etud():
init_qtip=True, init_qtip=True,
javascripts=[ javascripts=[
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
], ],
cssstyles=CSSSTYLES cssstyles=CSSSTYLES
@ -690,7 +690,7 @@ def signal_assiduites_group():
"js/etud_info.js", "js/etud_info.js",
"js/groups_view.js", "js/groups_view.js",
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
], ],
cssstyles=CSSSTYLES cssstyles=CSSSTYLES
@ -837,7 +837,7 @@ def visu_assiduites_group():
"js/etud_info.js", "js/etud_info.js",
"js/groups_view.js", "js/groups_view.js",
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
], ],
cssstyles=CSSSTYLES cssstyles=CSSSTYLES
@ -1090,7 +1090,7 @@ def signal_assiduites_diff():
javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS
+ [ + [
"js/assiduites.js", "js/assiduites.js",
"libjs/moment.new.min.js", "libjs/moment-2.29.4.min.js",
"libjs/moment-timezone.js", "libjs/moment-timezone.js",
"js/etud_info.js", "js/etud_info.js",
], ],

1
requirements-3.11.txt
View File

@ -34,7 +34,6 @@ Flask-JSON==0.4.0
Flask-Login==0.6.2 Flask-Login==0.6.2
Flask-Mail==0.9.1 Flask-Mail==0.9.1
Flask-Migrate==4.0.5 Flask-Migrate==4.0.5
Flask-Moment==1.0.5
Flask-SQLAlchemy==3.1.1 Flask-SQLAlchemy==3.1.1
Flask-WTF==1.1.1 Flask-WTF==1.1.1
fonttools==4.41.1 fonttools==4.41.1