Fixes #494

Author: fbanados

validation/forms.py

@@ -191,18 +191,24 @@ class EditIssueWithPhrase(forms.ModelForm):
     transcription = forms.CharField(
         max_length=412,
         required=False,
-        widget=forms.Textarea(attrs={"class": "form-control"}),
+        widget=forms.Textarea(attrs={"class": "form-control", "rows": 4}),
     )
 
     translation = forms.CharField(
         max_length=412,
         required=False,
-        widget=forms.Textarea(attrs={"class": "form-control"}),
+        widget=forms.Textarea(attrs={"class": "form-control", "rows": 4}),
+    )
+
+    comment = forms.CharField(
+        max_length=2048,
+        required=False,
+        widget=forms.Textarea(attrs={"class": "form-control", "rows": 4}),
     )
 
     class Meta:
         model = Phrase
-        fields = ["transcription", "translation"]
+        fields = ["transcription", "translation", "comment"]
 
 
 class RecordNewPhrase(forms.ModelForm):

validation/jinja2/validation/view_issue_detail.html

@@ -80,12 +80,15 @@ <h3>Current Information</h3>
         </section>
 
         <section style="flex: 1">
-            <h3>Updates</h3>
             {% if form %}
                 <form action="" method="POST">
+                    <div class="d-flex justify-content-between">
+                    <h3 class="float-start">Updates</h3>
                     <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}">
+                    <input data-cy="save-button" type="submit" class="button button--success float-end float-right" value="Resolve issue and return to list">
+                    </div>
+                    <br />
                     {{ form }}
-                    <input data-cy="save-button" type="submit" class="button button--success" value="Resolve issue and return to list">
                 </form>
             {% endif %}
         </section>

validation/views.py

@@ -239,7 +239,11 @@ def entries(request, language):
         else:
             all_phrases = all_phrases.filter(status=mode)
 
-        all_phrases = all_phrases.prefetch_related("recording_set__speaker")
+        all_phrases = (
+            all_phrases.prefetch_related("recording_set__speaker")
+            .annotate(total_recordings=Count("recording", distinct=True))
+            .filter(total_recordings__gt=0)
+        )
 
         sessions = (
             RecordingSession.objects.order_by("id").values("id", "date").distinct()
@@ -370,6 +374,8 @@ def search_phrases(request, language):
         .exclude(status=Phrase.USER)
         .filter(language=language_object)
         .prefetch_related("recording_set__speaker")
+        .annotate(total_recordings=Count("recording", distinct=True))
+        .filter(total_recordings__gt=0)
     )
     all_matches = list(all_matches)
     all_matches.sort(key=lambda phrase: phrase.transcription)
@@ -998,11 +1004,15 @@ def view_issue_detail(request, language, issue_id):
             translation_initial = issue.target_language_suggestion
             if not translation_initial:
                 translation_initial = issue.phrase.translation
+            comment_initial = issue.phrase.comment
+            if not comment_initial:
+                comment_initial = issue.comment
 
             form = EditIssueWithPhrase(
                 initial={
                     "transcription": transcription_initial,
                     "translation": translation_initial,
+                    "comment": comment_initial,
                 }
             )