fixing who can submit proposal, Add user invitation when editing an SP_Period, r…

…emoved SPForm modification when editing SP_Period

fixing who can submit proposal, Add user invitation when editing an SP_Period, r…
…emoved SPForm modification when editing SP_Period
Alexis Koralewski
1 parent 67a50452
Showing 4 changed files with 87 additions and 28 deletions Show diff stats
src/core/pyros_django/misc/templates/base.html
src/core/pyros_django/scientific_program/templates/scientific_program/scientific_program_detail_edit.html
src/core/pyros_django/scientific_program/templates/scientific_program/scientific_program_period_detail.html
src/core/pyros_django/scientific_program/views.py
@@ -588,7 +588,7 @@ footer{
       <footer class="sticky-footer">
           <div>
               <div class="text-right my-auto">
-                 <span>VERSION 0.2.4.0_2.0_3.6_2021-10-07</span>
+                 <span>VERSION 0.2.5.0_2.0_3.6_2021-10-08</span>
               </div>
           </div>
       </footer>
@@ -3,20 +3,18 @@
 {% block content %}
 <form id="editSPForm" action="" method="post">
     {% csrf_token %}
-    {% if sp_period.status == "Draft" %}
-        {{ SPForm.as_p }}
-    {% else %}
+ 
         {% for field in SPForm %}
             <div class="fieldWrapper">
                 {{ field.label_tag }} {{ field.value }}
+                {{ field.as_hidden }}
             </div>
         {% endfor %}
-    {% endif %}
     {% if sp_period.status == "Draft" %}
         <p style="color:red;"><strong>This proposal will be automatically submitted for evaluation on {{ sp_period.period.submission_end_date }}</strong> </p> 
     {% endif %}
-    {% if USER_LEVEL|ifinlist:"Unit-PI,Admin,TAC"%}
-        {% if sp_period.referee1 != None %}
+    {% if USER_LEVEL|ifinlist:"Unit-PI,Admin,Unit-board"%}
+        {% if sp_period.referee1 != None and sp_period.referee1 == request.user %}
             <p><strong>vote referee 1: </strong>{{ sp_period.vote_referee1 }} {{ sp_period.reason_referee1 }} by {{ sp_period.referee1.first_name }} {{ sp_period.referee1.last_name}} </p>
         {% endif %}
         {% if sp_period.referee2 != None %}
@@ -56,7 +56,7 @@
     {% if CAN_OBSERVER_EDIT or CAN_TAC_EVALUATE or CAN_UNIT_PI_VALIDATE  %}
         <a href="{% url "edit_scientific_program_period" id_sp=scientific_program.id id_period=sp_period.period.pk %}" class="btn btn-info" role="button">Edit</a>
     {% endif %}
-    {% if sp_period.status == "Draft" %}
+    {% if CAN_SUBMIT_PROPOSAL %}
         <a href="{% url "submit_proposal" sp_period.id %}" class="btn btn-info" role="button">Submit proposal</a>
     {% endif %}
     {% if CAN_OBSERVER_DELETE %}
@@ -338,6 +338,10 @@ def list_evaluated_scientific_program(request):
 @login_required
 def accept_sp_invitation(request, id_SP, id_period):
+    """
+    An invitation to join an SP is valid until the end of Exploitation period
+
+    """
     sp_period = SP_Period.objects.get(scientific_program=id_SP, period=id_period)
     current_user = PyrosUser.objects.get(username=request.user)
     is_user_guest_of_sp = SP_Period_Guest.objects.filter(
@@ -365,6 +369,7 @@ def edit_scientific_program_period(request, id_sp, id_period):
     today = timezone.now().date()
     sp_period = SP_Period.objects.get(
         scientific_program=scientific_program, period=Period.objects.get(id=id_period))
+    period=Period.objects.get(id=id_period)
     SP_Period_form = SP_PeriodForm(request.POST or None, instance=sp_period)
     sp_pi = scientific_program.sp_pi
     if request.session.get("role") == "Observer" and request.user.id != sp_pi.id:
@@ -376,25 +381,78 @@ def edit_scientific_program_period(request, id_sp, id_period):
     users_informations = PyrosUser.objects.filter(
         id__in=user_of_sp.values_list("user", flat=True))
     guests = ",".join(guests)
+    error = False
+    error_message = ""
+    list_of_emails = None
+    recipient_list = []
     if request.POST:
-
-        if SPForm.is_valid() and SP_Period_form.is_valid() and sp_period.status == SP_Period.STATUSES_DRAFT:
-            SP = SPForm.save()
-            SP_period = SP_Period_form.save()
-            if request.POST.getlist("user"):
-                for sp_period_user in users_informations:
-                    if sp_period_user.id not in map(int, request.POST.getlist("user")):
-                        sp_period_user.delete()
-
-                for user in request.POST.getlist("user"):
-                    user_instance = PyrosUser.objects.get(id=int(user))
-                    if user_instance not in users_informations:
-                        SP_Period_User.objects.create(
-                            SP_Period=sp_period, user=user_instance)
-            else:
-                SP_Period_User.objects.filter(
-                    SP_Period=sp_period).delete()
-            return redirect('detail_scientific_program_period', id_sp=scientific_program.id, id_period=id_period)
+        if SP_Period_form.is_valid():
+            # can send invitation until the end of exploitation
+            if request.POST.get("users") and today < period.end_date:
+                # Invite user to join the SP
+                regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b'
+                list_of_emails = request.POST.get("users").strip()
+                
+                for email in list_of_emails.split(","):
+                    if re.fullmatch(regex, email):
+                        recipient_list.append(email)
+                    else:
+                        error = True
+                        error_message = f"Invalid mail for {email}"
+                if not error:
+                    domain = settings.DEFAULT_DOMAIN
+                    url = f"{domain}{reverse('sp_register',args=(scientific_program.pk,sp_period.period.pk))}"
+                    mail_subject = '[PyROS CC] New registration to an observing proposal'
+                    mail_message = (f"Hi,\n\nYou were invited to join an observing proposal that as been submitted using PyROS.\n"
+                                    f"The name of the proposal is {scientific_program.name} and his PI is {sp_pi.first_name} {sp_pi.last_name}.\n"
+                                    f"To accept this invitation, click on the following link : {url}\n"
+                                    "You might be asked to login first and will be redirected to the proposal page.\n"
+                                    "If the redirection doesn't work, click again on the link after you've logged in.\n"
+                                    "If you don't own an PyROS account, go on the website in order to create an account with the same mail adress that you are using to read this mail."
+                                    "\n\nCordially,\n\nPyROS Control Center")
+                    if len(recipient_list) > 0:
+                        try:
+                            # Delete previous guests (resetting list of guests)
+                            SP_Period_Guest.objects.filter(SP_Period=sp_period).delete()
+                        finally:
+                            for recipient in recipient_list:
+                                guest = SP_Period_Guest.objects.create(
+                                    SP_Period=sp_period, email=recipient)
+                                send_mail(
+                                    mail_subject,
+                                    mail_message,
+                                    from_email=None,
+                                    recipient_list=[recipient],
+                                    fail_silently=False,
+                                )
+                else:
+                    return render(request, 'scientific_program/scientific_program_detail_edit.html', {
+                            'id_sp': id_sp,
+                            "id_period": id_period,
+                            "SPForm": SPForm,
+                            "period": sp_period.period,
+                            "guests": guests,
+                            "users_of_sp_period": users_informations,
+                            "SP_PeriodForm": SP_Period_form,
+                            "sp_period": sp_period,
+                            "error_message":error_message
+                        })
+                SP_period = SP_Period_form.save()
+                # save changes on user list 
+                if request.POST.getlist("user"):
+                    for sp_period_user in users_informations:
+                        if sp_period_user.id not in map(int, request.POST.getlist("user")):
+                            sp_period_user.delete()
+
+                    for user in request.POST.getlist("user"):
+                        user_instance = PyrosUser.objects.get(id=int(user))
+                        if user_instance not in users_informations:
+                            SP_Period_User.objects.create(
+                                SP_Period=sp_period, user=user_instance)
+                else:
+                    SP_Period_User.objects.filter(
+                        SP_Period=sp_period).delete()
+                return redirect('detail_scientific_program_period', id_sp=scientific_program.id, id_period=id_period)
         if SP_Period_form.is_valid() and request.session.get("role") == "TAC" and sp_period.status != SP_Period.STATUSES_DRAFT:
             # vote TAC
             if sp_period.referee1 == None or sp_period.referee1 == request.user and request.POST.get("vote_referee1") and request.POST.get("reason_referee1"):
@@ -438,7 +496,8 @@ def edit_scientific_program_period(request, id_sp, id_period):
         "guests": guests,
         "users_of_sp_period": users_informations,
         "SP_PeriodForm": SP_Period_form,
-        "sp_period": sp_period
+        "sp_period": sp_period,
+        "error_message":error_message
     })
@@ -493,6 +552,7 @@ def detail_scientific_program_period(request, id_sp, id_period):
     CAN_UNIT_PI_VALIDATE = request.session.get("role") in ("Unit-PI","Unit-board") and sp_period.status == SP_Period.STATUSES_EVALUATED
     CAN_OBSERVER_DELETE = request.session.get("role") in ("Admin","Observer") and sp_period.status == SP_Period.STATUSES_DRAFT
     CAN_VIEW_TAC_VOTES = request.session.get("role") in ("Admin","Unit-PI","Unit-board")
+    CAN_SUBMIT_PROPOSAL = request.user == sp_pi and request.session.get("role") == "Observer" and sp_period.status == SP_Period.STATUSES_DRAFT
     return render(request, 'scientific_program/scientific_program_period_detail.html', {
         'scientific_program': scientific_program,
         "users": users_informations,
@@ -505,7 +565,8 @@ def detail_scientific_program_period(request, id_sp, id_period):
         "CAN_UNIT_PI_VALIDATE": CAN_UNIT_PI_VALIDATE,
         "CAN_OBSERVER_DELETE": CAN_OBSERVER_DELETE,
         "is_proposal": True,
-        "CAN_VIEW_TAC_VOTES": CAN_VIEW_TAC_VOTES
+        "CAN_VIEW_TAC_VOTES": CAN_VIEW_TAC_VOTES,
+        "CAN_SUBMIT_PROPOSAL": CAN_SUBMIT_PROPOSAL
     })