diff --git a/colleges/admin.py b/colleges/admin.py index f0f5c4466a612d96504f7f1c142e9b60d1d97bbd..e9e7978dd6a6c153c8790718f48f9d8f0f105325 100644 --- a/colleges/admin.py +++ b/colleges/admin.py @@ -42,6 +42,8 @@ class PotentialFellowshipAdmin(admin.ModelAdmin): ] list_display = [ '__str__', + 'college', + 'status' ] search_fields = [ 'profile__last_name', diff --git a/colleges/forms.py b/colleges/forms.py index e9b5de2dfdf73e3130a10b54f99182b4de1ad5ed..a8a8124045c82cb001a9dada0c45f858f2ac64bd 100644 --- a/colleges/forms.py +++ b/colleges/forms.py @@ -223,7 +223,7 @@ class PotentialFellowshipForm(RequestFormMixin, forms.ModelForm): class Meta: model = PotentialFellowship - fields = ['profile'] + fields = ['college', 'profile'] def save(self): """ diff --git a/colleges/migrations/0021_potentialfellowship_college.py b/colleges/migrations/0021_potentialfellowship_college.py new file mode 100644 index 0000000000000000000000000000000000000000..a6fe6c9121a73ab715b48d0b29711982a89af31b --- /dev/null +++ b/colleges/migrations/0021_potentialfellowship_college.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.16 on 2020-09-25 14:25 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('colleges', '0020_auto_20200925_1617'), + ] + + operations = [ + migrations.AddField( + model_name='potentialfellowship', + name='college', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='potential_fellowships', to='colleges.College'), + ), + ] diff --git a/colleges/migrations/0022_potentialfellowship_set_college.py b/colleges/migrations/0022_potentialfellowship_set_college.py new file mode 100644 index 0000000000000000000000000000000000000000..87903642f382ac0e39e54af4adac066bce4d0430 --- /dev/null +++ b/colleges/migrations/0022_potentialfellowship_set_college.py @@ -0,0 +1,25 @@ +# Generated by Django 2.2.16 on 2020-09-25 14:26 + +from django.db import migrations + + +def assign_college(apps, schema_editor): + College = apps.get_model('colleges.College') + PotentialFellowship = apps.get_model('colleges.PotentialFellowship') + + for f in PotentialFellowship.objects.all(): + college = College.objects.get(acad_field__slug=f.profile.discipline) + f.college = college + f.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('colleges', '0021_potentialfellowship_college'), + ] + + operations = [ + migrations.RunPython(assign_college, + reverse_code=migrations.RunPython.noop), + ] diff --git a/colleges/migrations/0023_auto_20200925_1632.py b/colleges/migrations/0023_auto_20200925_1632.py new file mode 100644 index 0000000000000000000000000000000000000000..f59e059b88d4901b591a81b6d85849bc01b8180a --- /dev/null +++ b/colleges/migrations/0023_auto_20200925_1632.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.16 on 2020-09-25 14:32 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('colleges', '0022_potentialfellowship_set_college'), + ] + + operations = [ + migrations.AlterField( + model_name='potentialfellowship', + name='college', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='potential_fellowships', to='colleges.College'), + ), + ] diff --git a/colleges/models/potential_fellowship.py b/colleges/models/potential_fellowship.py index 7c829c17e01a234c22743d7f2ee9ca99b72420d1..2c39230ce9c382212b6ae48387163c03bf09fd15 100644 --- a/colleges/models/potential_fellowship.py +++ b/colleges/models/potential_fellowship.py @@ -28,6 +28,12 @@ class PotentialFellowship(models.Model): and non-registered people. """ + college = models.ForeignKey( + 'colleges.College', + on_delete=models.PROTECT, + related_name='potential_fellowships' + ) + profile = models.ForeignKey('profiles.Profile', on_delete=models.CASCADE) status = models.CharField(max_length=32, choices=POTENTIAL_FELLOWSHIP_STATUSES, default=POTENTIAL_FELLOWSHIP_IDENTIFIED) diff --git a/colleges/templates/colleges/potentialfellowship_list.html b/colleges/templates/colleges/potentialfellowship_list.html index a319e5136fcd6bd9f9381074a14c1e8211e17409..ee0efb1cfb83327504134e5c1d47a4cb1352f50c 100644 --- a/colleges/templates/colleges/potentialfellowship_list.html +++ b/colleges/templates/colleges/potentialfellowship_list.html @@ -97,6 +97,7 @@ <th>Name</th> <th>Discipline</th> <th>Expertises</th> + <th>For College</th> <th>Status</th> <th>Latest event</th> </tr> @@ -111,6 +112,7 @@ <div class="single d-inline" data-specialization="{{ expertise|lower }}" data-toggle="tooltip" data-placement="bottom" title="{{ expertise|get_specialization_display }}">{{ expertise|get_specialization_code }}</div> {% endfor %} </td> + <td>{{ potfel.college }}</td> <td style="color: #ffffff; background-color:{{ potfel.status|potfelstatuscolor }};">{{ potfel.get_status_display }}<br/><small>{% voting_results_display potfel %}</small></td> <td>{{ potfel.latest_event_details }}</td> </tr>