Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
steering
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
Container registry
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
AURA
steering
Commits
94a80124
Verified
Commit
94a80124
authored
11 months ago
by
Ernesto Rico Schmidt
Browse files
Options
Downloads
Patches
Plain Diff
style: remove superfluous comments
parent
20414ade
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
program/services.py
+0
-11
0 additions, 11 deletions
program/services.py
with
0 additions
and
11 deletions
program/services.py
+
0
−
11
View file @
94a80124
...
...
@@ -632,18 +632,11 @@ def generate_conflicts(timeslots: list[TimeSlot]) -> Conflicts:
projected
=
[]
solutions
=
{}
# Cycle each timeslot
for
timeslot
in
timeslots
:
# Contains collisions
collisions
=
[]
# Contains possible solutions
solution_choices
=
set
()
# Get collisions for each timeslot
colliding_timeslots
=
list
(
get_colliding_timeslots
(
timeslot
).
order_by
(
"
start
"
))
# Add the projected timeslot
projected_entry
=
{
"
hash
"
:
timeslot
.
hash
,
"
start
"
:
str
(
timeslot
.
start
),
...
...
@@ -651,7 +644,6 @@ def generate_conflicts(timeslots: list[TimeSlot]) -> Conflicts:
}
for
existing
in
colliding_timeslots
:
# Add the collision
collision
=
{
"
timeslot_id
"
:
existing
.
id
,
"
start
"
:
str
(
existing
.
start
),
...
...
@@ -663,7 +655,6 @@ def generate_conflicts(timeslots: list[TimeSlot]) -> Conflicts:
"
memo
"
:
existing
.
memo
,
}
# Get note
try
:
note
=
Note
.
objects
.
get
(
timeslot
=
existing
.
id
)
collision
[
"
note_id
"
]
=
note
.
pk
...
...
@@ -672,8 +663,6 @@ def generate_conflicts(timeslots: list[TimeSlot]) -> Conflicts:
collisions
.
append
(
collision
)
"""
Determine acceptable solutions
"""
if
len
(
colliding_timeslots
)
>
1
:
# If there is more than one collision: Only these two are supported at the moment
solution_choices
.
add
(
"
theirs
"
)
...
...
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