SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 14ab1130 authored by Jorran de Wit's avatar Jorran de Wit
Browse files

Straighten templates for virtual meetings

parent 1087cbc2
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 343 additions and 392 deletions
virtualmeetings/models.py
+ 25
− 60
View file @ 14ab1130
from django.core.urlresolvers import reverse
from django.db import models
from django.shortcuts import get_object_or_404
from django.template import Context, Template
......@@ -5,8 +6,7 @@ from django.utils import timezone
from .constants import MOTION_CATEGORIES
from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS,\
subject_areas_dict
from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS
from scipost.fields import ChoiceArrayField
from scipost.models import Contributor
......@@ -25,6 +25,9 @@ class VGM(models.Model):
return 'From %s to %s' % (self.start_date.strftime('%Y-%m-%d'),
self.end_date.strftime('%Y-%m-%d'))
def get_absolute_url(self):
return reverse('virtualmeetings:VGM_detail', args=(self.id,))
class Feedback(models.Model):
"""
......@@ -38,17 +41,11 @@ class Feedback(models.Model):
def __str__(self):
return '%s: %s' % (self.by, self.feedback[:50])
def get_absolute_url(self):
return self.VGM.get_absolute_url() + '#feedback' + str(self.id)
def as_li(self):
html = ('<div class="Feedback">'
'<h3><em>by {{ by }}</em></h3>'
'<p>{{ feedback|linebreaks }}</p>'
'</div>')
context = Context({
'feedback': self.feedback,
'by': '%s %s' % (self.by.user.first_name,
self.by.user.last_name)})
template = Template(html)
return template.render(context)
raise DeprecationWarning
class Nomination(models.Model):
......@@ -57,23 +54,23 @@ class Nomination(models.Model):
"""
VGM = models.ForeignKey('virtualmeetings.VGM', blank=True, null=True)
by = models.ForeignKey('scipost.Contributor')
date = models.DateField()
first_name = models.CharField(max_length=30, default='')
last_name = models.CharField(max_length=30, default='')
date = models.DateField(auto_now_add=True)
first_name = models.CharField(max_length=30)
last_name = models.CharField(max_length=30)
discipline = models.CharField(max_length=20, choices=SCIPOST_DISCIPLINES,
default='physics', verbose_name='Main discipline')
expertises = ChoiceArrayField(
models.CharField(max_length=10, choices=SCIPOST_SUBJECT_AREAS),
blank=True, null=True)
webpage = models.URLField(default='')
webpage = models.URLField()
nr_A = models.PositiveIntegerField(default=0)
in_agreement = models.ManyToManyField(Contributor,
in_agreement = models.ManyToManyField('scipost.Contributor',
related_name='in_agreement_with_nomination', blank=True)
nr_N = models.PositiveIntegerField(default=0)
in_notsure = models.ManyToManyField(Contributor,
in_notsure = models.ManyToManyField('scipost.Contributor',
related_name='in_notsure_with_nomination', blank=True)
nr_D = models.PositiveIntegerField(default=0)
in_disagreement = models.ManyToManyField(Contributor,
in_disagreement = models.ManyToManyField('scipost.Contributor',
related_name='in_disagreement_with_nomination',
blank=True)
voting_deadline = models.DateTimeField('voting deadline', default=timezone.now)
......@@ -84,31 +81,11 @@ class Nomination(models.Model):
self.last_name,
self.by)
def get_absolute_url(self):
return self.VGM.get_absolute_url() + '#nomination_' + str(self.id)
def as_li(self):
html = ('<div class="Nomination" id="nomination_id{{ nomination_id }}" '
'style="background-color: #eeeeee;">'
'<div class="row">'
'<div class="col-4">'
'<h3><em> {{ name }}</em></h3>'
'<p>Nominated by {{ proposer }}</p>'
'</div>'
'<div class="col-4">'
'<p><a href="{{ webpage }}">Webpage</a></p>'
'<p>Discipline: {{ discipline }}</p></div>'
'<div class="col-4"><p>expertise:<ul>')
for exp in self.expertises:
html += '<li>%s</li>' % subject_areas_dict[exp]
html += '</ul></div></div></div>'
context = Context({
'nomination_id': self.id,
'proposer': '%s %s' % (self.by.user.first_name,
self.by.user.last_name),
'name': self.first_name + ' ' + self.last_name,
'discipline': self.get_discipline_display(),
'webpage': self.webpage,
})
template = Template(html)
return template.render(context)
raise DeprecationWarning
def votes_as_ul(self):
template = Template('''
......@@ -149,7 +126,7 @@ class Motion(models.Model):
background = models.TextField()
motion = models.TextField()
put_forward_by = models.ForeignKey('scipost.Contributor')
date = models.DateField()
date = models.DateField(auto_now_add=True)
nr_A = models.PositiveIntegerField(default=0)
in_agreement = models.ManyToManyField('scipost.Contributor',
related_name='in_agreement_with_motion', blank=True)
......@@ -166,23 +143,11 @@ class Motion(models.Model):
def __str__(self):
return self.motion[:32]
def get_absolute_url(self):
return self.VGM.get_absolute_url() + '#motion_' + str(self.id)
def as_li(self):
html = ('<div class="Motion" id="motion_id{{ motion_id }}">'
'<h3><em>Motion {{ motion_id }}, put forward by {{ proposer }}</em></h3>'
'<h3>Background:</h3><p>{{ background|linebreaks }}</p>'
'<h3>Motion:</h3>'
'<div class="flex-container"><div class="flex-greybox">'
'<p style="background-color: #eeeeee;">{{ motion|linebreaks }}</p>'
'</div></div>'
'</div>')
context = Context({
'motion_id': self.id,
'proposer': '%s %s' % (self.put_forward_by.user.first_name,
self.put_forward_by.user.last_name),
'background': self.background,
'motion': self.motion, })
template = Template(html)
return template.render(context)
raise DeprecationWarning
def votes_as_ul(self):
template = Template('''
......
virtualmeetings/templates/virtualmeetings/VGM_detail.html
+ 260
− 314
View file @ 14ab1130
This diff is collapsed.
virtualmeetings/templates/virtualmeetings/VGMs.html
+ 20
− 18
View file @ 14ab1130
{% extends 'scipost/base.html' %}
{% extends 'scipost/_personal_page_base.html' %}
{% block breadcrumb_items %}
{{block.super}}
<span class="breadcrumb-item">Virtual General Meetings</span>
{% endblock %}
{% block pagetitle %}: VGMs{% endblock pagetitle %}
{% load staticfiles %}
{% block bodysup %}
<section>
<div class="flex-container">
<div class="flex-greybox">
<h1>SciPost Virtual General Meetings</h1>
{% block content %}
<div class="row">
<div class="col-12">
<h1 class="highlight">SciPost Virtual General Meetings</h1>
<ul>
{% for VGM in VGM_list %}
<li><a href="{% url 'virtualmeetings:VGM_detail' VGM_id=VGM.id %}">{{ VGM }}</a></li>
{% empty %}
<li>You are not registered for a Virtual General Meeting</a>
{% endfor %}
</ul>
</div>
</div>
<ul>
{% for VGM in VGM_list %}
<li><a href="{% url 'virtualmeetings:VGM_detail' VGM_id=VGM.id %}">{{ VGM }}</a></li>
{% endfor %}
</ul>
</section>
</div>
{% endblock bodysup %}
{% endblock %}
virtualmeetings/templates/virtualmeetings/feedback_content.html 0 → 100644
+ 4
− 0
View file @ 14ab1130
<div class="Feedback">
<h3><em>by {{ feedback.by.user.first_name }} {{ feedback.by.user.last_name }}</em></h3>
<div>{{ feedback.feedback|linebreaks }}</div>
</div>
virtualmeetings/templates/virtualmeetings/motion_content.html 0 → 100644
+ 10
− 0
View file @ 14ab1130
<div class="Motion" id="motion_{{ motion.id }}">
<h2 class="pb-0">Motion {{ motion.id }}</h2>
<h3 class="pt-0 mb-2">put forward by {{ motion.put_forward_by.user.first_name }} {{ motion.put_forward_by.user.first_name }}</h3>
<h3>Background:</h3>
<div>{{ motion.background|linebreaks }}</div>
<h3>Motion:</h3>
<div>{{ motion.motion|linebreaks }}</div>
</div>
virtualmeetings/templates/virtualmeetings/nomination_content.html 0 → 100644
+ 24
− 0
View file @ 14ab1130
{% load scipost_extras %}
<div style="border-bottom: 1px solid #eee;" id="nomination_{{ nomination.id }}">
<div class="row">
<div class="col-4">
<h3><b>{{ nomination.first_name }} {{ nomination.last_name }}</b></h3>
<p>Nominated by {{ nomination.by.user.first_name }} {{ nomination.by.user.last_name }}</p>
</div>
<div class="col-4">
<p>
<a href="{{ nomination.webpage }}">Webpage</a><br>
Discipline: {{ nomination.get_discipline_display }}
</p>
</div>
<div class="col-4">
<p>Expertise:</p>
<ul>
{% for expertise in nomination.expertises %}
<li>{{expertise|get_specialization_display}}</li>
{% endfor %}
</ul>
</div>
</div>
</div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

SciPost Code Repository