diff --git a/teknologr/api/filters.py b/teknologr/api/filters.py index 1eb9a84a..d6f1ccd1 100644 --- a/teknologr/api/filters.py +++ b/teknologr/api/filters.py @@ -165,6 +165,7 @@ def filter_name(self, queryset, name, value): # Split the filter value and compare all individual values against all name columns queries = [] for v in value.split(): + # XXX: The preferred name does not have to be set in the database, so hidden members with no preferred name set will not show up for normal users even if the derived preferred name would match q = Q(preferred_name__icontains=v) | Q(surname__icontains=v) # Non-staff users only get to filter on 'given_names' if the Member has allowed publishing of info if is_staff: diff --git a/teknologr/api/utils.py b/teknologr/api/utils.py index 65c0fcf2..a3305962 100644 --- a/teknologr/api/utils.py +++ b/teknologr/api/utils.py @@ -8,19 +8,10 @@ from datetime import datetime from rest_framework.response import Response - def findMembers(query, count=50): - - args = [] - - for word in query.split(): - args.append(Q(given_names__icontains=word) | Q(surname__icontains=word)) - - if not args: - return [] # No words in query (only spaces?) - - return Member.objects.filter(*args).order_by('surname', 'given_names')[:count] - + members = Member.objects.search_by_name(query.split(), True)[:count] + Member.order_by(members, 'name') + return members def findApplicants(query, count=50): args = [] diff --git a/teknologr/katalogen/static/js/katalogen.js b/teknologr/katalogen/static/js/katalogen.js index 22601ff9..1d8e3cd5 100644 --- a/teknologr/katalogen/static/js/katalogen.js +++ b/teknologr/katalogen/static/js/katalogen.js @@ -9,7 +9,7 @@ const sortTable = ({ tbody, column, reverse, from_attribute }) => { if (from_attribute) { getData = a => $(selector, a).attr("order-data") || ""; } else { - getData = a => $(selector, a).text(); + getData = a => $(selector, a).text(); } // localeCompare() can compare numbers as strings when the 'numeric' option is set. diff --git a/teknologr/katalogen/templates/functionaries.html b/teknologr/katalogen/templates/functionaries.html index 8b64d7cb..6006afd9 100644 --- a/teknologr/katalogen/templates/functionaries.html +++ b/teknologr/katalogen/templates/functionaries.html @@ -26,7 +26,7 @@

- {% for member, duration in functionary_duration_strings %} + {% for member, duration in functionary_durations %} {{ member.public_full_name }} {{ duration }} diff --git a/teknologr/katalogen/templates/group_memberships.html b/teknologr/katalogen/templates/group_memberships.html new file mode 100644 index 00000000..a012f56f --- /dev/null +++ b/teknologr/katalogen/templates/group_memberships.html @@ -0,0 +1,36 @@ +{% extends "home.html" %} + +{% block content %} +
+
+

+ Medlemmar av + {% if is_staff %} + {{ group_type.name }} + {% else %} + {{ group_type.name }} + {% endif %} +

+ {{ group_type.comment|linebreaks }} + + + + + + + + + {% for member, duration in group_membership_durations %} + + + + + {% endfor %} + +
+ Namn + + Datum
{{ member.public_full_name }}{{ duration }}
+
+
+{% endblock %} diff --git a/teknologr/katalogen/templates/group_types.html b/teknologr/katalogen/templates/group_types.html index 3ccd2c11..d70cfa8d 100644 --- a/teknologr/katalogen/templates/group_types.html +++ b/teknologr/katalogen/templates/group_types.html @@ -21,7 +21,7 @@ {% for gt in group_types %} - {{ gt.name }} + {{ gt.name }} {{ gt.count_non_empty }} {{ gt.count_members_total }} {{ gt.count_members_unique }} diff --git a/teknologr/katalogen/templates/groups.html b/teknologr/katalogen/templates/groups.html index 02dd29e5..f408ef9f 100644 --- a/teknologr/katalogen/templates/groups.html +++ b/teknologr/katalogen/templates/groups.html @@ -4,7 +4,7 @@

- Medlemmar av + Undergrupperingar av {% if is_staff %} {{ group_type.name }} {% else %} @@ -16,7 +16,10 @@

Datum - Medlemmar + + Medlemmar + + diff --git a/teknologr/katalogen/templates/profile.html b/teknologr/katalogen/templates/profile.html index db5199e1..38b9af67 100644 --- a/teknologr/katalogen/templates/profile.html +++ b/teknologr/katalogen/templates/profile.html @@ -98,7 +98,7 @@

Poster

{% endif %} - {% for ft, duration in functionary_duration_strings %} + {% for ft, duration in functionary_type_durations %} @@ -118,9 +118,9 @@

Grupper

{% endif %}
{{ ft.name }} {{ duration }}
- {% for gt, duration in group_type_duration_strings %} + {% for gt, duration in group_type_durations %} - + {% empty %} diff --git a/teknologr/katalogen/templates/year.html b/teknologr/katalogen/templates/year.html index 5c216316..0c5dce40 100644 --- a/teknologr/katalogen/templates/year.html +++ b/teknologr/katalogen/templates/year.html @@ -89,7 +89,7 @@ {% for g in groups %} - + {% for gm in g.memberships_by_member %} diff --git a/teknologr/katalogen/tests_search.py b/teknologr/katalogen/tests_search.py new file mode 100644 index 00000000..012a2ab9 --- /dev/null +++ b/teknologr/katalogen/tests_search.py @@ -0,0 +1,51 @@ + +from rest_framework import status +from api.tests import BaseAPITest + +class GetPageTests(): + def test_get_for_anonymous_users(self): + response = self.get_all() + self.check_status_code(response, status.HTTP_302_FOUND) + self.assertTrue(response.url.startswith('/login/'), response.url) + + def test_get_for_user(self): + self.login_user() + response = self.get_all() + self.check_status_code(response, status.HTTP_200_OK) + + +class SearchTests(BaseAPITest): + path1 = '/search/?q=Svakar' + path2 = '/search/?q=Sverker' + + def test_search_for_user(self): + # Test redirect if only one Member was found + self.api_path = self.path1 + self.login_user() + response = self.get_all() + self.check_status_code(response, status.HTTP_302_FOUND) + self.assertEqual(f'/members/{self.m1.id}/', response.url) + + def test_search_for_superuser(self): + self.api_path = self.path1 + self.login_superuser() + response = self.get_all() + self.check_status_code(response, status.HTTP_302_FOUND) + self.assertEqual(f'/members/{self.m1.id}/', response.url) + + def test_search_hidden_name_for_user(self): + # Test that hidden Members are not found by their non-preferred given name + self.api_path = self.path2 + self.login_user() + response = self.get_all() + self.check_status_code(response, status.HTTP_200_OK) + self.assertNotContains(response, "Svakar") + self.assertNotContains(response, "Sverker") + + def test_search_hidden_name_for_superuser(self): + self.api_path = self.path2 + self.login_superuser() + response = self.get_all() + self.check_status_code(response, status.HTTP_200_OK) + self.assertNotContains(response, "Svakar") + self.assertNotContains(response, "Sverker") diff --git a/teknologr/katalogen/tests_utils.py b/teknologr/katalogen/tests_utils.py index 20a256e6..4e302789 100644 --- a/teknologr/katalogen/tests_utils.py +++ b/teknologr/katalogen/tests_utils.py @@ -2,7 +2,7 @@ from datetime import date from .utils import * -class CreateDurationsStringTest(TestCase): +class DurationTests(TestCase): def setUp(self): self.d1 = date(1998, 1, 1) self.d2 = date(1998, 1, 30) @@ -12,68 +12,69 @@ def setUp(self): self.d6 = date(2002, 12, 31) def test_same_date(self): - self.assertEqual('1 januari 1998', create_duration_string(self.d1, self.d1)) + self.assertEqual('1 januari 1998', Duration(self.d1, self.d1).to_string()) def test_same_month(self): - self.assertEqual('1-30 januari 1998', create_duration_string(self.d1, self.d2)) + 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', create_duration_string(self.d2, self.d3)) + self.assertEqual('30 januari - 31 december 1998', Duration(self.d2, self.d3).to_string()) def test_whole_years(self): - self.assertEqual('1998', create_duration_string(self.d1, self.d3)) - self.assertEqual('1998-2000', create_duration_string(self.d1, self.d4)) + self.assertEqual('1998', Duration(self.d1, self.d3).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', create_duration_string(self.d1, self.d5)) - self.assertEqual('7 juli 2001 - 31 december 2002', create_duration_string(self.d5, self.d6)) + 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()) - def test_create_duration_strings_by_key(self): - result = create_duration_strings_by_key([ - (9, Duration(date(2000, 1, 1), date(2000, 12, 31))), - (1, Duration(date(2000, 1, 1), date(2000, 1, 31))), - (1, Duration(date(2000, 3, 1), date(2000, 3, 31))), - (1, Duration(date(2000, 5, 1), date(2000, 5, 31))), - (1, Duration(date(2000, 7, 1), date(2000, 7, 31))), - (1, Duration(date(2000, 9, 1), date(2000, 9, 30))), - (8, Duration(date(2000, 1, 1), date(2000, 12, 31))), - - (1, Duration(date(2000, 1, 5), date(2000, 1, 6))), - (1, Duration(date(2000, 3, 7), date(2000, 7, 7))), - ]) - self.assertEqual([ - (9, '2000'), - (1, '1-31 januari 2000, 1 mars - 31 juli 2000, 1-30 september 2000'), - (8, '2000'), - ], result) - -class SimplifyDurationsTest(TestCase): +class MultiDurationTests(TestCase): def test_not_overlapping(self): dur1 = Duration(date(2000, 1, 1), date(2000, 1, 30)) dur2 = Duration(date(2000, 2, 1), date(2000, 2, 28)) - self.assertEqual([dur1, dur2], simplify_durations([dur1, dur2])) - self.assertEqual([dur1, dur2], simplify_durations([dur2, dur1])) + self.assertEqual([dur1, dur2], MultiDuration([dur1, dur2])) + self.assertEqual([dur1, dur2], MultiDuration([dur2, dur1])) def test_sequetial(self): dur1 = Duration(date(2000, 1, 1), date(2000, 1, 31)) dur2 = Duration(date(2000, 2, 1), date(2000, 2, 28)) dur3 = Duration(date(2000, 1, 1), date(2000, 2, 28)) - self.assertEqual([dur3], simplify_durations([dur1, dur2])) - self.assertEqual([dur3], simplify_durations([dur2, dur1])) + self.assertEqual([dur3], MultiDuration([dur1, dur2])) + self.assertEqual([dur3], MultiDuration([dur2, dur1])) def test_overlapping(self): dur1 = Duration(date(2000, 1, 1), date(2000, 2, 28)) dur2 = Duration(date(2000, 2, 1), date(2000, 3, 31)) dur3 = Duration(date(2000, 1, 1), date(2000, 3, 31)) - self.assertEqual([dur3], simplify_durations([dur1, dur2])) - self.assertEqual([dur3], simplify_durations([dur2, dur1])) + self.assertEqual([dur3], MultiDuration([dur1, dur2])) + self.assertEqual([dur3], MultiDuration([dur2, dur1])) def test_containing(self): dur1 = Duration(date(2000, 1, 1), date(2000, 3, 31)) dur2 = Duration(date(2000, 2, 1), date(2000, 2, 28)) dur3 = Duration(date(2000, 1, 1), date(2000, 3, 31)) - self.assertEqual([dur3], simplify_durations([dur1, dur2])) - self.assertEqual([dur3], simplify_durations([dur2, dur1])) + self.assertEqual([dur3], MultiDuration([dur1, dur2])) + self.assertEqual([dur3], MultiDuration([dur2, dur1])) def test_empty(self): - self.assertEqual([], simplify_durations([])) + self.assertEqual([], MultiDuration([])) + + def test_combine_per_key(self): + result = MultiDuration.combine_per_key([ + (9, Duration(date(2000, 1, 1), date(2000, 12, 31))), + (1, Duration(date(2000, 1, 1), date(2000, 1, 31))), + (1, Duration(date(2000, 3, 1), date(2000, 3, 31))), + (1, Duration(date(2000, 5, 1), date(2000, 5, 31))), + (1, Duration(date(2000, 7, 1), date(2000, 7, 31))), + (1, Duration(date(2000, 9, 1), date(2000, 9, 30))), + (8, Duration(date(2000, 1, 1), date(2000, 12, 31))), + + (1, Duration(date(2000, 1, 5), date(2000, 1, 6))), + (1, Duration(date(2000, 3, 7), date(2000, 7, 7))), + ]) + 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'), + (8, '2000'), + ], result) diff --git a/teknologr/katalogen/tests_views.py b/teknologr/katalogen/tests_views.py index 906e0a60..3d8935af 100644 --- a/teknologr/katalogen/tests_views.py +++ b/teknologr/katalogen/tests_views.py @@ -20,10 +20,10 @@ def setUp(self): self.api_path = '' -class MembersSearchViewTest(BaseAPITest, GetPageTests): +class MembersEmptySearchViewTest(BaseAPITest, GetPageTests): def setUp(self): super().setUp() - self.api_path = '/search/?q=test' + self.api_path = '/search/?q=' class MembersStartsWithViewTest(BaseAPITest, GetPageTests): def setUp(self): @@ -74,6 +74,11 @@ def setUp(self): super().setUp() self.api_path = f'/groups/{self.gt.id}/' +class GroupMembershipsViewTest(BaseAPITest, GetPageTests): + def setUp(self): + super().setUp() + self.api_path = f'/groupmemberships/{self.gt.id}/' + class YearsViewTest(BaseAPITest, GetPageTests): def setUp(self): diff --git a/teknologr/katalogen/urls.py b/teknologr/katalogen/urls.py index 2fcd46fc..9ab9ef45 100644 --- a/teknologr/katalogen/urls.py +++ b/teknologr/katalogen/urls.py @@ -14,7 +14,8 @@ url(r'^functionaries/$', views.functionary_types, name='functionary_types'), url(r'^functionaries/(\d+)/$', views.functionary_type, name='functionary_type'), url(r'^groups/$', views.group_types, name='group_types'), - url(r'^groups/(\d+)/$', views.group_type, name='group_type'), + url(r'^groups/(\d+)/$', views.groups, name='groups'), + url(r'^groupmemberships/(\d+)/$', views.group_memberships, name='group_memberships'), url(r'^years/$', views.years, name='years'), url(r'^years/(\d+)/$', views.year, name='year'), ] diff --git a/teknologr/katalogen/utils.py b/teknologr/katalogen/utils.py index 71dcd598..1cbc4a93 100644 --- a/teknologr/katalogen/utils.py +++ b/teknologr/katalogen/utils.py @@ -11,10 +11,10 @@ def __init__(self, begin_date, end_date): self.end_date = end_date def __str__(self): - return create_duration_string(self.begin_date, self.end_date) + return self.to_string() def __repr__(self): - return str(self) + return self.to_string() def __eq__(self, other): return (self.end_date, self.begin_date) == (other.end_date, other.begin_date) @@ -23,91 +23,96 @@ def __lt__(self, other): return (self.end_date, self.begin_date) < (other.end_date, other.begin_date) def to_string(self): - return str(self) + ''' + Turn the date interval into a string, where the dates are simplified as much as possible. These rules are as follows: + - Same day: A.B.YYYY - A.B.YYYY -> 'A BB YYYY' + - Same month: A.B.YYYY - C.B.YYYY -> 'A-C BB YYYY' + - Same year: A.B.YYYY - C.D.YYYY -> 'A BB - C DD YYYY' + - Whole year: 1.1.YYYY - 31.12.YYYY -> 'YYYY' + - Many years: 1.1.YYYY - 31.12.ZZZZ -> 'YYYY-ZZZZ' + ''' + begin = self.begin_date + end = self.end_date + + if begin.month == 1 and begin.day == 1 and end.month == 12 and end.day == 31: + return f'{begin.year}' if begin.year == end.year else f'{begin.year}-{end.year}' + + b = date_format(begin) + e = date_format(end) + if begin.year != end.year: + return f'{b} - {e}' + if begin.month != end.month: + i = b.rfind(' ') + return f'{b[:i]} - {e}' + if begin.day != end.day: + return f'{begin.day}-{e}' + return b def to_sort_string(self): return f'{self.end_date.isoformat()}{self.begin_date.isoformat()}' -class DurationsHelper: - def __init__(self, items): - self.__dict = defaultdict(list) +@total_ordering +class MultiDuration: + def __init__(self, durations): + self.durations = MultiDuration.simplify(durations) + + def __str__(self): + return self.to_string() + + def __repr__(self): + return self.to_string() + + def __eq__(self, other): + other_durations = other.durations if isinstance(other, MultiDuration) else other + if len(self.durations) != len(other_durations): + return False + for i in range(len(self.durations)): + if self.durations[i] != other_durations[i]: + return False + return True + + def __lt__(self, other): + n = min(len(self.durations), len(other.durations)) + for i in range(n): + if self.durations[i] == other.durations[i]: + continue + return self.durations < other.durations + return len(self.durations) < len(other.durations) + + def to_string(self): + return ', '.join([str(d) for d in self.durations]) + + def to_sort_string(self): + return ','.join([d.to_sort_string() for d in self.durations]) + + @classmethod + def simplify(cls, durations): + ''' + Overlapping durations will be simplified into a single duration. + ''' + if not len(durations): + return [] + + durations.sort(key=attrgetter('begin_date')) + + simplified = [durations[0]] + for next in durations[1:]: + last = simplified[-1] + if next.begin_date > last.end_date + timedelta(days=1): + simplified.append(next) + elif next.end_date > last.end_date: + last.end_date = next.end_date + + return simplified + + @classmethod + def combine_per_key(cls, items): + ''' + The parameter is a list of (key, Duration) pairs. All durations with the same key will be combined into one MultiDuration. + + Returns a list of (key, MultiDuration) pairs. + ''' + d = defaultdict(list) for key, duration in items: - self.add(key, duration) - - def add(self, key, new_duration): - self.__dict[key].append(new_duration) - - def simplify(self): - for key, durations in self.__dict.items(): - self.__dict[key] = simplify_durations(durations) - return self - - def items(self): - return self.__dict.items() - - -def create_duration_string(begin, end): - ''' - Turn a date interval into a string, where the dates are simplified as much as possible. These rules are followed: - - A.B.YYYY - A.B.YYYY -> 'A BB YYYY' - - A.B.YYYY - C.B.YYYY -> 'A-C BB YYYY' - - A.B.YYYY - C.D.YYYY -> 'A BB - C DD YYYY' - - 1.1.YYYY - 31.12.YYYY -> 'YYYY' - - 1.1.YYYY - 31.12.ZZZZ -> 'YYYY-ZZZZ' - ''' - if begin.month == 1 and begin.day == 1 and end.month == 12 and end.day == 31: - return f'{begin.year}' if begin.year == end.year else f'{begin.year}-{end.year}' - - b = date_format(begin) - e = date_format(end) - if begin.year != end.year: - return f'{b} - {e}' - if begin.month != end.month: - i = b.rfind(' ') - return f'{b[:i]} - {e}' - if begin.day != end.day: - return f'{begin.day}-{e}' - return b - -def simplify_durations(durations): - ''' - The parameter is a list of durations. Overlapping durations will be simplified into a single duration. - - Returns a list of simplified durations. - ''' - if not len(durations): - return [] - - durations.sort(key=attrgetter('begin_date')) - - simplified = [durations[0]] - for next in durations[1:]: - last = simplified[-1] - if next.begin_date > last.end_date + timedelta(days=1): - simplified.append(next) - elif next.end_date > last.end_date: - last.end_date = next.end_date - - return simplified - -def simplify_durations_by_key(items): - ''' - The parameter is a list of (key, duration) pairs. Durations with the same key that follows eachother will be simplified into a single duration. - - Returns a list of (key, duration) pairs. - ''' - items = DurationsHelper(items).simplify().items() - res = [] - for key, durations in items: - for duration in durations: - res.append((key, duration)) - return res - -def create_duration_strings_by_key(items): - ''' - The parameter is a list of (key, duration) pairs. All durations with the same key will be combined into one string. - - Returns a list of (key, string) pairs. - ''' - items = DurationsHelper(items).simplify().items() - return [(key, ', '.join([str(d) for d in durations])) for key, durations in items] + d[key].append(duration) + return list((key, MultiDuration(durations)) for key, durations in d.items()) diff --git a/teknologr/katalogen/views.py b/teknologr/katalogen/views.py index 90554f3b..703cd1ca 100644 --- a/teknologr/katalogen/views.py +++ b/teknologr/katalogen/views.py @@ -26,15 +26,11 @@ def home(request): @login_required def search(request): - query_list = request.GET.get('q').split() - result = [] + result = Member.objects.search_by_name(request.GET.get('q').split()) + if len(result) == 1: + return redirect('katalogen:profile', result[0].id) - if query_list: - result = Member.objects.filter( - reduce(and_, (Q(given_names__icontains=q) | Q(surname__icontains=q) for q in query_list)) - ) - result = list(result) - Member.order_by(result, 'name') + Member.order_by(result, 'name') return render(request, 'browse.html', { **_get_base_context(request), @@ -62,12 +58,12 @@ def profile(request, member_id): Functionary.order_by(functionaries, by, reverse) GroupMembership.order_by(group_memberships, by, reverse) - functionary_duration_strings = [(f.functionarytype, f.duration) for f in functionaries] - group_type_duration_strings = [(gm.group.grouptype, gm.group.duration) for gm in group_memberships] + ft_durations = [(f.functionarytype, f.duration) for f in functionaries] + gt_durations = [(gm.group.grouptype, gm.group.duration) for gm in group_memberships] if combine: - functionary_duration_strings = create_duration_strings_by_key(functionary_duration_strings) - group_type_duration_strings = create_duration_strings_by_key(group_type_duration_strings) + ft_durations = MultiDuration.combine_per_key(ft_durations) + gt_durations = MultiDuration.combine_per_key(gt_durations) return render(request, 'profile.html', { **_get_base_context(request), @@ -75,8 +71,8 @@ def profile(request, member_id): 'show_all': person.username == request.user.username or person.showContactInformation(), 'person': person, 'combined': combine, - 'functionary_duration_strings': functionary_duration_strings, - 'group_type_duration_strings': group_type_duration_strings, + 'functionary_type_durations': ft_durations, + 'group_type_durations': gt_durations, 'decoration_ownerships': person.decoration_ownerships_by_date, }) @@ -147,19 +143,19 @@ def functionary_type(request, functionary_type_id): functionary_type = FunctionaryType.objects.get_prefetched_or_404(functionary_type_id) functionaries = list(functionary_type.functionaries.all()) - functionary_duration_strings = [(f.member, f.duration) for f in functionaries] + durations = [(f.member, f.duration) for f in functionaries] combine = request.GET.get('combine', '0') != '0' if combine: - functionary_duration_strings = simplify_durations_by_key(functionary_duration_strings) + durations = MultiDuration.combine_per_key(durations) # Sort the pairs by date and member name by default - functionary_duration_strings.sort(key=lambda pair: (pair[1], pair[0].full_name_for_sorting), reverse=True) + durations.sort(key=lambda pair: (pair[1], pair[0].public_full_name_for_sorting), reverse=True) return render(request, 'functionaries.html', { **_get_base_context(request), 'functionary_type': functionary_type, - 'functionary_duration_strings': functionary_duration_strings, + 'functionary_durations': durations, 'combined': combine, }) @@ -175,7 +171,7 @@ def group_types(request): @login_required -def group_type(request, group_type_id): +def groups(request, group_type_id): group_type = GroupType.objects.get_prefetched_or_404(group_type_id) # Do not want to display empty groups here, but filtering that in the template instead of the query @@ -187,6 +183,25 @@ def group_type(request, group_type_id): }) +@login_required +def group_memberships(request, group_type_id): + group_type = GroupType.objects.get_prefetched_or_404(group_type_id) + + durations = [(gm.member, g.duration) for g in group_type.groups.all() for gm in g.memberships.all()] + + # Combine all durations for each Member + durations = MultiDuration.combine_per_key(durations) + + # Sort the pairs by member name by default + durations.sort(key=lambda pair: (pair[0].public_full_name_for_sorting)) + + return render(request, 'group_memberships.html', { + **_get_base_context(request), + 'group_type': group_type, + 'group_membership_durations': durations, + }) + + @login_required def years(request): ''' diff --git a/teknologr/members/lookups.py b/teknologr/members/lookups.py index 27204486..4493fde0 100644 --- a/teknologr/members/lookups.py +++ b/teknologr/members/lookups.py @@ -9,8 +9,9 @@ class MemberLookup(LookupChannel): model = Member def get_query(self, q, request): - members = findMembers(q) - return members + if q == '__ALL__': + return Member.objects.order_by('-modified')[:50] + return findMembers(q) def get_result(self, obj): """ result is the simple text that is the completion of what the person typed """ diff --git a/teknologr/members/models.py b/teknologr/members/models.py index b42ceda1..3ef0f768 100644 --- a/teknologr/members/models.py +++ b/teknologr/members/models.py @@ -5,8 +5,9 @@ from django_countries.fields import CountryField from django.shortcuts import get_object_or_404 from django.utils.html import format_html -from locale import strxfrm, strcoll -from operator import attrgetter +from locale import strxfrm +from operator import attrgetter, and_ +from functools import reduce from datetime import date from katalogen.utils import * from members.utils import * @@ -45,6 +46,22 @@ def all_with_related(self): def get_prefetched_or_404(self, member_id): return get_object_or_404(self.all_with_related(), id=member_id) + def search_by_name(self, queries, include_hidden=False): + if not queries: + return [] + + # XXX: Would be nice to be able to filter on preferred_name on hidden users, but that is not always set in the database + queries = [q.lower() for q in queries] + filters = [(Q(given_names__icontains=q) | Q(surname__icontains=q)) for q in queries] + members = self.filter(reduce(and_, filters)) + members = list(members) + + # Need to remove hidden Members that were matched on a non-preferred given name + if not include_hidden: + members = [m for m in members if m.allow_publish_info or any([q in m.surname.lower() or q in m.get_preferred_name().lower() for q in queries])] + + return members + class Member(SuperClass): objects = MemberManager() @@ -121,8 +138,12 @@ def __str__(self): = ' ' ''' + def get_given_names(self): + # Make sure to return a list with at least one element + return self.given_names.split() if self.given_names else [''] + def get_preferred_name(self): - return self.preferred_name or self.given_names.split()[0] + return self.preferred_name or self.get_given_names()[0] def get_given_names_with_initials(self): ''' @@ -135,7 +156,7 @@ def get_given_names_with_initials(self): - Foo-Bar _Baz_ -> F-B Baz ''' preferred_name = self.get_preferred_name() - names = [n if preferred_name in n else '-'.join([nn[0] for nn in n.split('-')]) for n in self.given_names.split()] + names = [n if preferred_name in n else '-'.join([nn[0] for nn in n.split('-')]) for n in self.get_given_names()] return " ".join(names) def get_surname_without_prefixes(self): @@ -148,9 +169,18 @@ 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. + + 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" + "".replace("", "X") => "X" + In addition, pre Python 3.9 the extended method A.replace(B, C, N) was bugged if B = "" was used: + "abc".replace("", "X", 1) => "Xabc" (OK) + "".replace("", "X", 1) => "" (INCONSITENT) + So replacing empty strings can be tricky, especially if the autobuilds run a different Python version than you. ''' preferred_name = self.get_preferred_name() - return format_html(f'{self.given_names.replace(preferred_name, f"{preferred_name}", 1)} {self.surname}') + given_names_HTML = self.given_names.replace(preferred_name, f"{preferred_name}", 1) if preferred_name else self.given_names + return format_html(f'{given_names_HTML} {self.surname}') @property def common_name(self): @@ -454,7 +484,7 @@ def duration(self): @property def memberships_by_member(self): - l = list(self.memberships.select_related('member')) + l = list(self.memberships.all()) GroupMembership.order_by(l, 'member') return l diff --git a/teknologr/members/static/js/base.js b/teknologr/members/static/js/base.js index fe95cd96..9a58dd9a 100644 --- a/teknologr/members/static/js/base.js +++ b/teknologr/members/static/js/base.js @@ -165,12 +165,12 @@ $(document).ready(function () { timer = setTimeout(function(){ $.ajax({ // XXX: Why ')'??? - url: "/ajax_select/ajax_lookup/member)?term=" + filter, + url: `/ajax_select/ajax_lookup/member)?term=${filter || "__ALL__"}`, method: "GET", }).done(function(data) { $("#side-objects").empty(); $.each(data, function(i, item) { - var a = ''+ item.value +'' + var a = ''+ item.match +'' $("#side-objects").append(a); }); }); @@ -178,9 +178,17 @@ $(document).ready(function () { // If not members, simply hide/unhide the elements } else { + const queries = filter.split(" ").filter(s => s); $("#side-objects a").each(function () { const element = $(this); - const show = element.text().toLowerCase().indexOf(filter) > -1 || element.attr("search").toLowerCase().indexOf(filter) > -1; + let show = true; + // All parts of the query need to match the content + for (const q of queries) { + if (!element.text().toLowerCase().includes(q)) { + show = false; + break; + } + } element.css("display", show ? "" : "none"); }); } diff --git a/teknologr/members/templates/group.html b/teknologr/members/templates/group.html index 7fcd0eea..b286eaec 100644 --- a/teknologr/members/templates/group.html +++ b/teknologr/members/templates/group.html @@ -3,7 +3,7 @@ {% block main %}
-

{{ grouptype.name }}

+

{{ grouptype.name }}

{% include "modals/grouptype_edit.html" with modalname="edit-gt-modal" title="Editera grupp" form=edit_gt_form grouptype=grouptype only %} diff --git a/teknologr/members/tests_models.py b/teknologr/members/tests_models.py index a1a843f9..bb6c9494 100644 --- a/teknologr/members/tests_models.py +++ b/teknologr/members/tests_models.py @@ -85,6 +85,11 @@ def setUp(self): member=self.member3, ) + def test_get_given_names(self): + self.assertEqual(self.member1.get_given_names(), ['Foo', 'Bar', 'Baz']) + self.assertEqual(self.member2.get_given_names(), ['Foo', 'Bar', 'Baz']) + self.assertEqual(self.member3.get_given_names(), ['Foo-Bar', 'Biz-Baz']) + def test_get_preferred_name(self): self.assertEqual(self.member1.get_preferred_name(), 'Foo') self.assertEqual(self.member2.get_preferred_name(), 'Foo') @@ -100,6 +105,11 @@ def test_get_surname_without_prefixes(self): self.assertEqual(self.member2.get_surname_without_prefixes(), 'Tester') self.assertEqual(self.member3.get_surname_without_prefixes(), 'Tester') + def test_get_full_name_HTML(self): + self.assertEqual(self.member1.get_full_name_HTML(), 'Foo Bar Baz Tester') + self.assertEqual(self.member2.get_full_name_HTML(), 'Foo Bar Baz Tester') + self.assertEqual(self.member3.get_full_name_HTML(), 'Foo-Bar Biz-Baz von der Tester') + def test_full_name(self): self.assertEqual(self.member1.full_name, 'Foo Bar Baz Tester') self.assertEqual(self.member2.full_name, 'Foo Bar Baz Tester') @@ -123,6 +133,17 @@ def test_public_full_name_for_sorting(self): def test_name(self): self.assertFalse(hasattr(self.member1, 'name')) + def test_empty_given_names(self): + # This should not be possible, at least not anymore, but still need to make sure nothing breakes if it happens + self.member1.given_names = "" + self.member1.preferred_name = "" + self.assertEqual(self.member1.get_given_names(), [""]) + self.assertEqual(self.member1.get_preferred_name(), "") + self.assertEqual(self.member1.get_given_names_with_initials(), "") + self.assertEqual(self.member1.get_full_name_HTML(), " Tester") + self.assertEqual(self.member1.full_name, " Tester") + self.assertEqual(self.member1.public_full_name, " Tester") + def test_address(self): self.assertEquals('Otsvängen 22, 02150 Esbo, Finland', self.member1.full_address) diff --git a/teknologr/members/views.py b/teknologr/members/views.py index ce969801..2b146ed8 100644 --- a/teknologr/members/views.py +++ b/teknologr/members/views.py @@ -18,6 +18,7 @@ def set_side_context(context, category, active_obj=None): if category == 'members': side['sname'] = 'medlem' side['form'] = MemberForm(initial={'given_names': '', 'surname': ''}, auto_id="mmodal_%s") + # XXX: Duplicated in MemberLookup.get_query for when the search box is emptied side['objects'] = Member.objects.order_by('-modified')[:50] # Add the active member to the list if it is not there already if active_obj and active_obj not in side['objects']: diff --git a/teknologr/registration/templates/registration.html b/teknologr/registration/templates/registration.html index 6362c205..55b9a203 100644 --- a/teknologr/registration/templates/registration.html +++ b/teknologr/registration/templates/registration.html @@ -57,7 +57,7 @@
- {% bootstrap_field form.username form_group_class="form-group col-md-8" placeholder="Universitetets användarnamn" bound_css_class="" addon_after='' %} + {% bootstrap_field form.username form_group_class="form-group col-md-8 col-lg-6" placeholder="Universitetets användarnamn" bound_css_class="" addon_after='' %}
{{ gt.name }}{{ gt.name }} {{ duration }}
{{ g.grouptype.name }}{% if g.duration.to_string != year %} ({{ g.duration.to_string }}){% endif %}{{ g.grouptype.name }}{% if g.duration.to_string != year %} ({{ g.duration.to_string }}){% endif %} {{ g.num_members }} {% if g.num_members == 1 %}medlem{% else %}medlemmar{% endif %}