From 2e8bbe445a2bc5d8d8a3e46697c1e8e551d5a604 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Mon, 28 Aug 2023 18:43:49 +0300 Subject: [PATCH 1/2] Added buttons/links to Katalogen/API to the rest of teh admin pages. --- teknologr/members/static/css/style.css | 32 +++++++++++++++++- teknologr/members/static/js/base.js | 7 ++++ teknologr/members/templates/decoration.html | 16 ++++++--- teknologr/members/templates/functionary.html | 16 ++++++--- teknologr/members/templates/group.html | 35 ++++++++++++++++---- 5 files changed, 88 insertions(+), 18 deletions(-) diff --git a/teknologr/members/static/css/style.css b/teknologr/members/static/css/style.css index 554b4a11..e465ebcb 100644 --- a/teknologr/members/static/css/style.css +++ b/teknologr/members/static/css/style.css @@ -104,6 +104,36 @@ tr.active { background-color: rgb(242, 242, 242); } -.katalogen-link { +.clickable { + cursor: pointer; +} + +/* Dropdown content, hidden by default */ +.dropdown-content { + display: none; + position: absolute; + left: 0px; + top: 36px; + min-width: 160px; + z-index: 1; + border: #dddddd 1px solid; +} + +/* Links inside the dropdown */ +.dropdown-content a { + background-color: #ffffff; color: black; + padding: 12px 16px; + text-decoration: none; + display: block; +} + +/* Change color of dropdown links on hover */ +.dropdown-content a:hover { + background-color: #dddddd +} + +/* Show the dropdown menu on hover */ +.dropdown:hover .dropdown-content { + display: block; } diff --git a/teknologr/members/static/js/base.js b/teknologr/members/static/js/base.js index 1fab603f..81892e9b 100644 --- a/teknologr/members/static/js/base.js +++ b/teknologr/members/static/js/base.js @@ -223,6 +223,13 @@ $(document).ready(function () { placement : 'top' }); + /** + * Make elements function as clickable links. + */ + $(".clickable").click(function() { + window.location = $(this).data("href"); + }); + /** * Populate modal for editing a decoration ownership. * Can not be placed in functionary.js because it is needed on the member page too. diff --git a/teknologr/members/templates/decoration.html b/teknologr/members/templates/decoration.html index 6fdc9a68..fa8fe21c 100644 --- a/teknologr/members/templates/decoration.html +++ b/teknologr/members/templates/decoration.html @@ -2,11 +2,17 @@ {% load static %} {% block main %} -
-

{{ decoration.name }}

- - - {% include "modals/decoration_edit.html" with modalname="edit-d-modal" title="Editera betygelse" form=edit_d_form decoration=decoration only %} +
+
+
+ + + Katalogen + API + {% include "modals/decoration_edit.html" with modalname="edit-d-modal" title="Editera betygelse" form=edit_d_form decoration=decoration only %} +
+
+

{{ decoration.name }}

diff --git a/teknologr/members/templates/functionary.html b/teknologr/members/templates/functionary.html index 518a764c..be6b4558 100644 --- a/teknologr/members/templates/functionary.html +++ b/teknologr/members/templates/functionary.html @@ -2,11 +2,17 @@ {% load static %} {% block main %} -
-

{{ functionary_type.name }}

- - - {% include "modals/functionarytype_edit.html" with modalname="edit-ft-modal" title="Editera post" form=edit_ft_form functionary_type=functionary_type only %} +
+
+
+ + + Katalogen + API + {% include "modals/functionarytype_edit.html" with modalname="edit-ft-modal" title="Editera post" form=edit_ft_form functionary_type=functionary_type only %} +
+
+

{{ functionary_type.name }}

diff --git a/teknologr/members/templates/group.html b/teknologr/members/templates/group.html index b286eaec..9ed83fd2 100644 --- a/teknologr/members/templates/group.html +++ b/teknologr/members/templates/group.html @@ -2,11 +2,33 @@ {% load static %} {% block main %} -
-

{{ grouptype.name }}

- - - {% include "modals/grouptype_edit.html" with modalname="edit-gt-modal" title="Editera grupp" form=edit_gt_form grouptype=grouptype only %} +
+
+
+ + +
+ Katalogen +
+ Grupp + Gruppmedlemmar +
+
+
+ API +
+ Grupp + Gruppmedlemmar + Undergrupper + {% if group %} + Undergrupp + {% endif %} +
+
+ {% include "modals/grouptype_edit.html" with modalname="edit-gt-modal" title="Editera grupp" form=edit_gt_form grouptype=grouptype only %} +
+
+

{{ grouptype.name }}

@@ -34,9 +56,8 @@

Undergrupper

{% for g in groups %} - + - {{ g.begin_date }} From 9e9e10fa2ebb2fee0949b73a8ff63d629e9c7339 Mon Sep 17 00:00:00 2001 From: Filip Stenbacka Date: Mon, 28 Aug 2023 18:44:39 +0300 Subject: [PATCH 2/2] Added membertypes to Member API for admins. --- teknologr/api/serializers.py | 7 +++++++ teknologr/api/tests.py | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/teknologr/api/serializers.py b/teknologr/api/serializers.py index eb95ac9d..c5fc0961 100644 --- a/teknologr/api/serializers.py +++ b/teknologr/api/serializers.py @@ -76,6 +76,13 @@ def to_representation(self, instance): 'end_date': gm.group.end_date, } for gm in instance.group_memberships.all()] + if self.is_staff: + data['membertypes'] = [{ + 'type': mt.type, + 'begin_date': mt.begin_date, + 'end_date': mt.end_date, + } for mt in instance.member_types.all()] + # Modify certain fields if necessary if hide: data['given_names'] = instance.get_given_names_with_initials() diff --git a/teknologr/api/tests.py b/teknologr/api/tests.py index d30ea368..a44a551d 100644 --- a/teknologr/api/tests.py +++ b/teknologr/api/tests.py @@ -97,7 +97,9 @@ def setUp(self): GroupMembership.objects.create(group=g2, member=self.m2) GroupMembership.objects.create(group=g2, member=self.m3) - self.mt = MemberType.objects.create(member=self.m1, type='OM', begin_date=d1) + self.mt = MemberType.objects.create(member=self.m1, type='PH', begin_date=d1) + MemberType.objects.create(member=self.m2, type='PH', begin_date=d1) + MemberType.objects.create(member=self.m3, type='PH', begin_date=d1) self.a = Applicant.objects.create( given_names='Märta', @@ -244,6 +246,7 @@ def test_post_for_superuser(self): # MEMBERS +# Always shown MEMBER_PUBLIC = { 'id': int, 'given_names': str, @@ -253,6 +256,7 @@ def test_post_for_superuser(self): 'n_groups': int, 'n_decorations': int, } +# Shown if member is not hidden MEMBER_PERSONAL = { **MEMBER_PUBLIC, 'street_address': str, @@ -266,6 +270,7 @@ def test_post_for_superuser(self): 'graduated': bool, 'graduated_year': int, } +# Shown only to admins MEMBER_ADMIN = { **MEMBER_PERSONAL, 'created': str, @@ -316,6 +321,11 @@ def test_post_for_superuser(self): MEMBER_ADMIN_DETAIL = { **MEMBER_ADMIN, **MEMBER_DETAIL, + 'membertypes': [{ + 'type': str, + 'begin_date': str, + 'end_date': (str, None), + }], } class MembersAPITest(BaseAPITest, GetAllMethodTests, PostMethodTests): @@ -627,7 +637,7 @@ def setUp(self): 'created': str, 'modified': str, } - self.n_all = 1 + self.n_all = 3 self.post_data = { 'member': self.m2.id, 'type': 'OM',