Improve org dashboard, add OrgContacts group

organizations/forms.py

@@ -106,7 +106,9 @@ class NewContactForm(ContactForm):
         )
         user.save()
         assign_perm('can_view_org_contacts', user, self.organization)
-        user.user_permissions.add('scipost.can_add_contactperson')
+        orgcontacts = Group.objects.get(name='OrgContacts')
+        user.groups.add(orgcontacts)
+
         contact = Contact(
             user=user,
             title=self.cleaned_data['title']

organizations/templates/organizations/dashboard.html

@@ -14,28 +14,66 @@
 
 <div class="row">
   <div class="col-12">
-    <h3>Your Organizations-related roles:</h3>
-    <table class="table">
-      <tr>
-	<th>Organization</th>
-	<th>Role kind</th>
-	<th>Date from</th>
-	<th>Date until</th>
-      </tr>
-      {% for role in roles %}
-      <tr>
-	<td><a href="{{ role.organization.get_absolute_url }}">{{ role.organization }}</a></td>
-	<td>{{ role.get_kind_display }}</td>
-	<td>{{ role.date_from|date:"Y-m-d" }}</td>
-	<td>{{ role.date_until|date:"Y-m-d" }}</td>
-      </tr>
-      {% empty %}
-      <tr>
-	<td>No role has been defined</td>
-      </tr>
-      {% endfor %}
-    </table>
+    <div class="tab-nav-container">
+      <div class="tab-nav-inner">
+	<ul class="nav btn-group personal-page-nav" role="tablist">
+	  <li class="nav-item btn btn-outline-secondary">
+	    <a href="#account" class="nav-link" data-toggle="tab">Account</a>
+	  </li>
+	  <li class="nav-item btn btn-outline-secondary">
+	    <a href="#own_roles" class="nav-link active" data-toggle="tab">Your roles</a>
+	  </li>
+	</ul>
+      </div>
+    </div>
   </div>
 </div>
 
+<div class="tab-content">
+
+  <div class="tab-pane" id="account" role="tabpanel">
+    <div class="row">
+      <div class="col-12">
+	<h2 class="highlight">Your account</h2>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12">
+	<p>{{ request.user.org_contact }}</p>
+      </div>
+    </div>
+  </div>
+
+  <div class="tab-pane active" id="own_roles" role="tabpanel">
+    <div class="row">
+      <div class="col-12">
+	<h2 class="highlight">Your Organizations-related roles</h2>
+	<table class="table">
+	  <tr>
+	    <th>Organization</th>
+	    <th>Role kind</th>
+	    <th>Date from</th>
+	    <th>Date until</th>
+	    <th>Actions</th>
+	  </tr>
+	  {% for role in own_roles %}
+	  <tr>
+	    <td><a href="{{ role.organization.get_absolute_url }}">{{ role.organization }}</a></td>
+	    <td>{{ role.get_kind_display }}</td>
+	    <td>{{ role.date_from|date:"Y-m-d" }}</td>
+	    <td>{{ role.date_until|date:"Y-m-d" }}</td>
+	    <td><a href="{% url 'organizations:contactrole_update' pk=role.id %}"><span class="text-warning">Update</span></a></td>
+	  </tr>
+	  {% empty %}
+	  <tr>
+	    <td>No role has been defined</td>
+	  </tr>
+	  {% endfor %}
+	</table>
+      </div>
+    </div>
+  </div>
+
+</div>
+
 {% endblock content %}

organizations/views.py

@@ -26,7 +26,7 @@ from mails.utils import DirectMailUtil
 from organizations.decorators import has_contact
 from partners.models import ProspectivePartner, Partner
 
-from scipost.mixins import PermissionsMixin
+from scipost.mixins import PermissionsMixin, PaginationMixin
 
 
 class OrganizationCreateView(PermissionsMixin, CreateView):
@@ -218,7 +218,7 @@ def dashboard(request):
         raise PermissionDenied
 
     context = {
-        'roles': request.user.org_contact.roles.all()
+        'own_roles': request.user.org_contact.roles.all()
     }
 
     return render(request, 'organizations/dashboard.html', context)

scipost/management/commands/add_groups_and_permissions.py

@@ -34,6 +34,8 @@ class Command(BaseCommand):
         ProductionSupervisors, created = Group.objects.get_or_create(name='Production Supervisor')
         ProductionOfficers, created = Group.objects.get_or_create(name='Production Officers')
 
+        OrgContacts, created = Group.objects.get_or_create(name='Organization Contacts')
+
         PartnersAdmin, created = Group.objects.get_or_create(name='Partners Administrators')
         PartnersOfficers, created = Group.objects.get_or_create(name='Partners Officers')
         PartnerAccounts, created = Group.objects.get_or_create(name='Partners Accounts')
@@ -50,6 +52,10 @@ class Command(BaseCommand):
             codename='can_add_contactperson',
             name='Can add ContactPerson',
             content_type=content_type)
+        can_view_contactrole_list, created = Permission.objects.get_or_create(
+            codename='can_view_contactrole_list',
+            name='Can view ContactRole list',
+            content_type=content_type)
 
         # Supporting Partners
         can_manage_SPB, created = Permission.objects.get_or_create(
@@ -480,6 +486,11 @@ class Command(BaseCommand):
             can_upload_proofs,
         ])
 
+        OrgContacts.permissions.set([
+            can_add_contactperson,
+            can_view_contactrole_list,
+            ])
+
         PartnersAdmin.permissions.set([
             can_manage_organizations,
             can_read_partner_page,