arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Revamped calendar basically there

Browse Source 
To fix:
- Does not yet display events that span weeks correctly!
- Breaks (overflows) on mobile
This commit is contained in:
FreneticScribbler
2022-12-06 15:30:35 +00:00
parent e0da6a3120
commit 6e8779c81b
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RIGS/models.py
View File

@@ -616,6 +616,9 @@ class Subhire(BaseEvent):
def get_edit_url(self): def get_edit_url(self):
return reverse('subhire_update', kwargs={'pk': self.pk}) return reverse('subhire_update', kwargs={'pk': self.pk})
def get_absolute_url(self):
return reverse('subhire_detail', kwargs={'pk': self.pk})
@property @property
def earliest_time(self): def earliest_time(self):
return find_earliest_event_time(self, []) return find_earliest_event_time(self, [])

6
RIGS/templates/calendar.html
View File

@@ -3,7 +3,6 @@
{% block js %} {% block js %}
<script src="{% static 'js/moment.js' %}"></script> <script src="{% static 'js/moment.js' %}"></script>
<script src="{% static 'js/interaction.js' %}"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
// set some button listeners // set some button listeners
@@ -25,6 +24,7 @@
.week { .week {
display:grid; display:grid;
grid-template-columns: repeat(7, 1fr); grid-template-columns: repeat(7, 1fr);
grid-auto-flow: dense;
grid-gap: 2px 10px; grid-gap: 2px 10px;
border: 1px solid black; border: 1px solid black;
height: 8em; height: 8em;
@@ -71,7 +71,7 @@
[data-span="6"] { grid-column-end: span 6; } [data-span="6"] { grid-column-end: span 6; }
[data-span="7"] { grid-column-end: span 7; } [data-span="7"] { grid-column-end: span 7; }
a { .day > a {
color: inherit !important; color: inherit !important;
text-decoration: inherit !important; text-decoration: inherit !important;
} }
@@ -112,7 +112,7 @@ a {
{{ day.2|safe }} {{ day.2|safe }}
</div> </div>
{% else %} {% else %}
<div class="day"><span style="grid-column: {{day.1}} + 1; grid-row: 1 / span 4;"><span></div> <div class="day"><span style="grid-row-start: 1;">&nbsp;<span></div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>

2
RIGS/utils.py
View File

@@ -10,7 +10,7 @@ class Calendar(HTMLCalendar):
super(Calendar, self).__init__() super(Calendar, self).__init__()
def get_html(self, day, event): def get_html(self, day, event):
return f"<a href='{event.get_edit_url()}' class='modal-href' style='display: contents;'><div class='event event-start event-end bg-{event.color}' data-span='{event.length}' style='grid-column-start: {day[1]}'>{event}</div></a>" return f"<a href='{event.get_absolute_url()}' class='modal-href' style='display: contents;'><div class='event event-start event-end bg-{event.color}' data-span='{event.length}' style='grid-column-start: calc({day[1]} + 1)'>{event}</div></a>"
def formatmonth(self, withyear=True): def formatmonth(self, withyear=True):
events = Event.objects.filter(start_date__year=self.year, start_date__month=self.month) events = Event.objects.filter(start_date__year=self.year, start_date__month=self.month)

1
pipeline/source_assets/js/src.js
View File

@@ -23,7 +23,6 @@ $(document).ready(function () {
s.type = 'text/javascript'; s.type = 'text/javascript';
document.body.appendChild(s); document.body.appendChild(s);
s.src = '{% static "js/asteroids.min.js"%}'; s.src = '{% static "js/asteroids.min.js"%}';
ga('send', 'event', 'easter_egg', 'activated');
} }
easter_egg.load(); easter_egg.load();
}); });