Config options added to make EULA process more thorough

coldfront/config/core.py

@@ -18,6 +18,11 @@
 #------------------------------------------------------------------------------
 PROJECT_ENABLE_PROJECT_REVIEW = ENV.bool('PROJECT_ENABLE_PROJECT_REVIEW', default=True)
 
+#------------------------------------------------------------------------------
+# Enable EULA force agreement
+#------------------------------------------------------------------------------
+EULA_AGREEMENT = ENV.bool('EULA_AGREEMENT', default=True)
+
 #------------------------------------------------------------------------------
 # Allocation related
 #------------------------------------------------------------------------------
@@ -29,7 +34,6 @@
 # This is in days
 ALLOCATION_DEFAULT_ALLOCATION_LENGTH = ENV.int('ALLOCATION_DEFAULT_ALLOCATION_LENGTH', default=365)
 
-
 #------------------------------------------------------------------------------
 # Allow user to select account name for allocation
 #------------------------------------------------------------------------------
@@ -38,7 +42,8 @@
 
 SETTINGS_EXPORT += [
     'ALLOCATION_ACCOUNT_ENABLED',
-    'CENTER_HELP_URL'
+    'CENTER_HELP_URL',
+    'EULA_AGREEMENT'
 ]
 
 ADMIN_COMMENTS_SHOW_EMPTY = ENV.bool('ADMIN_COMMENTS_SHOW_EMPTY', default=True)

coldfront/config/email.py

@@ -22,3 +22,4 @@
 EMAIL_ALLOCATION_EXPIRING_NOTIFICATION_DAYS = ENV.list('EMAIL_ALLOCATION_EXPIRING_NOTIFICATION_DAYS', cast=int, default=[7, 14, 30])
 EMAIL_SIGNATURE = ENV.str('EMAIL_SIGNATURE', default='', multiline=True)
 EMAIL_ADMINS_ON_ALLOCATION_EXPIRE = ENV.bool('EMAIL_ADMINS_ON_ALLOCATION_EXPIRE', default=False)
+EMAIL_EULA_REMINDERS = ENV.bool('EMAIL_EULA_REMINDERS', default=True)

coldfront/core/allocation/forms.py

@@ -259,3 +259,6 @@ class Meta:
     def __init__(self, *args, **kwargs):
         super(AllocationAttributeCreateForm, self).__init__(*args, **kwargs) 
         self.fields['allocation_attribute_type'].queryset = self.fields['allocation_attribute_type'].queryset.order_by(Lower('name'))
+
+class AllocationEULAAgreeForm(forms.Form):
+    eula_choice = forms.ChoiceField(choices=[("agree", "I agree"), ("disagree", "I disagree")], label="", widget=forms.RadioSelect())

coldfront/core/allocation/management/commands/add_allocation_defaults.py

@@ -25,7 +25,7 @@ def handle(self, *args, **options):
         for choice in ('Pending', 'Approved', 'Denied',):
             AllocationChangeStatusChoice.objects.get_or_create(name=choice)
 
-        for choice in ('Active', 'Error', 'Removed', ):
+        for choice in ('Active', 'Error', 'Removed', 'Pending', 'Declined'):
             AllocationUserStatusChoice.objects.get_or_create(name=choice)
 
         for name, attribute_type, has_usage, is_private in (

coldfront/core/allocation/models.py

@@ -29,7 +29,7 @@
     ['-is_allocatable', 'name'])
 
 class AllocationPermission(Enum):
-    """ A project permission stores the user and manager fields of a project. """
+    """ An allocation permission stores the user and manager fields of a project. """
 
     USER = 'USER'
     MANAGER = 'MANAGER'
@@ -321,7 +321,7 @@ def user_permissions(self, user):
         if ProjectPermission.PI in project_perms or ProjectPermission.MANAGER in project_perms:
             return [AllocationPermission.USER, AllocationPermission.MANAGER]
 
-        if self.allocationuser_set.filter(user=user, status__name__in=['Active', 'New', ]).exists():
+        if self.allocationuser_set.filter(user=user, status__name__in=['Active', 'New', 'Pending']).exists():
             return [AllocationPermission.USER]
 
         return []

coldfront/core/allocation/tasks.py

@@ -3,7 +3,8 @@
 import logging
 
 from coldfront.core.allocation.models import (Allocation,
-                                              AllocationStatusChoice)
+                                              AllocationStatusChoice, AllocationUserStatusChoice)
+from coldfront.core.allocation.utils import get_user_resources
 from coldfront.core.user.models import User
 from coldfront.core.utils.common import import_from_settings
 from coldfront.core.utils.mail import send_email_template
@@ -38,7 +39,32 @@ def update_statuses():
 
     logger.info('Allocations set to expired: {}'.format(
         allocations_to_expire.count()))
+
+def get_eula(alloc):
+    if alloc.get_resources_as_list:
+        for res in alloc.get_resources_as_list:
+            if res.get_attribute(name='eula'):
+                return True
+
+def send_eula_reminders():
+    for allocation in Allocation.objects.all():
+        if get_eula(allocation):
+            email_receiver_list = []
+            for allocation_user in allocation.allocationuser_set.all():
+                if allocation_user.status == AllocationUserStatusChoice.objects.get(name='Pending'):
+                    if allocation_user.user.email not in email_receiver_list:
+                        email_receiver_list.append(allocation_user.user.email)
+
+            template_context = {
+                'center_name': CENTER_NAME,
+                'resource': allocation.get_parent_resource,
+                'url': f'{CENTER_BASE_URL.strip("/")}/{"allocation"}/{allocation.pk}/',
+                'signature': EMAIL_SIGNATURE
+            }
 
+            if email_receiver_list:
+                send_email_template(f'Reminder: Agree to EULA for {allocation}', 'email/allocation_eula_reminder.txt', template_context, EMAIL_SENDER, email_receiver_list)
+                logger.debug(f'Allocation(s) EULA reminder sent to users {email_receiver_list}.')
 
 def send_expiry_emails():
     #Allocations expiring soon

coldfront/core/allocation/templates/allocation/allocation_add_users.html

@@ -47,7 +47,7 @@ <h2>Add users to allocation for project: {{allocation.project.title}}</h2>
         </div>
         {{ formset.management_form }}
         <div>
-          <button type="submit" class="btn btn-primary"><i class="fas
+          <button type="submit" class="btn btn-primary confirm-add"><i class="fas
               fa-user-plus"></i> Add Selected Users to Allocation</button>
           <a class="btn btn-secondary" href="{% url 'allocation-detail' allocation.pk %}" role="button"><i class="fas fa-long-arrow-left" aria-hidden="true"></i>
             Back to Allocation</a>
@@ -74,5 +74,12 @@ <h2>Add users to allocation for project: {{allocation.project.title}}</h2>
       $("#selectAll").prop('checked', false);
     }
   });
+  $(document).on('click', '.confirm-add', function(){
+    var eula = {{ resources_with_eula | length }};
+    var e = "Click OK below to agree to the EULA agreement(s) associated with the following resource(s):\n\n{{ compiled_eula | escapejs }}"
+    if (eula > 0 && ($("input[name^='userform-']").is(':checked')) == true) {
+      return confirm(e);
+    }
+  })
 </script>
-{% endblock %}
+{% endblock %}

coldfront/core/allocation/templates/allocation/allocation_detail.html

@@ -173,6 +173,48 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
   </div>
 </div>
 
+{% if eulas %}
+<div class="card mb-3">
+  <div class="card-header">
+    <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> EULA Agreements </h3>
+  </div>
+  <div class="card-body">
+      <div class="table-responsive">
+        <table class="table table-bordered table-sm">
+          <thead>
+            <tr>
+              <th scope="col">Resource</th>
+              <th scope="col">EULA</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>
+                <a href="{% url 'resource-detail' res %}">{{res_obj}}</a><br>
+              </td>
+              <td>
+                {{eulas}}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        {% if user_is_pending %}
+        <form action="{% url 'allocation-detail' allocation.pk %}" method="post">
+          {% csrf_token %}
+          <div class="d-inline-flex">
+              Agree to the above EULA to access this allocation:&#160&#160&#160{{ eula_form|crispy }}
+            </div>
+            &#160
+            <div class="float-right">
+              <button type="submit" class="btn btn-primary"><i class="fas fa-check-circle"></i>&#160Submit</button>
+            </div>
+          </form>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+  {% endif %}
+
 {% if attributes or attributes_with_usage or request.user.is_superuser %}
   <div class="card mb-3">
     <div class="card-header">
@@ -234,6 +276,7 @@ <h4 class="card-title">{{attribute}}</h4>
   </div>
 {% endif %}
 
+{% if not user_is_pending %}
 <!-- Start Allocation Change Requests -->
 <div class="card mb-3">
   <div class="card-header">
@@ -322,7 +365,9 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Users in Al
               <td>{{ user.user.email }}</td>
               {% if user.status.name == 'Active' %}
                 <td class="text-success">{{ user.status.name }}</td>
-              {% elif user.status.name == 'Denied' or user.status.name == 'Error' %}
+              {% elif user.status.name == 'Pending' %}
+                <td class="text-info">{{ user.status.name }}</td>
+              {% elif user.status.name == 'Denied' or user.status.name == 'Error' or user.status.name == 'Declined' %}
                 <td class="text-danger">{{ user.status.name }}</td>
               {% else %}
                 <td class="text-info">{{ user.status.name }}</td>
@@ -380,6 +425,7 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Notificatio
     {% endif %}
   </div>
 </div>
+{% endif %}
 
 <script>
   $(document).ready(function () {