diff --git a/scipost_django/colleges/migrations/0043_alter_fellowshipnominationevent_options.py b/scipost_django/colleges/migrations/0043_alter_fellowshipnominationevent_options.py new file mode 100644 index 0000000000000000000000000000000000000000..8d5b931b52308ffc4f77a0d26ea3d7a8bc2d0728 --- /dev/null +++ b/scipost_django/colleges/migrations/0043_alter_fellowshipnominationevent_options.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.18 on 2023-10-02 15:35 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('colleges', '0042_auto_20230914_1057'), + ] + + operations = [ + migrations.AlterModelOptions( + name='fellowshipnominationevent', + options={'get_latest_by': 'on', 'ordering': ['nomination', '-on'], 'verbose_name_plural': 'Fellowhip Nomination Events'}, + ), + ] diff --git a/scipost_django/colleges/models/nomination.py b/scipost_django/colleges/models/nomination.py index d2c545c3155db10567574b503bf75bc4bf93e643..ae4cbe0bf5fed5c5d59794cf594f317e4f93ffd8 100644 --- a/scipost_django/colleges/models/nomination.py +++ b/scipost_django/colleges/models/nomination.py @@ -140,6 +140,7 @@ class FellowshipNominationEvent(models.Model): class Meta: ordering = ["nomination", "-on"] verbose_name_plural = "Fellowhip Nomination Events" + get_latest_by = "on" def __str__(self): return ( diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html b/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html index 77186605913b003ffe0b9cf2439052fc5067ac97..0b4835a1a61079f71359b49b0299b456b014866d 100644 --- a/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html +++ b/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html @@ -1,4 +1,4 @@ -<div class="p-4"> +<div class="p-2"> <div class="row mb-0"> <div id="profile-{{ nomination.profile.id }}-specialties" diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_summary.html b/scipost_django/colleges/templates/colleges/_hx_nomination_summary.html index 0b3365886ce9fa6f4300601cd0bf4aaae440a800..336082ac2397c84b98ab2eca9d2952c35ca8f4db 100644 --- a/scipost_django/colleges/templates/colleges/_hx_nomination_summary.html +++ b/scipost_django/colleges/templates/colleges/_hx_nomination_summary.html @@ -1,33 +1,67 @@ <div class="row mb-0"> <div class="col-12 col-md"> - <div class="row"> + <div class="row mb-0"> <div class="col"> - <div class="fs-6">{{ nomination.profile }}</div> - <div class="d-none d-md-block">(click for details)</div> - </div> + <div class="row mb-0"> + + <div class="col-12 col-lg-4"> + <div class="row mb-0 h-100 align-content-between"> + <div class="col col-lg-12 fs-5">{{ nomination.profile }}</div> + <div class="col-auto"> + <div class="text-muted">nominated by</div> + <div>{{ nomination.nominated_by.profile.full_name }}</div> + </div> + </div> + </div> + + <div class="col-12 col-md"> + <div class="row mb-2"> + <div class="col-auto text-nowrap"> + <small class="text-muted">Editorial college</small> + <br /> + {{ nomination.college.name }} + </div> + <div class="col-auto text-nowrap"> + <small class="text-muted">Specialties</small> + <br /> + + {% for specialty in nomination.profile.specialties.all %} + <span title="{{ specialty.name }}">{{ specialty.code }}</span> + {% empty %} + None + {% endfor %} + + </div> + + <div class="col text-nowrap "> + <small class="text-muted">Last event</small> + <br /> + {{ nomination.events.latest.on|date:'Y-m-d' }} + - + <span class="">{{ nomination.events.latest.description }}</span> + </div> - <div class="col-auto"> - <div class="row justify-content-between"> - <small class="col text-muted text-nowrap">Editorial college</small> - <div class="col-auto">{{ nomination.college.name }}</div> + </div> + <div class="row mb-2 justify-content-between"> + <small class="col text-muted text-nowrap">Publications</small> + <div class="col-auto">{{ nomination.profile.publications.all.count }}</div> + <small class="col text-muted text-nowrap">Total rounds</small> + <div class="col-auto">{{ nomination.voting_rounds.all.count }}</div> + </div> + </div> </div> </div> - </div> - </div> + <div class="col-12 col-md-5"> - <div class="col col-md-6 col-lg-5"> + {% if nomination.latest_voting_round %} + {% include "colleges/_hx_voting_round_summary.html" with round=nomination.latest_voting_round %} + {% else %} + <div class="h-100 d-flex align-items-center justify-content-end"> + <div class="badge bg-danger fs-6">No rounds created yet</div> + </div> + {% endif %} - {% if nomination.latest_voting_round %} - {% include "colleges/_hx_voting_round_summary.html" with round=nomination.latest_voting_round %} - {% else %} - <div class="h-100 d-flex align-items-center justify-content-center"> - <div class="badge bg-danger fs-6">No rounds created yet</div> </div> - {% endif %} - - </div> - - -</div> + </div>