diff --git a/scipost_django/colleges/forms.py b/scipost_django/colleges/forms.py index 45a075e9c2426837ae87a44b83ac1de581abd623..f307164404bbea854445b198b76561c13b3483e5 100644 --- a/scipost_django/colleges/forms.py +++ b/scipost_django/colleges/forms.py @@ -322,7 +322,7 @@ class FellowshipNominationForm(forms.ModelForm): def clean(self): data = super().clean() - failed_eligibility_criteria = check_profile_eligibility(self.profile) + failed_eligibility_criteria = check_profile_eligibility_for_fellowship(self.profile) if failed_eligibility_criteria: for critetion in failed_eligibility_criteria: self.add_error(None, criterion) @@ -356,12 +356,6 @@ class FellowshipNominationSearchForm(forms.Form): label='Specialty', required=False ) - # profile = forms.ModelChoiceField( - # queryset=Profile.objects.all(), - # widget=autocomplete.ModelSelect2(url='/profiles/profile-autocomplete'), - # label='Name (through Profile)', - # required=False - # ) name = forms.CharField( max_length=128, required=False @@ -378,7 +372,7 @@ class FellowshipNominationSearchForm(forms.Form): ), Div( # Div(FloatingField('profile'), css_id='search-profile', css_class='col-lg-6'), - Div(FloatingField('name'), css_class='col-lg-6'), + Div(FloatingField('name', autocomplete='off'), css_class='col-lg-6'), css_class='row' ), ) diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_li.html b/scipost_django/colleges/templates/colleges/_hx_nomination_li.html index a5aaf64060ed84b5777a258fa8c5bdf89c9b5fbb..42222bb986d70c910b63d7177d382c7b5dc75ebf 100644 --- a/scipost_django/colleges/templates/colleges/_hx_nomination_li.html +++ b/scipost_django/colleges/templates/colleges/_hx_nomination_li.html @@ -1 +1,78 @@ -{{ nomination }} +<div class="border border-dark"> + <details> + <summary class="bg-light p-2"> + {{ nomination.profile }}<span class="float-end">{{ nomination.college }}</span> + </summary> + <div class="p-2"> + <p>Nominated by {{ nomination.nominated_by }} on {{ nomination.nominated_on|date:"Y-m-d" }}</p> + <div class="row"> + <div class="col"> + <div class="card"> + <div class="card-header"> + Details + </div> + <div class="card-body"> + <table class="table"> + <tr> + <td>Field</td><td>{{ nomination.profile.acad_field }}</td> + </tr> + <tr> + <td>Specialties</td> + <td> + {% for specialty in nomination.profile.specialties.all %} + <div class="single d-inline" data-specialty="{{ specialty }}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{ specialty }}">{{ specialty.code }}</div> + {% empty %} + undefined + {% endfor %} + </td> + </tr> + <tr> + <td>ORCID ID</td> + <td> + {% if nomination.profile.orcid_id %} + <a href="//orcid.org/{{ nomination.profile.orcid_id }}" target="_blank" rel="noopener">{{ nomination.profile.orcid_id }}</a> + {% else %} + unknown + {% endif %} + </td> + </tr> + <tr><td>Webpage</td> + <td> + {% if profile.webpage %} + <a href="{{ profile.webpage }}" target="_blank" rel="noopener">{{ profile.webpage }}</a> + {% else %} + unknown + {% endif %} + </td> + </tr> + </table> + </div> + </div> + </div> + <div class="col"> + <div class="card"> + <div class="card-header"> + Publications in SciPost Journals + </div> + <div class="card-body"> + <ul> + {% for pub in profile.publications.all|slice:":10" %} + <li><a href="{{ pub.get_absolute_url }}">{{ pub.citation }}</a></li> + {% empty %} + <li>No Publication found</li> + {% endfor %} + </ul> + </div> + </div> + </div> + </div> + <table class="table"> + <tr> + <td>Affiliations</td> + <td> + {% include 'profiles/_affiliations_table.html' with profile=nomination.profile actions=False %}</td> + </tr> + </table> + </div> + </details> +</div> diff --git a/scipost_django/colleges/templates/colleges/nominations.html b/scipost_django/colleges/templates/colleges/nominations.html index e3f0039e356ea8600a7db6b4cde929e1bf97fbc9..c82d383f62a70ab741acefdfb9d95a6118c5db59 100644 --- a/scipost_django/colleges/templates/colleges/nominations.html +++ b/scipost_django/colleges/templates/colleges/nominations.html @@ -17,7 +17,7 @@ <div class="card"> <div class="card-header"> - Nominate somebody for a Fellowship + <h2>Nominate</h2> </div> <div class="card-body"> <div class="row"> @@ -70,9 +70,9 @@ </div> </div> - <div class="card"> + <div class="card mt-4"> <div class="card-header"> - Search / filter + <h2>Search / filter</h2> </div> <div class="card-body"> <form @@ -85,11 +85,18 @@ </form> </div> </div> - <div id="indicator-search" class="htmx-indicator p-2"> - <button class="btn btn-warning" type="button" disabled> - <strong>Loading...</strong> - <div class="spinner-grow spinner-grow-sm ms-2" role="status" aria-hidden="true"></div> - </button> + <div class="row"> + <div class="col"> + <h3>Nominations list</h3> + </div> + <div class="col"> + <div id="indicator-search" class="htmx-indicator"> + <button class="btn btn-sm btn-warning" type="button" disabled> + <strong>Loading...</strong> + <div class="spinner-grow spinner-grow-sm ms-2" role="status" aria-hidden="true"></div> + </button> + </div> + </div> </div> <ul id="search-results" class="list-unstyled mt-2"></ul>