Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
radiopanik
panikweb
Commits
55ac20c3
Commit
55ac20c3
authored
Sep 10, 2013
by
fred
Browse files
fix grid display for the now over complicated Thursday evening
parent
4f97e29a
Changes
1
Hide whitespace changes
Inline
Side-by-side
panikweb/views.py
View file @
55ac20c3
...
...
@@ -242,7 +242,17 @@ class Grid(TemplateView):
continue
# here it is, same cell, same emission, several
# schedules
schedule_list
.
sort
(
lambda
x
,
y
:
-
cmp
(
x
.
get_duration
(),
y
.
get_duration
()))
schedule_list
.
sort
(
lambda
x
,
y
:
cmp
(
x
.
get_duration
(),
y
.
get_duration
()))
schedule
=
schedule_list
[
0
]
end_time
=
schedule
.
datetime
+
timedelta
(
minutes
=
schedule
.
get_duration
())
grid
[
i
][
j
].
time_label
=
'%02d:%02d-%02d:%02d'
%
(
schedule
.
datetime
.
hour
,
schedule
.
datetime
.
minute
,
end_time
.
hour
,
end_time
.
minute
)
for
schedule
in
schedule_list
[
1
:]:
grid
[
i
][
j
].
schedules
.
remove
(
schedule
)
end_time
=
schedule
.
datetime
+
timedelta
(
minutes
=
schedule
.
get_duration
())
...
...
@@ -315,6 +325,7 @@ class Grid(TemplateView):
# that is we merge all of them, ignoring the fact
# that the other emissions will stop at 8am30
current_cell_schedules
=
set
(
grid
[
i
][
j
].
schedules
)
current_cell_emissions
=
set
([
x
.
emission
for
x
in
current_cell_schedules
])
cursor
=
1
while
True
and
current_cell_schedules
:
same_cell_below
=
[
x
for
x
in
grid
[
i
+
cursor
]
if
x
.
y
==
grid
[
i
][
j
].
y
]
...
...
@@ -322,13 +333,15 @@ class Grid(TemplateView):
cursor
+=
1
continue
same_cell_below
=
same_cell_below
[
0
]
if
current_cell_schedules
.
issubset
(
same_cell_below
.
schedules
):
same_cell_below_emissions
=
set
([
x
.
emission
for
x
in
same_cell_below
.
schedules
])
if
current_cell_emissions
.
issubset
(
same_cell_below_emissions
):
# this handles case A (see comment above)
for
schedule
in
current_cell_schedules
:
if
schedule
in
same_cell_below
.
schedules
:
same_cell_below
.
schedules
.
remove
(
schedule
)
elif
same_cell_below
.
schedule
s
and
\
current_cell_
schedule
s
.
issuperset
(
same_cell_below
.
schedule
s
):
elif
same_cell_below
_emission
s
and
\
current_cell_
emission
s
.
issuperset
(
same_cell_below
_emission
s
):
# this handles case B (see comment above)
# we set the cell time label to the longest
# period
...
...
@@ -350,6 +363,13 @@ class Grid(TemplateView):
end_time
.
minute
)
grid
[
i
][
j
].
h
+=
1
grid
[
i
+
cursor
].
remove
(
same_cell_below
)
elif
same_cell_below_emissions
and
\
current_cell_emissions
.
intersection
(
same_cell_below_emissions
):
same_cell_below
.
schedules
=
[
x
for
x
in
same_cell_below
.
schedules
if
x
.
emission
not
in
current_cell_emissions
or
x
.
get_duration
()
<
30
]
cursor
+=
1
break
except
IndexError
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment