Merge pull request #38 from dbca-wa/compliance_mgt_dev

dbca/compliance_mgt_dev to shibaken/compliance_mgt_dev

Author: shibaken

wildlifecompliance/components/main/views.py

@@ -26,21 +26,24 @@
         #CompliancePermissionGroup, 
         ComplianceManagementUserPreferences,
         )
-from wildlifecompliance.helpers import is_compliance_management_readonly_user
+from wildlifecompliance.helpers import (
+        is_compliance_management_readonly_user, 
+        is_compliance_management_callemail_readonly_user,
+        prefer_compliance_management,
+        )
+
 
 class GeocodingAddressSearchTokenView(views.APIView):
     def get(self, request, format=None):
         return Response({"access_token": settings.GEOCODING_ADDRESS_SEARCH_TOKEN})
 
 
-
 class SystemPreferenceView(views.APIView):
     def get(self, request, format=None):
+        #import ipdb; ipdb.set_trace()
         res = { "system": "wildlife_licensing" }
-        if request.user.is_authenticated():
-            preference_qs, created = ComplianceManagementUserPreferences.objects.get_or_create(email_user=request.user)
-            if preference_qs and preference_qs.prefer_compliance_management and is_compliance_management_readonly_user(request):
-                res = { "system": "compliance_management" }
+        if prefer_compliance_management(request):
+            res = { "system": "compliance_management" }
         return Response(res)
 
 

wildlifecompliance/components/users/api.py

@@ -566,7 +566,7 @@ def update_system_preference(self, request, *args, **kwargs):
             try:
                 prefer_compliance_management = request.data.get('prefer_compliance_management', False)
                 user_instance = self.get_object()
-                system_preference_instance, created = ComplianceManagementUserPreferences.objects.get_or_create(email_user_id=user_instance.id)
+                system_preference_instance = ComplianceManagementUserPreferences.objects.get(email_user_id=user_instance.id)
                 serializer = UpdateComplianceManagementUserPreferencesSerializer(
                         system_preference_instance,
                         data={

wildlifecompliance/components/users/permissions.py

@@ -122,6 +122,11 @@
         'per_district': False,
         'permissions': ['compliance_management_readonly']
     },
+    {
+        'name': 'Compliance Management Call/Email Read-Only',
+        'per_district': False,
+        'permissions': ['compliance_management_callemail_readonly']
+    },
     {
         'name': 'Wildlife Compliance Admin - Compliance',
         'per_district': False,
@@ -180,6 +185,11 @@
         'app_label': 'wildlifecompliance',
         'model': 'compliancepermissiongroup',
     },
+    'compliance_management_callemail_readonly': {
+        'name': 'Compliance Management Call/Email Read-Only',
+        'app_label': 'wildlifecompliance',
+        'model': 'compliancepermissiongroup',
+    },
     'wildlife_compliance_admin_compliance': {
         'name': 'Wildlife Compliance Admin - Compliance',
         'app_label': 'wildlifecompliance',

wildlifecompliance/helpers.py

@@ -31,14 +31,13 @@ def is_new_to_wildlifelicensing(request=None):
         and request.user.dob \
         and request.user.residential_address \
         and (request.user.phone_number or request.user.mobile_number) \
-        and request.user.identification else False
+        and (request.user.identification or prefer_compliance_management(request)) else False 
 
     if not SecureBaseUtils.is_wildlifelicensing_request(request):
          has_user_details = True
 
     if is_internal(request):
         has_user_details = True
-
     return not has_user_details
 
 def belongs_to(user, group_name):
@@ -160,31 +159,57 @@ def is_officer(request):
     return request.user.is_authenticated() and (belongs_to_list(
         request.user, licence_officer_groups) or request.user.is_superuser)
 
+def is_external_url(request):
+    external = False
+    if request.path[:10] == '/external/':
+        external = True
+    return external
+
 def prefer_compliance_management(request):
     ret_value = False
 
     if request.user.is_authenticated():
-        preference_qs, created = ComplianceManagementUserPreferences.objects.get_or_create(email_user=request.user)
-        if preference_qs and preference_qs.prefer_compliance_management and is_compliance_management_readonly_user(request):
+        preference = ComplianceManagementUserPreferences.objects.get(email_user=request.user)
+        #if preference.prefer_compliance_management and (
+        #        is_compliance_management_readonly_user(request) or is_compliance_management_callemail_readonly_user(request)
+        #        ):
+        #if preference.prefer_compliance_management or is_compliance_management_callemail_readonly_user(request):
+        if preference.prefer_compliance_management:
             ret_value = True
 
     return ret_value
 
+#def is_compliance_internal_user(request):
+#    compliance_groups = [group.name for group in CompliancePermissionGroup.objects.filter(
+#            permissions__codename__in=['volunteer',
+#                                       'triage_call_email',
+#                                       'issuing_officer',
+#                                       'officer',
+#                                       'infringement_notice_coordinator',
+#                                       # 'branch_manager',
+#                                       'manager'])]
+#    return request.user.is_authenticated() and (belongs_to_list(
+#        request.user, compliance_groups) or request.user.is_superuser)
+
 def is_compliance_internal_user(request):
-    compliance_groups = [group.name for group in CompliancePermissionGroup.objects.filter(
-            permissions__codename__in=['volunteer',
-                                       'triage_call_email',
-                                       'issuing_officer',
-                                       'officer',
-                                       'infringement_notice_coordinator',
-                                       # 'branch_manager',
-                                       'manager'])]
-    return request.user.is_authenticated() and (belongs_to_list(
-        request.user, compliance_groups) or request.user.is_superuser)
+    compliance_user = False
+    if request.user.is_authenticated() and (
+            is_compliance_management_readonly_user(request) or 
+            is_compliance_management_callemail_readonly_user(request) or
+            request.user.is_superuser
+            ):
+        compliance_user = True
+    return compliance_user
 
 def is_compliance_management_readonly_user(request):
     compliance_group = CompliancePermissionGroup.objects.get(permissions__codename='compliance_management_readonly')
-    return request.user.is_authenticated() and (belongs_to(request.user, compliance_group.name) or request.user.is_superuser)
+    #return request.user.is_authenticated() and (belongs_to(request.user, compliance_group.name) or request.user.is_superuser)
+    return request.user.is_authenticated() and belongs_to(request.user, compliance_group.name)
+
+def is_compliance_management_callemail_readonly_user(request):
+    compliance_group = CompliancePermissionGroup.objects.get(permissions__codename='compliance_management_callemail_readonly')
+    #return request.user.is_authenticated() and (belongs_to(request.user, compliance_group.name) or request.user.is_superuser)
+    return request.user.is_authenticated() and belongs_to(request.user, compliance_group.name)
 
 def is_able_to_view_sanction_outcome_pdf(user):
     compliance_groups = [group.name for group in CompliancePermissionGroup.objects.filter(

wildlifecompliance/middleware.py

@@ -8,6 +8,8 @@
     SecureBaseUtils,
     SecureAuthorisationEnforcer,
 )
+from wildlifecompliance.components.users.models import ComplianceManagementUserPreferences
+from wildlifecompliance.helpers import is_compliance_management_callemail_readonly_user
 
 logger = logging.getLogger(__name__)
 # logger = logging
@@ -18,6 +20,12 @@ class FirstTimeNagScreenMiddleware(object):
     Generic FirstTimeNagScreenMiddleware.
     '''
     def process_request(self, request):
+        if request.method == 'GET' and request.user.is_authenticated(
+        ) and 'api' not in request.path and 'admin' not in request.path:
+            preference, created = ComplianceManagementUserPreferences.objects.get_or_create(email_user=request.user)
+            if is_compliance_management_callemail_readonly_user(request) and not preference.prefer_compliance_management:
+                preference.prefer_compliance_management = True
+                preference.save()
 
         if SecureBaseUtils.is_wildlifelicensing_request(request):
             # Apply WildifeLicensing first-time checks.
@@ -44,7 +52,6 @@ def process_request(self, request):
                     (not (
                         request.user.phone_number or request.user.mobile_number
                     )):
-
                 path_ft = reverse('first_time')
                 path_logout = reverse('accounts:logout')
                 request.session['new_to_wildlifecompliance'] = True

wildlifecompliance/templates/wildlifecompliance/base.html

@@ -12,7 +12,9 @@
 {% is_compliance_internal_user as is_compliance_internal_login %}
 {% prefer_compliance_management as prefer_compliance_management %}
 {% is_compliance_management_readonly_user as is_compliance_management_readonly_user %}
+{% is_compliance_management_callemail_readonly_user as is_compliance_management_callemail_readonly_user %}
 {% system_maintenance_due as system_maintenance_due %}
+{% is_external_url as is_external_url %}
 {% RAND_HASH as RAND_HASH %}
 
 <!DOCTYPE html>
@@ -67,7 +69,13 @@
                             <div id="navbar" class="navbar-collapse collapse">
                                 <ul class="nav navbar-nav">
                                     {% block left_menu_items %}
-                                        {% if is_internal_login and not prefer_compliance_management %}
+                                        {% if is_compliance_management_callemail_readonly_user and not is_external_url %}
+                                            <a class="navbar-brand" href="/internal/call_email"><div style="inline"><img src="{% static 'wildlifecompliance/img/dpaw_small.png' %}">Home</div></a>
+                                        {% elif is_external_url %}
+                                            <!-- External user -->
+                                            <a class="navbar-brand" href="/external/"><div style="inline"><img src="{% static 'wildlifecompliance/img/dpaw_small.png' %}">Home</div></a>
+                                            <li><a href="/external/sanction_outcome">Sanction Outcome</a></li>
+                                        {% elif is_internal_login and not prefer_compliance_management %}
                                             <a class="navbar-brand" href="{% url 'wc_home' %}"><div style="inline"><img src="{% static 'wildlifecompliance/img/dpaw_small.png' %}">Home</div></a>
                                             <li><a href="/internal/licences">Licences</a></li>
                                             <li><a href="/internal/returns">Returns</a></li>
@@ -80,10 +88,6 @@
                                             <li><a href="/internal/object">Objects</a></li>
                                             <li><a href="/internal/sanction_outcome">Sanction Outcomes</a></li>
                                             <li><a href="/internal/legal_case">Cases</a></li>
-                                        {% else %}
-                                            <!-- External user -->
-                                            <a class="navbar-brand" href="/external/"><div style="inline"><img src="{% static 'wildlifecompliance/img/dpaw_small.png' %}">Home</div></a>
-                                            <li><a href="/external/sanction_outcome">Sanction Outcome</a></li>
                                         {% endif %}
 
                                         {% if is_officer_login %}
@@ -114,20 +118,22 @@
                                                 <span class="caret"></span>
                                             </a>
                                             <ul class="dropdown-menu">
-                                                {% if is_internal_login and is_compliance_management_readonly_user and not prefer_compliance_management %}
-                                                    <form name="update-system-preference" method="post" action="/api/users/{{request.user.id}}/update_system_preference/">
-                                                        {% csrf_token %}
-                                                        <input type="hidden" name="prefer_compliance_management" value="True"/>
-                                                        <input type="submit" class="submit" value="Show Compliance Management" />
-                                                    </form>
-                                                <li role="separator" class="divider"></li>
-                                                {% elif is_compliance_internal_login and prefer_compliance_management %}
-                                                    <form name="update-system-preference" method="post" action="/api/users/{{request.user.id}}/update_system_preference/">
-                                                        {% csrf_token %}
-                                                        <input type="hidden" name="prefer_compliance_management" value="False"/>
-                                                        <input type="submit" class="submit" value="Show Wildlife Licencing" />
-                                                    </form>
-                                                <li role="separator" class="divider"></li>
+                                                {% if not is_compliance_management_callemail_readonly_user %}
+                                                    {% if is_compliance_internal_login and not prefer_compliance_management %}
+                                                        <form name="update-system-preference" method="post" action="/api/users/{{request.user.id}}/update_system_preference/">
+                                                            {% csrf_token %}
+                                                            <input type="hidden" name="prefer_compliance_management" value="True"/>
+                                                            <input type="submit" class="submit" value="Show Compliance Management" />
+                                                        </form>
+                                                    <li role="separator" class="divider"></li>
+                                                    {% elif is_compliance_internal_login and prefer_compliance_management %}
+                                                        <form name="update-system-preference" method="post" action="/api/users/{{request.user.id}}/update_system_preference/">
+                                                            {% csrf_token %}
+                                                            <input type="hidden" name="prefer_compliance_management" value="False"/>
+                                                            <input type="submit" class="submit" value="Show Wildlife Licencing" />
+                                                        </form>
+                                                    <li role="separator" class="divider"></li>
+                                                    {% endif %}
                                                 {% endif %}
                                                 {% if is_wildlifecompliance_admin_login %}
                                                     <li><a href="{% url 'admin:index' %}">Admin</a></li>

wildlifecompliance/templatetags/users.py

@@ -62,6 +62,15 @@ def is_compliance_management_readonly_user(context):
     request = context['request']
     return wildlifecompliance_helpers.is_compliance_management_readonly_user(request)
 
+@register.simple_tag(takes_context=True)
+def is_compliance_management_callemail_readonly_user(context):
+    request = context['request']
+    return wildlifecompliance_helpers.is_compliance_management_callemail_readonly_user(request)
+
+@register.simple_tag(takes_context=True)
+def is_external_url(context):
+    request = context['request']
+    return wildlifecompliance_helpers.is_external_url(request)
 
 @register.simple_tag()
 def system_maintenance_due():

wildlifecompliance/views.py

@@ -11,14 +11,16 @@
 from datetime import datetime, timedelta
 
 from wildlifecompliance.helpers import is_internal, prefer_compliance_management, is_model_backend, in_dbca_domain, \
-    is_compliance_internal_user, is_wildlifecompliance_admin
+    is_compliance_internal_user, is_wildlifecompliance_admin, is_compliance_management_callemail_readonly_user, belongs_to
 from wildlifecompliance.forms import *
 from wildlifecompliance.components.applications.models import Application
 from wildlifecompliance.components.call_email.models import CallEmail
 from wildlifecompliance.components.returns.models import Return
 from wildlifecompliance.components.main import utils
 from wildlifecompliance.exceptions import BindApplicationException
 from django.core.management import call_command
+from wildlifecompliance.components.users.models import CompliancePermissionGroup
+
 
 logger = logging.getLogger(__name__)
 # logger = logging
@@ -44,10 +46,11 @@ class ExternalReturnView(DetailView):
 
 
 class InternalView(UserPassesTestMixin, TemplateView):
+#class InternalView(TemplateView):
     template_name = 'wildlifecompliance/dash/index.html'
 
     def test_func(self):
-        return is_internal(self.request)
+        return is_internal(self.request) or is_compliance_management_callemail_readonly_user(self.request)
 
     def get_context_data(self, **kwargs):
         context = super(InternalView, self).get_context_data(**kwargs)
@@ -83,8 +86,11 @@ def get(self, *args, **kwargs):
             print('is_compliance_internal_user: {}'.format(is_compliance_internal_user(self.request)))
             print('is_wildlifecompliance_admin: {}'.format(is_wildlifecompliance_admin(self.request)))
             print('prefer compliance management: {}'.format(prefer_compliance_management(self.request)))
-            if is_internal(self.request) and prefer_compliance_management(self.request):
-                return redirect('internal/call_email/')
+            if (
+                    (is_internal(self.request) and prefer_compliance_management(self.request)) or
+                    is_compliance_management_callemail_readonly_user(self.request)
+                    ):
+                return redirect('internal')
             elif is_internal(self.request):
                 return redirect('internal')
             return redirect('external')