Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CelcatSanitizer Teacher
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Léo Grange
CelcatSanitizer Teacher
Commits
7f0dac07
Commit
7f0dac07
authored
7 years ago
by
Alban Gruin
Browse files
Options
Downloads
Patches
Plain Diff
Si on force une mise à jour, on efface les cours autant qu’on peut
au lieu de le faire à partir du lancement du traitement
parent
76e344f6
Branches
Branches containing commit
Tags
v0.10.2
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
management/commands/timetables.py
+11
-3
11 additions, 3 deletions
management/commands/timetables.py
with
11 additions
and
3 deletions
management/commands/timetables.py
+
11
−
3
View file @
7f0dac07
...
...
@@ -26,7 +26,13 @@
@transaction.atomic
def
process_timetable_week
(
timetable
,
soup
,
weeks_in_soup
,
force
,
year
=
None
,
week
=
None
):
today
=
timezone
.
make_aware
(
datetime
.
datetime
.
now
())
begin
,
end
=
get_week
(
year
,
week
)
# Si on force la mise à jour, on définit de moment
# de la mise à jour au début de la semaine
if
force
:
today
=
begin
else
:
today
=
timezone
.
make_aware
(
datetime
.
datetime
.
now
())
# On récupère la mise à jour la plus ancienne dans les cours de l’emploi du temps
# commençant à partir de maintenant
...
...
@@ -34,7 +40,6 @@ def process_timetable_week(timetable, soup, weeks_in_soup, force, year=None, wee
if
year
is
not
None
and
week
is
not
None
:
# Si jamais on traite une semaine spécifique, on limite les cours sélectionnés
# à ceux qui commencent entre le début du traitement et la fin de la semaine
_
,
end
=
get_week
(
year
,
week
)
last_update_date
=
last_update_date
.
filter
(
begin__lt
=
end
)
last_update_date
=
last_update_date
.
aggregate
(
Min
(
"
last_update
"
))
\
...
...
@@ -60,7 +65,10 @@ def process_timetable_week(timetable, soup, weeks_in_soup, force, year=None, wee
# Sinon, on efface tous les cours à partir de maintenant.
# Précisément, on prend la plus grande valeur entre la première semaine
# présente dans Celcat et maintenant.
delete_from
=
max
(
min
(
weeks_in_soup
.
values
()),
today
)
# Vraiment utile ?
delete_from
=
min
(
weeks_in_soup
.
values
())
if
not
force
:
# Si jamais on force la MàJ, on efface tout à partir de la première semaine
delete_from
=
max
(
delete_from
,
today
)
Course
.
objects
.
filter
(
timetable
=
timetable
,
begin__gte
=
delete_from
).
delete
()
# Tous les cours commençant sur la période traitée
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment