From b6c28988a8bf00d46152eebc8add2eb2c85b317e Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Sun, 8 Sep 2024 16:37:24 +0300 Subject: [PATCH 01/27] Fixed LDAPError import error. --- teknologr/members/views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/teknologr/members/views.py b/teknologr/members/views.py index 86cd48d..82b999c 100644 --- a/teknologr/members/views.py +++ b/teknologr/members/views.py @@ -6,10 +6,11 @@ from members.programmes import DEGREE_PROGRAMME_CHOICES from registration.models import Applicant from registration.forms import RegistrationForm -from api.ldap import LDAPAccountManager +from api.ldap import LDAPAccountManager, LDAPError_to_string from api.bill import BILLAccountManager from getenv import env from locale import strxfrm +from ldap import LDAPError def set_side_context(context, category, active_obj=None): @@ -76,8 +77,6 @@ def member(request, member_id): if request.method == 'POST': form = MemberForm(request.POST, instance=member) if form.is_valid(): - from ldap import LDAPError - from api.ldap import LDAPError_to_string try: form.save() except LDAPError as e: From c9d54fca380c7a274704f24a09936c9e1e37197e Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Sun, 8 Sep 2024 16:41:02 +0300 Subject: [PATCH 02/27] Removed residue from old Member.mobile_phone field. --- teknologr/katalogen/templates/profile.html | 8 +------- teknologr/members/templates/member.html | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/teknologr/katalogen/templates/profile.html b/teknologr/katalogen/templates/profile.html index b3baaa3..8fc6c7a 100644 --- a/teknologr/katalogen/templates/profile.html +++ b/teknologr/katalogen/templates/profile.html @@ -21,13 +21,7 @@

Telefonnummer - - {% if person.mobile_phone %} - {{person.mobile_phone}} - {% else %} - {{person.phone}} - {% endif %} - + {{person.phone}} E-postadress diff --git a/teknologr/members/templates/member.html b/teknologr/members/templates/member.html index a18a614..7b70368 100644 --- a/teknologr/members/templates/member.html +++ b/teknologr/members/templates/member.html @@ -86,7 +86,7 @@

- + {%if form.phone.errors %}
{{form.phone.errors}}
{%endif%} {{form.phone}}
From 07846b75549c3fcbcb001c5b3e70d955915cde12 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Mon, 9 Sep 2024 01:16:07 +0300 Subject: [PATCH 03/27] Refactored profile information into its own template. --- teknologr/katalogen/templates/profile.html | 63 +------------------ .../templates/profile_information.html | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+), 62 deletions(-) create mode 100644 teknologr/katalogen/templates/profile_information.html diff --git a/teknologr/katalogen/templates/profile.html b/teknologr/katalogen/templates/profile.html index 8fc6c7a..43adfbc 100644 --- a/teknologr/katalogen/templates/profile.html +++ b/teknologr/katalogen/templates/profile.html @@ -11,68 +11,7 @@

{% endif %}

-
- - - {% if show_all %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% endif %} - - - - - -
Tilltalsnamn{{person.preferred_name}}
Telefonnummer{{person.phone}}
E-postadress{{person.email}}
Hemadress - {{person.street_address}}
- {{person.postal_code}} {{person.city}}
- {{person.country.name}} -
Studieprogram{{person.degree_programme}}
Phuxår - {{ person.phux_year|default_if_none:'' }} -
Färdigbliven - {% if person.graduated %} - {% if person.graduated_year %} - {{person.graduated_year}} - {% else %} - Ja - {% endif %} - {% else %} - Nej - {% endif %} -
Medlemskapstyp - {% if person.current_member_type %} - {{ person.current_member_type }} - {% else %} - Ej medlem - {% endif %} -
-
+ {% include 'profile_information.html' %}
{% if decoration_ownerships %}

Betygelser

diff --git a/teknologr/katalogen/templates/profile_information.html b/teknologr/katalogen/templates/profile_information.html new file mode 100644 index 0000000..c5c88a8 --- /dev/null +++ b/teknologr/katalogen/templates/profile_information.html @@ -0,0 +1,63 @@ + +
+ + + {% if show_all %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% endif %} + + + + + +
Tilltalsnamn{{person.preferred_name}}
Telefonnummer{{person.phone}}
E-postadress{{person.email}}
Hemadress + {{person.street_address}}
+ {{person.postal_code}} {{person.city}}
+ {{person.country.name}} +
Studieprogram{{person.degree_programme}}
Phuxår + {{ person.phux_year|default_if_none:'' }} +
Färdigbliven + {% if person.graduated %} + {% if person.graduated_year %} + {{person.graduated_year}} + {% else %} + Ja + {% endif %} + {% else %} + Nej + {% endif %} +
Medlemskapstyp + {% if person.current_member_type %} + {{ person.current_member_type }} + {% else %} + Ej medlem + {% endif %} +
+
\ No newline at end of file From 7ef793506032f33714fb7b52beca58b47b56aca0 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Sat, 21 Sep 2024 17:07:23 +0300 Subject: [PATCH 04/27] Show more information to you on your own profile page. This solves issue #205. --- teknologr/katalogen/static/css/katalogen.css | 4 ++ .../templates/profile_information.html | 46 +++++++++++++++++++ teknologr/katalogen/views.py | 5 +- teknologr/members/models.py | 12 +++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/teknologr/katalogen/static/css/katalogen.css b/teknologr/katalogen/static/css/katalogen.css index 45495f4..1453397 100644 --- a/teknologr/katalogen/static/css/katalogen.css +++ b/teknologr/katalogen/static/css/katalogen.css @@ -13,6 +13,10 @@ font-size: 130%; } +.monospace { + font-family: monospace; +} + .admin-link { color: black; } diff --git a/teknologr/katalogen/templates/profile_information.html b/teknologr/katalogen/templates/profile_information.html index c5c88a8..51cb9cd 100644 --- a/teknologr/katalogen/templates/profile_information.html +++ b/teknologr/katalogen/templates/profile_information.html @@ -48,6 +48,52 @@ {% endif %} + + {% if own_profile %} + + Födelsedatum + + {{ person.birth_date|default:'' }} + + + + Studienummer + + {{ person.student_id|default:'' }} + + + + Användarnamn + + {{ person.username|default:'' }} + + + + BILL-konto + + {{ person.bill_code|default:'' }} + + + + Prenumerera på Modulen + + {{person.subscribed_to_modulen_text}} + + + + Prenumerera på Studentbladet + + {{ person.allow_studentbladet_text }} + + + + Visa kontaktinformation + + {{ person.allow_publish_info_text }} + + + {% endif %} + Medlemskapstyp diff --git a/teknologr/katalogen/views.py b/teknologr/katalogen/views.py index 703cd1c..e1b6bed 100644 --- a/teknologr/katalogen/views.py +++ b/teknologr/katalogen/views.py @@ -65,10 +65,13 @@ def profile(request, member_id): ft_durations = MultiDuration.combine_per_key(ft_durations) gt_durations = MultiDuration.combine_per_key(gt_durations) + own_profile = person.username == request.user.username + return render(request, 'profile.html', { **_get_base_context(request), # XXX: Could use MemberSerializerPartial to remove any unwanted fields for real instead of just not showing them - 'show_all': person.username == request.user.username or person.showContactInformation(), + 'own_profile': own_profile, + 'show_all': own_profile or person.showContactInformation(), 'person': person, 'combined': combine, 'functionary_type_durations': ft_durations, diff --git a/teknologr/members/models.py b/teknologr/members/models.py index 9bdba0e..3df4731 100644 --- a/teknologr/members/models.py +++ b/teknologr/members/models.py @@ -237,6 +237,18 @@ def full_address(self): address_parts = [self.street_address, city, country] return ", ".join([s for s in address_parts if s]) + @property + def subscribed_to_modulen_text(self): + return "Ja" if self.subscribed_to_modulen else "Nej" + + @property + def allow_studentbladet_text(self): + return "Ja" if self.allow_studentbladet else "Nej" + + @property + def allow_publish_info_text(self): + return "Ja" if self.allow_publish_info else "Nej" + @property def n_decorations(self): if hasattr(self, 'count_decoration_ownerships'): From 9acb52b185caeb3413ef7ed46d06341f562a9e69 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Sat, 21 Sep 2024 18:04:30 +0300 Subject: [PATCH 05/27] Added HTMX to the project. --- teknologr/katalogen/templates/home.html | 5 ++++- teknologr/members/static/assets/js/htmx-2.0.2.min.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 teknologr/members/static/assets/js/htmx-2.0.2.min.js diff --git a/teknologr/katalogen/templates/home.html b/teknologr/katalogen/templates/home.html index b772f02..9ebbcf0 100644 --- a/teknologr/katalogen/templates/home.html +++ b/teknologr/katalogen/templates/home.html @@ -21,7 +21,7 @@ - +
diff --git a/teknologr/katalogen/urls.py b/teknologr/katalogen/urls.py index 9ab9ef4..e62b63a 100644 --- a/teknologr/katalogen/urls.py +++ b/teknologr/katalogen/urls.py @@ -7,6 +7,8 @@ url(r'^([A-ZÅÄÖ])/$', views.startswith, name='startswith'), url(r'^members/$', views.home), url(r'^members/(\d+)/$', views.profile, name='profile'), + url(r'^members/(\d+)/info$', views.profile_info, name='profile_info'), + url(r'^members/(\d+)/edit$', views.profile_edit, name='profile_edit'), url(r'^person/(\d+)/$', views.profile), url(r'^profile/$', views.myprofile, name='myprofile'), url(r'^decorations/$', views.decorations, name='decorations'), diff --git a/teknologr/katalogen/views.py b/teknologr/katalogen/views.py index e1b6bed..8d9ad18 100644 --- a/teknologr/katalogen/views.py +++ b/teknologr/katalogen/views.py @@ -1,14 +1,23 @@ from django.shortcuts import render, get_object_or_404, redirect from django.contrib.auth.decorators import login_required +from django.core.exceptions import PermissionDenied from django.db.models.functions import TruncYear from members.models import * from members.utils import * +from katalogen.forms import EditProfileForm from katalogen.utils import * from django.db.models import Q, Count from functools import reduce from operator import and_ from collections import defaultdict +from ldap import LDAPError +def own_profile_or_403(request, member): + ''' + Function for checking if the logged in user is a certain Member. + ''' + if request.user.username != member.username: + raise PermissionDenied() def _get_base_context(request): return { @@ -79,6 +88,47 @@ def profile(request, member_id): 'decoration_ownerships': person.decoration_ownerships_by_date, }) +@login_required +def profile_info(request, member_id): + """ + Only render the member information section, not the decorations etc., so no need to prefetch the extra info. + """ + + member = get_object_or_404(Member, id=member_id) + own_profile = member.username == request.user.username + + return render(request, 'profile_information.html', { + 'own_profile': own_profile, + 'show_all': own_profile or member.showContactInformation(), + 'person': member, + }) + +@login_required +def profile_edit(request, member_id): + """ + Update the member information. This can only be done by the user himself. Returns only the HTML for the member information, not the decorations etc. This makes it possible for HTMX to swap only part of the page when saving the info. + """ + + member = Member.objects.get_prefetched_or_404(member_id) + own_profile_or_403(request, member) + + if request.method == 'POST': + form = EditProfileForm(request.POST, instance=member) + if form.is_valid(): + try: + form.save() + form = None + except LDAPError: + form.add_error('email', 'E-postadressen kunde tyvärr inte uppdateras, vänligen kontakta en administrator') + else: + form = EditProfileForm(instance=member) + + return render(request, 'profile_information.html', { + 'form': form, + 'own_profile': True, + 'show_all': True, + 'person': member, + }) @login_required def startswith(request, letter): diff --git a/teknologr/members/models.py b/teknologr/members/models.py index 3df4731..4bfed74 100644 --- a/teknologr/members/models.py +++ b/teknologr/members/models.py @@ -235,7 +235,15 @@ def full_address(self): country = str(self.country.name) city = f'{self.postal_code} {self.city}'.strip() address_parts = [self.street_address, city, country] - return ", ".join([s for s in address_parts if s]) + address = ", ".join([s for s in address_parts if s]) + # Do not show only country + return address if address != country else '' + + @property + def graduated_text(self): + if self.graduated_year: + return str(self.graduated_year) + return "Ja" if self.graduated else "Nej" @property def subscribed_to_modulen_text(self): From 727f14d0b721b80a74a3772b60c53bb28807cf65 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Thu, 3 Oct 2024 01:24:23 +0300 Subject: [PATCH 11/27] Let users also modify their graduation year. --- teknologr/katalogen/forms.py | 2 +- teknologr/katalogen/templates/profile_information.html | 3 ++- teknologr/members/validators.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/teknologr/katalogen/forms.py b/teknologr/katalogen/forms.py index 3cf88a5..f4471c8 100644 --- a/teknologr/katalogen/forms.py +++ b/teknologr/katalogen/forms.py @@ -7,7 +7,7 @@ class EditProfileForm(BSModelForm, CommonValidators): class Meta: model = Member - fields = ['phone', 'email', 'street_address', 'postal_code', 'city', 'country', 'subscribed_to_modulen', 'allow_studentbladet', 'allow_publish_info'] + fields = ['phone', 'email', 'street_address', 'postal_code', 'city', 'country', 'graduated', 'graduated_year', 'subscribed_to_modulen', 'allow_studentbladet', 'allow_publish_info'] def clean(self): BSModelForm.clean(self) diff --git a/teknologr/katalogen/templates/profile_information.html b/teknologr/katalogen/templates/profile_information.html index 1e11861..e48f0bc 100644 --- a/teknologr/katalogen/templates/profile_information.html +++ b/teknologr/katalogen/templates/profile_information.html @@ -75,9 +75,10 @@ Färdigbliven {{ form.graduated.errors }} + {{ form.graduated_year.errors }} - {% firstof form.graduated person.graduated_text %} + {% firstof form.graduated_year person.graduated_text %} {% endif %} diff --git a/teknologr/members/validators.py b/teknologr/members/validators.py index 0beb4e7..1e25fc7 100644 --- a/teknologr/members/validators.py +++ b/teknologr/members/validators.py @@ -85,7 +85,7 @@ def clean(self): self.cleaned_data['graduated'] = True # Some validation of various years, for the sake of minimizing mistakes - birth_date = self.cleaned_data.get('birth_date') + birth_date = self.cleaned_data.get('birth_date') or (self.instance.birth_date if self.instance else None) birth_year = birth_date.year if birth_date else None this_year = datetime.now().year @@ -99,4 +99,4 @@ def clean(self): self.add_error('enrolment_year', f'Inskrivningsåret kan inte vara i framtiden eller för snabbt efter födelseåret') if not in_range(graduated_year, enrolment_year or minimum, this_year): - self.add_error('graduated_year', 'Utexamineringsåret kan inte vara i framtiden eller före inskrivningsåret') + self.add_error('graduated_year', 'Utexamineringsåret kan inte vara i framtiden eller före födelseåret/inskrivningsåret') From b11ab3da689fbdc3805fa27fad5f3b443dbf68b8 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Sat, 12 Oct 2024 14:14:59 +0300 Subject: [PATCH 12/27] Enhanced profile pages: - Reordered the fields. - Added studytime, O-memeber and S-member duration fields. - Added possibility for users to change their preferred name. - Fixed validawtion of certain member form fields. --- teknologr/katalogen/forms.py | 2 +- teknologr/katalogen/static/css/katalogen.css | 7 + .../templates/profile_information.html | 138 +++++++++++------- teknologr/katalogen/views.py | 2 + teknologr/members/models.py | 24 +++ teknologr/members/validators.py | 30 ++-- 6 files changed, 139 insertions(+), 64 deletions(-) diff --git a/teknologr/katalogen/forms.py b/teknologr/katalogen/forms.py index f4471c8..1bfb576 100644 --- a/teknologr/katalogen/forms.py +++ b/teknologr/katalogen/forms.py @@ -7,7 +7,7 @@ class EditProfileForm(BSModelForm, CommonValidators): class Meta: model = Member - fields = ['phone', 'email', 'street_address', 'postal_code', 'city', 'country', 'graduated', 'graduated_year', 'subscribed_to_modulen', 'allow_studentbladet', 'allow_publish_info'] + fields = ['preferred_name', 'phone', 'email', 'street_address', 'postal_code', 'city', 'country', 'graduated', 'graduated_year', 'subscribed_to_modulen', 'allow_studentbladet', 'allow_publish_info'] def clean(self): BSModelForm.clean(self) diff --git a/teknologr/katalogen/static/css/katalogen.css b/teknologr/katalogen/static/css/katalogen.css index d4115f5..870484d 100644 --- a/teknologr/katalogen/static/css/katalogen.css +++ b/teknologr/katalogen/static/css/katalogen.css @@ -34,3 +34,10 @@ .order-by { cursor: pointer; } + +/* .text-right comes from Bootstrap, and is used (at least) on the member profile pages. This addition makes sure that the text in a table cell can be replaced with an input field (not checkbox) without the row changing size. */ +.text-right:has(input):has(.form-control) { + vertical-align: middle !important; + padding-top: 0 !important; + padding-bottom: 0 !important; +} diff --git a/teknologr/katalogen/templates/profile_information.html b/teknologr/katalogen/templates/profile_information.html index e48f0bc..307da53 100644 --- a/teknologr/katalogen/templates/profile_information.html +++ b/teknologr/katalogen/templates/profile_information.html @@ -3,18 +3,56 @@ id="member-information" class="col-12 col-lg-7" hx-target="#member-information" - hx-swap="outerHTML" + hx-swap="outerHTML show:bottom transition:true" > - {% if show_all %} + + + + + + + + + + + + + + + + + + +
Födelseår + {{ person.birth_date.year }} +
Studietid + {{ person.studytime_text }} +
- Tilltalsnamn - {{ form.preferred_name.errors }} + Studieprogram + {{ form.degree_programme.errors }} - {% firstof form.preferred_name person.preferred_name %} + {% firstof form.degree_programme person.degree_programme %} +
Ordinarie medlem + {{ person.omembertime_text }} +
Ständig äldre medlem + {{ person.smembertime_text }} +
+ + {% if show_all %} +
Kontaktinformation
+ + + + + @@ -39,6 +77,9 @@ {% if form %} {% endif %} + +
+ Fullständigt namn + + {% firstof person.full_name %}
Hemadress {{ form.street_address.errors }} + {{ form.postal_code.errors }} + {{ form.city.errors }} + {{ form.country.errors }} @@ -53,104 +94,99 @@
+ {% endif %} + + {% if own_profile %} +
Personliga inställningar
+ + - - - - - {% endif %} - - {% if own_profile %} - - - - - + + +
- Studieprogram - {{ form.degree_programme.errors }} - - {% firstof form.degree_programme person.degree_programme %} -
- Phuxår - {{ form.phux_year.errors }} + Tilltalsnamn + {{ form.preferred_name.errors }} - {% firstof form.phux_year person.phux_year %} + {% firstof form.preferred_name person.preferred_name %}
- Färdigbliven + Utexamineringsår {{ form.graduated.errors }} {{ form.graduated_year.errors }} - {% firstof form.graduated_year person.graduated_text %} + {% firstof form.graduated_year person.graduated_year %}
- Födelsedatum - {{ form.birth_date.errors }} + Prenumerera på Modulen + {{ form.subscribed_to_modulen.errors }} - {% firstof form.birth_date person.birth_date %} + {% firstof form.subscribed_to_modulen person.subscribed_to_modulen_text %}
- Studienummer - {{ form.student_id.errors }} + Prenumerera på Studentbladet + {{ form.allow_studentbladet.errors }} - {% firstof form.student_id person.student_id %} -
Användarnamn - {{ person.username|default:'' }} + {% firstof form.allow_studentbladet person.allow_studentbladet_text %}
BILL-konto + Visa kontaktinformation + {{ form.allow_publish_info.errors }} + - {{ person.bill_code|default:'' }} + {% firstof form.allow_publish_info person.allow_publish_info_text %}
+ +
Övrig privat information
+ + - + - {% endif %} - - +
- Prenumerera på Modulen - {{ form.subscribed_to_modulen.errors }} + Födelsedatum + {{ form.birth_date.errors }} - {% firstof form.subscribed_to_modulen person.subscribed_to_modulen_text %} + {% firstof form.birth_date person.birth_date %}
- Prenumerera på Studentbladet - {{ form.allow_studentbladet.errors }} + Studienummer + {{ form.student_id.errors }} - {% firstof form.allow_studentbladet person.allow_studentbladet_text %} + {% firstof form.student_id person.student_id %}
- Visa kontaktinformation - {{ form.allow_publish_info.errors }} - Användarnamn - {% firstof form.allow_publish_info person.allow_publish_info_text %} + {{ person.username|default:'' }}
MedlemskapstypBILL-konto - {{ person.current_member_type|default:'Ej medlem' }} + {{ person.bill_code|default:'' }}
+ {% endif %} {% if form %}
- {% else %} - + {% elif filter %} + {% endif %} -{% if search %} +{% if alphabet %}
{% for letter in abc %} From 979e27558d0ef8ae9fd30ba9dddd15844c6880d8 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Sat, 12 Oct 2024 14:49:54 +0300 Subject: [PATCH 15/27] Updated front page text and other minor changes. --- teknologr/katalogen/static/css/katalogen.css | 16 ++++++++-------- teknologr/katalogen/templates/browse.html | 2 +- teknologr/katalogen/views.py | 2 +- teknologr/members/models.py | 3 +-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/teknologr/katalogen/static/css/katalogen.css b/teknologr/katalogen/static/css/katalogen.css index 870484d..ff13769 100644 --- a/teknologr/katalogen/static/css/katalogen.css +++ b/teknologr/katalogen/static/css/katalogen.css @@ -1,16 +1,16 @@ .navbar { - margin-bottom: 20px; + margin-bottom: 20px; } .searchbar { - padding: 20px; - padding-top: 0px; + padding: 20px; + padding-top: 0px; } .alphabet { - padding: 20px; - padding-top: 0px; - font-size: 130%; + padding: 20px; + padding-top: 0px; + font-size: 130%; } .errorlist { @@ -28,11 +28,11 @@ } .admin-link { - color: black; + color: black; } .order-by { - cursor: pointer; + cursor: pointer; } /* .text-right comes from Bootstrap, and is used (at least) on the member profile pages. This addition makes sure that the text in a table cell can be replaced with an input field (not checkbox) without the row changing size. */ diff --git a/teknologr/katalogen/templates/browse.html b/teknologr/katalogen/templates/browse.html index 59b6523..5c3cedb 100644 --- a/teknologr/katalogen/templates/browse.html +++ b/teknologr/katalogen/templates/browse.html @@ -14,7 +14,7 @@

Katalogen på nätet

Bläddra i Teknologföreningens medlemsregister.

- Du kan söka efter personer med sökfältet ovan, eller se din egen profil via menyn. Personuppgifter (utöver namn) kan endast ses för personer som tillåtit utgivning av dessa, men man kan alltid se sina egena personuppgifter. Namn, medlemskapstyp, betygelser, poster och grupper kan däremot ses för alla personer i registret. + Du kan söka efter personer med sökfältet ovan, eller se din egen profil via menyn. Kontaktuppgifter kan endast ses för personer som tillåtit utgivning av dessa, men man kan alltid se alla sina egna uppgifter. Du kan även uppdatera dina egna uppgifter via din profil.

Via menyn kan du även se alla betygelser, poster och grupper. Årsspecifika sammanfattningar hittas också via menyn. diff --git a/teknologr/katalogen/views.py b/teknologr/katalogen/views.py index 74f50ff..c92f4ce 100644 --- a/teknologr/katalogen/views.py +++ b/teknologr/katalogen/views.py @@ -50,7 +50,7 @@ def search(request): @login_required def profile(request, member_id): """ - View the public profile of a user. All details will be shown if the user allows it, or if this is the user's own profile. + View the public profile of a member. All details will be shown if the user allows it, or if this is the user's own profile. URL query parameters available: - combine=<0/1>: Whether or not to combine the same Functionaries and GroupMemberships into a single row. The ordering will switch to lexicographical instead of reversed date as well. diff --git a/teknologr/members/models.py b/teknologr/members/models.py index 79a45b6..e01e4e0 100644 --- a/teknologr/members/models.py +++ b/teknologr/members/models.py @@ -105,7 +105,6 @@ class Member(SuperClass): graduated_year = models.IntegerField(blank=True, null=True) # OTHER dead = models.BooleanField(default=False) - # TODO: separate consent to own table subscribed_to_modulen = models.BooleanField(default=False) allow_publish_info = models.BooleanField(default=False) allow_studentbladet = models.BooleanField(default=False) @@ -181,7 +180,7 @@ def get_surname_without_prefixes(self): def get_full_name_HTML(self): ''' - Return name with the preferred name undercored. This can go wrong if the preferred name is not set correctly to one of the given names. + Return name with the preferred name underlined. This can go wrong if the preferred name is not set correctly to one of the given names. NOTE: A.replace(B, C) can be a bit confusing in Python if B = "" is used, since the empty string "" is assumed to be "everywhere" in Python strings: "abc".replace("", "X") => "XaXbXcX" From a12ff73147bba33bb35ba72f6635a82bc45a7762 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Sat, 12 Oct 2024 15:02:41 +0300 Subject: [PATCH 16/27] =?UTF-8?q?Fixed=20unittests=20that=20expected=20-?= =?UTF-8?q?=20instead=20of=20=E2=80=93.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- teknologr/katalogen/tests_utils.py | 12 +++++------ teknologr/members/models.py | 4 ++-- teknologr/members/tests_models.py | 34 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/teknologr/katalogen/tests_utils.py b/teknologr/katalogen/tests_utils.py index 4e30278..1d08ed2 100644 --- a/teknologr/katalogen/tests_utils.py +++ b/teknologr/katalogen/tests_utils.py @@ -15,18 +15,18 @@ def test_same_date(self): self.assertEqual('1 januari 1998', Duration(self.d1, self.d1).to_string()) def test_same_month(self): - self.assertEqual('1-30 januari 1998', Duration(self.d1, self.d2).to_string()) + self.assertEqual('1–30 januari 1998', Duration(self.d1, self.d2).to_string()) def test_same_year(self): - self.assertEqual('30 januari - 31 december 1998', Duration(self.d2, self.d3).to_string()) + self.assertEqual('30 januari – 31 december 1998', Duration(self.d2, self.d3).to_string()) def test_whole_years(self): self.assertEqual('1998', Duration(self.d1, self.d3).to_string()) - self.assertEqual('1998-2000', Duration(self.d1, self.d4).to_string()) + self.assertEqual('1998–2000', Duration(self.d1, self.d4).to_string()) def test_no_simplification(self): - self.assertEqual('1 januari 1998 - 7 juli 2001', Duration(self.d1, self.d5).to_string()) - self.assertEqual('7 juli 2001 - 31 december 2002', Duration(self.d5, self.d6).to_string()) + self.assertEqual('1 januari 1998 – 7 juli 2001', Duration(self.d1, self.d5).to_string()) + self.assertEqual('7 juli 2001 – 31 december 2002', Duration(self.d5, self.d6).to_string()) class MultiDurationTests(TestCase): def test_not_overlapping(self): @@ -75,6 +75,6 @@ def test_combine_per_key(self): result = [(r[0], r[1].to_string()) for r in result] self.assertEqual([ (9, '2000'), - (1, '1-31 januari 2000, 1 mars - 31 juli 2000, 1-30 september 2000'), + (1, '1–31 januari 2000, 1 mars – 31 juli 2000, 1–30 september 2000'), (8, '2000'), ], result) diff --git a/teknologr/members/models.py b/teknologr/members/models.py index e01e4e0..00bf689 100644 --- a/teknologr/members/models.py +++ b/teknologr/members/models.py @@ -772,8 +772,8 @@ class MemberType(SuperClass): type = models.CharField(max_length=2, choices=TYPES, default="PH") def __str__(self): - s = f'{self.get_type_display()}: {self.begin_date} –' - s += f' {self.end_date}' if self.end_date else '>' + s = f'{self.get_type_display()}: {self.begin_date} ' + s += f'– {self.end_date}' if self.end_date else '->' return s @classmethod diff --git a/teknologr/members/tests_models.py b/teknologr/members/tests_models.py index d2bb66f..f5eae8e 100644 --- a/teknologr/members/tests_models.py +++ b/teknologr/members/tests_models.py @@ -192,7 +192,7 @@ def test_member_type(self): # Wappen kom, phuxen är inte mera phux! ph.end_date = date(2012, 4, 30) ph.save() - self.assertEquals('Phux: 2012-09-01 - 2012-04-30', str(ph)) + self.assertEquals('Phux: 2012-09-01 – 2012-04-30', str(ph)) self.assertFalse(member.shouldBeStalm()) # Our person became JuniorStÄlM :O @@ -203,7 +203,7 @@ def test_member_type(self): # Our person is now finished with his/her studies om.end_date = date(2019, 4, 30) om.save() - self.assertEquals('Ordinarie Medlem: 2012-09-27 - 2019-04-30', str(om)) + self.assertEquals('Ordinarie Medlem: 2012-09-27 – 2019-04-30', str(om)) # member type should be nothing ('') now self.assertEquals('', member.current_member_type) @@ -336,16 +336,16 @@ def setUp(self): ) def test_str(self): - self.assertEqual('Group Type: 2023-01-01 - 2023-06-14', str(self.group1)) - self.assertEqual('Group Type: 2023-06-14 - 2023-12-31', str(self.group2)) - self.assertEqual('Group Type: 2023-01-01 - 2023-12-31', str(self.group3)) - self.assertEqual('Group Type: 2022-01-01 - 2024-12-31', str(self.group4)) + self.assertEqual('Group Type: 2023-01-01 – 2023-06-14', str(self.group1)) + self.assertEqual('Group Type: 2023-06-14 – 2023-12-31', str(self.group2)) + self.assertEqual('Group Type: 2023-01-01 – 2023-12-31', str(self.group3)) + self.assertEqual('Group Type: 2022-01-01 – 2024-12-31', str(self.group4)) def test_duration(self): - self.assertEqual('1 januari - 14 juni 2023', str(self.group1.duration)) - self.assertEqual('14 juni - 31 december 2023', str(self.group2.duration)) + self.assertEqual('1 januari – 14 juni 2023', str(self.group1.duration)) + self.assertEqual('14 juni – 31 december 2023', str(self.group2.duration)) self.assertEqual('2023', str(self.group3.duration)) - self.assertEqual('2022-2024', str(self.group4.duration)) + self.assertEqual('2022–2024', str(self.group4.duration)) class GroupOrderTest(BaseTest): def setUp(self): @@ -440,16 +440,16 @@ def setUp(self): ) def test_str(self): - self.assertEqual('Functionary Type: 2023-01-01 - 2023-06-14, Foo B Tester', str(self.functionary1)) - self.assertEqual('Functionary Type: 2023-06-14 - 2023-12-31, Foo B Tester', str(self.functionary2)) - self.assertEqual('Functionary Type: 2023-01-01 - 2023-12-31, Foo B Tester', str(self.functionary3)) - self.assertEqual('Functionary Type: 2022-01-01 - 2024-12-31, Foo B Tester', str(self.functionary4)) + self.assertEqual('Functionary Type: 2023-01-01 – 2023-06-14, Foo B Tester', str(self.functionary1)) + self.assertEqual('Functionary Type: 2023-06-14 – 2023-12-31, Foo B Tester', str(self.functionary2)) + self.assertEqual('Functionary Type: 2023-01-01 – 2023-12-31, Foo B Tester', str(self.functionary3)) + self.assertEqual('Functionary Type: 2022-01-01 – 2024-12-31, Foo B Tester', str(self.functionary4)) def test_duration(self): - self.assertEqual('1 januari - 14 juni 2023', str(self.functionary1.duration)) - self.assertEqual('14 juni - 31 december 2023', str(self.functionary2.duration)) + self.assertEqual('1 januari – 14 juni 2023', str(self.functionary1.duration)) + self.assertEqual('14 juni – 31 december 2023', str(self.functionary2.duration)) self.assertEqual('2023', str(self.functionary3.duration)) - self.assertEqual('2022-2024', str(self.functionary4.duration)) + self.assertEqual('2022–2024', str(self.functionary4.duration)) class FunctionaryOrderTest(BaseTest): def setUp(self): @@ -541,7 +541,7 @@ def setUp(self): ) def test_str(self): - self.assertEqual('Ordinarie Medlem: 2023-01-01 - 2023-06-14', str(self.member_type1)) + self.assertEqual('Ordinarie Medlem: 2023-01-01 – 2023-06-14', str(self.member_type1)) self.assertEqual('Ordinarie Medlem: 2023-06-14 ->', str(self.member_type2)) From 09dd0a3ba9415dd15dffb2c50dc9a68d39fa1569 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Tue, 22 Oct 2024 01:26:26 +0300 Subject: [PATCH 17/27] Moved uneditable private information to the right side of the profile, and made it not update on edit. --- teknologr/katalogen/templates/profile.html | 28 +++++++++++++++ .../templates/profile_information.html | 36 ------------------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/teknologr/katalogen/templates/profile.html b/teknologr/katalogen/templates/profile.html index 43adfbc..37b9873 100644 --- a/teknologr/katalogen/templates/profile.html +++ b/teknologr/katalogen/templates/profile.html @@ -13,6 +13,34 @@

{% include 'profile_information.html' %}
+ {% if own_profile %} +
Övrig privat information
+ + + + + + + + + + + + + + + + + + + +
Födelsedatum{{ person.birth_date|default:'' }}
Studienummer{{ person.student_id|default:'' }}
LDAP-användarnamn + {{ person.username|default:'' }} +
BILL-konto + {{ person.bill_code|default:'' }} +
+ {% endif %} + {% if decoration_ownerships %}

Betygelser

diff --git a/teknologr/katalogen/templates/profile_information.html b/teknologr/katalogen/templates/profile_information.html index 307da53..b0c330f 100644 --- a/teknologr/katalogen/templates/profile_information.html +++ b/teknologr/katalogen/templates/profile_information.html @@ -150,42 +150,6 @@
Personliga inställningar
- -
Övrig privat information
- - - - - - - - - - - - - - - - - - - -
- Födelsedatum - {{ form.birth_date.errors }} - - {% firstof form.birth_date person.birth_date %} -
- Studienummer - {{ form.student_id.errors }} - - {% firstof form.student_id person.student_id %} -
Användarnamn - {{ person.username|default:'' }} -
BILL-konto - {{ person.bill_code|default:'' }} -
{% endif %} {% if form %} From 72b86ab2bc422ae2d9717a7e1dc6c2fd8b1b3a89 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Tue, 22 Oct 2024 02:01:40 +0300 Subject: [PATCH 18/27] Added LDAP groups and BILL balance to user's own profile. --- teknologr/katalogen/templates/profile.html | 14 ++++++++++++ teknologr/katalogen/views.py | 4 ++++ teknologr/members/models.py | 25 ++++++++++++++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/teknologr/katalogen/templates/profile.html b/teknologr/katalogen/templates/profile.html index 37b9873..8f45934 100644 --- a/teknologr/katalogen/templates/profile.html +++ b/teknologr/katalogen/templates/profile.html @@ -31,12 +31,26 @@
Övrig privat information
{{ person.username|default:'' }} + + LDAP-grupper + + {{ person.get_ldap_groups|join:', ' }} + + BILL-konto {{ person.bill_code|default:'' }} + + BILL-saldo + + {% if bill_balance %} + {{ bill_balance }} € + {% endif %} + + {% endif %} diff --git a/teknologr/katalogen/views.py b/teknologr/katalogen/views.py index c92f4ce..a023723 100644 --- a/teknologr/katalogen/views.py +++ b/teknologr/katalogen/views.py @@ -75,6 +75,9 @@ def profile(request, member_id): gt_durations = MultiDuration.combine_per_key(gt_durations) own_profile = person.username == request.user.username + bill_balance = None + if own_profile: + bill_balance = person.get_bill_balance() return render(request, 'profile.html', { **_get_base_context(request), @@ -82,6 +85,7 @@ def profile(request, member_id): 'own_profile': own_profile, 'show_all': own_profile or person.showContactInformation(), 'person': person, + 'bill_balance': bill_balance, 'combined': combine, 'functionary_type_durations': ft_durations, 'group_type_durations': gt_durations, diff --git a/teknologr/members/models.py b/teknologr/members/models.py index 00bf689..e23a5c4 100644 --- a/teknologr/members/models.py +++ b/teknologr/members/models.py @@ -10,6 +10,9 @@ from datetime import date from katalogen.utils import * from members.utils import * +from api.bill import BILLAccountManager +from api.ldap import LDAPAccountManager +from ldap import LDAPError class SuperClass(models.Model): @@ -298,6 +301,26 @@ def n_groups(self): return self.count_group_memberships return self.group_memberships.count() + def get_ldap_groups(self): + if not self.username: + return [] + + try: + with LDAPAccountManager() as lm: + return lm.get_user_groups(self.username) + except: + return [] + + def get_bill_balance(self): + if not self.bill_code: + return None + + bm = BILLAccountManager() + try: + return bm.get_account_by_code(self.bill_code)['balance'] + except: + return None + def save(self, *args, **kwargs): if not self.username: self.username = None @@ -307,8 +330,6 @@ def save(self, *args, **kwargs): # Sync email to LDAP if changed error = None if self.username and self.email != self._original_email: - from api.ldap import LDAPAccountManager - from ldap import LDAPError try: with LDAPAccountManager() as lm: # Skip syncing email to LDAP if the LDAP account does not exist From 345bfc3615eed2fe70d9ed098de0669ca9d41c13 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Tue, 22 Oct 2024 02:01:48 +0300 Subject: [PATCH 19/27] Minor text changes. --- teknologr/katalogen/templates/profile_information.html | 2 +- teknologr/katalogen/views.py | 2 +- teknologr/members/templates/applicant.html | 2 +- teknologr/registration/templates/registration.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/teknologr/katalogen/templates/profile_information.html b/teknologr/katalogen/templates/profile_information.html index b0c330f..a6a2c6f 100644 --- a/teknologr/katalogen/templates/profile_information.html +++ b/teknologr/katalogen/templates/profile_information.html @@ -141,7 +141,7 @@
Personliga inställningar
- Visa kontaktinformation + Tillåt visning av kontaktinformation {{ form.allow_publish_info.errors }} diff --git a/teknologr/katalogen/views.py b/teknologr/katalogen/views.py index a023723..bd6b60f 100644 --- a/teknologr/katalogen/views.py +++ b/teknologr/katalogen/views.py @@ -123,7 +123,7 @@ def profile_edit(request, member_id): form.save() form = None except LDAPError: - form.add_error('email', 'E-postadressen kunde tyvärr inte uppdateras, vänligen kontakta en administrator') + form.add_error('email', 'E-postadressen kunde tyvärr inte uppdateras, vänligen kontakta en administratör') else: form = EditProfileForm(instance=member) diff --git a/teknologr/members/templates/applicant.html b/teknologr/members/templates/applicant.html index ed0ee73..8fdfccc 100644 --- a/teknologr/members/templates/applicant.html +++ b/teknologr/members/templates/applicant.html @@ -103,7 +103,7 @@
{{ form.allow_publish_info.errors }}
diff --git a/teknologr/registration/templates/registration.html b/teknologr/registration/templates/registration.html index c0e9ed8..0e93022 100644 --- a/teknologr/registration/templates/registration.html +++ b/teknologr/registration/templates/registration.html @@ -160,7 +160,7 @@ {{ form.allow_publish_info.errors }}