one more full month required

carpentries · Aug 2, 2023 · bc5a975 · bc5a975
1 parent c3233f0
commit bc5a975
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/amy/dashboard/tests/test_instructor_dashboard.py b/amy/dashboard/tests/test_instructor_dashboard.py
@@ -197,14 +197,15 @@ def setUp(self):
             involvement_type=self.github_contribution,
             date=datetime.today(),
             url="https://example.org",
+            trainee_notes="Notes from trainee",
         )
         self.PROGRESS_SUMMARY_BLOCK = (
             "<p>"
             "<strong>Activity:</strong> Submitted a contribution to a Carpentries "
             "repository<br/>"
             f'<strong>Date:</strong> {datetime.today().strftime("%B %-d, %Y")}<br/>'
             "<strong>URL:</strong> https://example.org<br/>"
-            "<strong>Notes:</strong> No notes provided"
+            "<strong>Notes:</strong> Notes from trainee"
             "</p>"
         )
         self.EDIT_CLASS = "edit-object"  # class on the Edit button
@@ -302,6 +303,31 @@ def test_get_involved_asked_to_repeat(self):
         self.assertNotContains(rv, self.SESSION_LINK_TEXT)
         self.assertContains(rv, "Submit another Get Involved activity")
 
+    def test_get_involved_details_not_provided(self):
+        """Check that optional fields are summarised correctly when empty"""
+        self.progress.delete()
+        TrainingProgress.objects.create(
+            trainee=self.admin,
+            requirement=self.get_involved,
+            involvement_type=self.github_contribution,
+            state="n",
+        )
+
+        # Act
+        rv = self.client.get(self.progress_url)
+
+        # Assert
+        PROGRESS_SUMMARY_BLOCK = (
+            "<p>"
+            "<strong>Activity:</strong> Submitted a contribution to a Carpentries "
+            "repository<br/>"
+            "<strong>Date:</strong> No date provided<br/>"
+            "<strong>URL:</strong> No URL provided<br/>"
+            "<strong>Notes:</strong> No notes provided"
+            "</p>"
+        )
+        self.assertContains(rv, PROGRESS_SUMMARY_BLOCK, html=True)
+
 
 class TestWelcomeSessionStatus(TestBase):
     """Test that trainee dashboard displays status of passing Welcome

diff --git a/amy/templates/dashboard/training_progress.html b/amy/templates/dashboard/training_progress.html
@@ -86,7 +86,7 @@ <h2>Your progress towards becoming a Carpentries Instructor</h2>
           <p>Details of your submission are below.</p>
           <p>
             <strong>Activity:</strong> {{ progress_get_involved.involvement_type }}<br/>
-            <strong>Date:</strong> {% firstof progress_get_involved.date "No dates provided" %}<br/>
+            <strong>Date:</strong> {% firstof progress_get_involved.date|date:'F j, Y' "No date provided" %}<br/>
             <strong>URL:</strong> {% firstof progress_get_involved.url "No URL provided" %}<br/>
             <strong>Notes:</strong> {% firstof progress_get_involved.trainee_notes "No notes provided" %}
           </p>