forked from ScoDoc/ScoDoc
Supprime Flask-Moment (inutilisé). Utile pour assiduité seulement Moment 2.29.4.
This commit is contained in:
parent
1b4ec1880f
commit
874491d7c2
@ -29,7 +29,6 @@ from flask_json import FlaskJSON, json_response
|
||||
from flask_login import LoginManager, current_user
|
||||
from flask_mail import Mail
|
||||
from flask_migrate import Migrate
|
||||
from flask_moment import Moment
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
|
||||
from jinja2 import select_autoescape
|
||||
@ -61,7 +60,7 @@ login.login_message = "Identifiez-vous pour accéder à cette page."
|
||||
|
||||
mail = Mail()
|
||||
bootstrap = Bootstrap()
|
||||
moment = Moment()
|
||||
# moment = Moment()
|
||||
|
||||
CACHE_TYPE = os.environ.get("CACHE_TYPE")
|
||||
cache = Cache(
|
||||
@ -306,7 +305,6 @@ def create_app(config_class=DevConfig):
|
||||
mail.init_app(app)
|
||||
app.extensions["mail"].debug = 0 # disable copy of mails to stderr
|
||||
bootstrap.init_app(app)
|
||||
moment.init_app(app)
|
||||
cache.init_app(app)
|
||||
sco_cache.CACHE = cache
|
||||
if CACHE_TYPE: # non default
|
||||
|
@ -145,62 +145,62 @@ def group_edt_json(group_id, start="", end=""): # actuellement inutilisé
|
||||
return scu.sendJSON(J)
|
||||
|
||||
|
||||
def experimental_calendar(group_id=None, formsemestre_id=None): # inutilisé
|
||||
"""experimental page"""
|
||||
return "\n".join(
|
||||
[
|
||||
html_sco_header.sco_header(
|
||||
javascripts=[
|
||||
"libjs/purl.js",
|
||||
"libjs/moment.min.js",
|
||||
"libjs/fullcalendar/fullcalendar.min.js",
|
||||
],
|
||||
cssstyles=[
|
||||
# 'libjs/bootstrap-3.1.1-dist/css/bootstrap.min.css',
|
||||
# 'libjs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css',
|
||||
# 'libjs/bootstrap-multiselect/bootstrap-multiselect.css'
|
||||
"libjs/fullcalendar/fullcalendar.css",
|
||||
# media='print' 'libjs/fullcalendar/fullcalendar.print.css'
|
||||
],
|
||||
),
|
||||
"""<style>
|
||||
#loading {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
right: 10px;
|
||||
}
|
||||
</style>
|
||||
""",
|
||||
"""<form id="group_selector" method="get">
|
||||
<span style="font-weight: bold; font-size:120%">Emplois du temps du groupe</span>""",
|
||||
sco_groups_view.menu_group_choice(
|
||||
group_id=group_id, formsemestre_id=formsemestre_id
|
||||
),
|
||||
"""</form><div id="loading">loading...</div>
|
||||
<div id="calendar"></div>
|
||||
""",
|
||||
html_sco_header.sco_footer(),
|
||||
"""<script>
|
||||
$(document).ready(function() {
|
||||
# def experimental_calendar(group_id=None, formsemestre_id=None): # inutilisé
|
||||
# """experimental page"""
|
||||
# return "\n".join(
|
||||
# [
|
||||
# html_sco_header.sco_header(
|
||||
# javascripts=[
|
||||
# "libjs/purl.js",
|
||||
# "libjs/moment.min.js",
|
||||
# "libjs/fullcalendar/fullcalendar.min.js",
|
||||
# ],
|
||||
# cssstyles=[
|
||||
# # 'libjs/bootstrap-3.1.1-dist/css/bootstrap.min.css',
|
||||
# # 'libjs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css',
|
||||
# # 'libjs/bootstrap-multiselect/bootstrap-multiselect.css'
|
||||
# "libjs/fullcalendar/fullcalendar.css",
|
||||
# # media='print' 'libjs/fullcalendar/fullcalendar.print.css'
|
||||
# ],
|
||||
# ),
|
||||
# """<style>
|
||||
# #loading {
|
||||
# display: none;
|
||||
# position: absolute;
|
||||
# top: 10px;
|
||||
# right: 10px;
|
||||
# }
|
||||
# </style>
|
||||
# """,
|
||||
# """<form id="group_selector" method="get">
|
||||
# <span style="font-weight: bold; font-size:120%">Emplois du temps du groupe</span>""",
|
||||
# sco_groups_view.menu_group_choice(
|
||||
# group_id=group_id, formsemestre_id=formsemestre_id
|
||||
# ),
|
||||
# """</form><div id="loading">loading...</div>
|
||||
# <div id="calendar"></div>
|
||||
# """,
|
||||
# html_sco_header.sco_footer(),
|
||||
# """<script>
|
||||
# $(document).ready(function() {
|
||||
|
||||
var group_id = $.url().param()['group_id'];
|
||||
# var group_id = $.url().param()['group_id'];
|
||||
|
||||
$('#calendar').fullCalendar({
|
||||
events: {
|
||||
url: 'group_edt_json?group_id=' + group_id,
|
||||
error: function() {
|
||||
$('#script-warning').show();
|
||||
}
|
||||
},
|
||||
timeFormat: 'HH:mm',
|
||||
timezone: 'local', // heure locale du client
|
||||
loading: function(bool) {
|
||||
$('#loading').toggle(bool);
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
""",
|
||||
]
|
||||
)
|
||||
# $('#calendar').fullCalendar({
|
||||
# events: {
|
||||
# url: 'group_edt_json?group_id=' + group_id,
|
||||
# error: function() {
|
||||
# $('#script-warning').show();
|
||||
# }
|
||||
# },
|
||||
# timeFormat: 'HH:mm',
|
||||
# timezone: 'local', // heure locale du client
|
||||
# loading: function(bool) {
|
||||
# $('#loading').toggle(bool);
|
||||
# }
|
||||
# });
|
||||
# });
|
||||
# </script>
|
||||
# """,
|
||||
# ]
|
||||
# )
|
||||
|
@ -851,7 +851,7 @@ def _make_listes_sem(formsemestre: FormSemestre) -> str:
|
||||
f"""
|
||||
<div class="sem-groups-list">
|
||||
<div>
|
||||
<a href="{
|
||||
<a class="stdlink" href="{
|
||||
url_for("scolar.groups_view",
|
||||
group_ids=group.id,
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
|
2
app/static/libjs/moment-2.29.4.min.js
vendored
Normal file
2
app/static/libjs/moment-2.29.4.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
6
app/static/libjs/moment.min.js
vendored
6
app/static/libjs/moment.min.js
vendored
File diff suppressed because one or more lines are too long
3309
app/static/libjs/moment.new.min.js
vendored
3309
app/static/libjs/moment.new.min.js
vendored
File diff suppressed because it is too large
Load Diff
@ -83,8 +83,6 @@
|
||||
|
||||
{% block scripts %}
|
||||
{{ 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/bubble.js"></script>
|
||||
<script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script>
|
||||
|
@ -39,8 +39,6 @@
|
||||
|
||||
{% block scripts %}
|
||||
{{ 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/bubble.js"></script>
|
||||
<script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script>
|
||||
|
@ -165,7 +165,7 @@ def bilan_dept():
|
||||
page_title="Saisie de l'assiduité",
|
||||
javascripts=[
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
],
|
||||
cssstyles=[
|
||||
@ -253,7 +253,7 @@ def bilan_dept():
|
||||
# init_qtip=True,
|
||||
# javascripts=[
|
||||
# "js/assiduites.js",
|
||||
# "libjs/moment.new.min.js",
|
||||
# "libjs/moment-2.29.4.min.js",
|
||||
# "libjs/moment-timezone.js",
|
||||
# ],
|
||||
# cssstyles=CSSSTYLES
|
||||
@ -318,7 +318,7 @@ def signal_assiduites_etud():
|
||||
init_qtip=True,
|
||||
javascripts=[
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
"js/etud_info.js",
|
||||
],
|
||||
@ -395,7 +395,7 @@ def liste_assiduites_etud():
|
||||
init_qtip=True,
|
||||
javascripts=[
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
],
|
||||
cssstyles=CSSSTYLES
|
||||
@ -442,7 +442,7 @@ def bilan_etud():
|
||||
init_qtip=True,
|
||||
javascripts=[
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
],
|
||||
cssstyles=CSSSTYLES
|
||||
@ -498,7 +498,7 @@ def ajout_justificatif_etud():
|
||||
init_qtip=True,
|
||||
javascripts=[
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
],
|
||||
cssstyles=CSSSTYLES
|
||||
@ -545,7 +545,7 @@ def calendrier_etud():
|
||||
init_qtip=True,
|
||||
javascripts=[
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
],
|
||||
cssstyles=CSSSTYLES
|
||||
@ -690,7 +690,7 @@ def signal_assiduites_group():
|
||||
"js/etud_info.js",
|
||||
"js/groups_view.js",
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
],
|
||||
cssstyles=CSSSTYLES
|
||||
@ -837,7 +837,7 @@ def visu_assiduites_group():
|
||||
"js/etud_info.js",
|
||||
"js/groups_view.js",
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
],
|
||||
cssstyles=CSSSTYLES
|
||||
@ -1090,7 +1090,7 @@ def signal_assiduites_diff():
|
||||
javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS
|
||||
+ [
|
||||
"js/assiduites.js",
|
||||
"libjs/moment.new.min.js",
|
||||
"libjs/moment-2.29.4.min.js",
|
||||
"libjs/moment-timezone.js",
|
||||
"js/etud_info.js",
|
||||
],
|
||||
|
@ -34,7 +34,6 @@ Flask-JSON==0.4.0
|
||||
Flask-Login==0.6.2
|
||||
Flask-Mail==0.9.1
|
||||
Flask-Migrate==4.0.5
|
||||
Flask-Moment==1.0.5
|
||||
Flask-SQLAlchemy==3.1.1
|
||||
Flask-WTF==1.1.1
|
||||
fonttools==4.41.1
|
||||
|
Loading…
Reference in New Issue
Block a user