Merge pull request #2704 from carpentries/feature/2703-automatically-…

…generate-and-update-survey-link

Automatically generate and update survey link

amy/api/v2/serializers.py

@@ -72,7 +72,9 @@ class EventSerializer(serializers.ModelSerializer):
 
     human_readable_date = serializers.CharField(read_only=True)
     eligible_for_instructor_recruitment = serializers.BooleanField(read_only=True)
-    workshop_reports_link = serializers.CharField(read_only=True)
+    workshop_reports_link = serializers.CharField(
+        read_only=True, source="instructors_pre"
+    )
     main_tag = serializers.SerializerMethodField()
 
     class Meta:

amy/templates/includes/event_details_table.html

@@ -20,8 +20,7 @@
   <tr class="{% if not event.url %}table-danger{% endif %}"><th>Website URL:</th><td colspan="2">{{ event.website_url|default:"&mdash;"|urlize_newtab }} {% if event.url %}<a href="{% url 'validate_event' event.slug %}" class="btn btn-primary btn-sm float-right" id="validate_event" data-toggle="modal" data-target="#validation_modal">Validate event</a>{% else %}<a class="btn btn-danger btn-sm float-right" id="error_event_url" tabindex="0" role="button" data-toggle="popover" title="Validation error" data-content="Cannot validate an event without URL pointing to the event website, e.g.: <code>https://swcarpentry.github.io/2015-05-24-training</code>" data-html="true" data-trigger="focus">Error</a>{% endif %}</td></tr>
   <tr><th>Language:</th><td colspan="2">{{ event.language|default:"&mdash;" }}</td></tr>
   <tr><th>Eventbrite key:</th><td colspan="2">{% if event.reg_key %}<a href="https://www.eventbrite.com/myevent?eid={{ event.reg_key }}" title="Go to Eventbrite's page for this event" target="_blank" rel="noreferrer">{{ event.reg_key }}</a>{% else %}&mdash;{% endif %}</td></tr>
-  <tr><th>Pre-workshop assessment survey for instructors</th><td colspan="2">{{ event.instructors_pre|default:"&mdash;"|urlize_newtab}}</td></tr>
-  <tr><th>Post-workshop assessment survey for instructors</th><td colspan="2">{{ event.instructors_post|default:"&mdash;"|urlize_newtab}}</td></tr>
+  <tr><th>Assessment survey for instructors:</th><td colspan="2">{{ event.instructors_pre|default:"&mdash;"|urlize_newtab}}</td></tr>
   <tr class="{% if not event.attendance %}table-danger{% endif %}">
     <th>Attendance:</th>
     <td colspan="2">

amy/workshops/forms.py

@@ -408,6 +408,15 @@ class EventForm(forms.ModelForm):
         required=False,
     )
 
+    instructors_pre = forms.URLField(
+        label="Assessment survey for instructors:",
+        help_text=(
+            "Auto-generated as long as the event is NOT marked as complete and "
+            "it has a slug."
+        ),
+        required=False,
+    )
+
     helper = BootstrapHelper(add_cancel_button=False, duplicate_buttons_on_top=True)
 
     class Meta:
@@ -438,7 +447,6 @@ class Meta:
             "lessons",
             "public_status",
             "instructors_pre",
-            "instructors_post",
             "comment",
         ]
         widgets = {
@@ -486,7 +494,6 @@ def __init__(self, *args, **kwargs):
             "manual_attendance",
             "contact",
             "instructors_pre",
-            "instructors_post",
             Div(
                 Div(HTML("Location details"), css_class="card-header"),
                 Div(

amy/workshops/models.py

@@ -1629,6 +1629,9 @@ def save(self, *args, **kwargs):
             self.latitude = None
             self.longitude = None
 
+        if self.slug and not self.completed:
+            self.instructors_pre = reports_link(self.slug)
+
         super().save(*args, **kwargs)
 
 

amy/workshops/tests/test_event.py

@@ -1103,6 +1103,7 @@ def test_merging_basic_attributes(self):
             "longitude": self.event_a.longitude,
             "learners_pre": self.event_b.learners_pre,
             "learners_post": self.event_a.learners_post,
+            # Doesn't follow strategy, because it's refreshed with a slug from Event A:
             "instructors_pre": self.event_b.instructors_pre,
             "instructors_post": self.event_a.instructors_post,
             "learners_longterm": self.event_b.learners_longterm,
@@ -1113,6 +1114,7 @@ def test_merging_basic_attributes(self):
         rv = self.client.post(self.url, data=self.strategy)
         self.assertEqual(rv.status_code, 302)
         self.event_b.refresh_from_db()
+        assertions["instructors_pre"] = self.event_b.instructors_pre  # needs refresh
 
         for key, value in assertions.items():
             self.assertEqual(getattr(self.event_b, key), value, key)