Add feature to retake document for annotation for previous annotator

Marcel Kawski
1 parent 7c50fbb1
Showing 3 changed files with 44 additions and 6 deletions
collector/storage/templates/storage/review.html
collector/storage/urls.py
collector/storage/views.py
@@ -57,23 +57,34 @@
       </a>
  
       {% if document.processing_status.key == "correct" %}
+        <br><br>
         {% if request.user|belongs_to_group:"Editors" %}
           <a class="retake-doc-for-annotation btn btn-danger"
-             href="{% url 'retake_doc_for_annotation' document.id %}">
+             href="{% url 'retake_doc_for_anno' document.id %}">
             Zwróć dokument do anotacji <i class="material-icons def-col-button">undo</i>
           </a>
+          <br><br>
+          <a class="retake-doc-for-annotation btn btn-danger"
+             href="{% url 'retake_doc_for_anno_for_prev_annot' document.id %}">
+            Zwróć dokument do anotacji do poprzedniego anotatora<i class="material-icons def-col-button">undo</i>
+          </a>
         {% else %}
           <span title="Opcja dostępna tylko dla grupy Redaktorzy">
             <a class="retake-doc-for-annotation btn btn-danger disable-click"
-               href="{% url 'retake_doc_for_annotation' document.id %}">
+               href="{% url 'retake_doc_for_anno' document.id %}">
               Zwróć dokument do anotacji <i class="material-icons def-col-button">undo</i>
             </a>
+            <br><br>
+            <a class="retake-doc-for-annotation btn btn-danger disable-click"
+               href="{% url 'retake_doc_for_anno_for_prev_annot' document.id %}">
+              Zwróć dokument do anotacji do poprzedniego anotatora <i class="material-icons def-col-button">undo</i>
+            </a>
           </span>
         {% endif %}
       {% endif %}
  
 <!--      <button class="retake-doc-for-annotation btn btn-danger" type="button"-->
-<!--              data-id="{% url 'retake_doc_for_annotation' document.id %}">-->
+<!--              data-id="{% url 'retake_doc_for_anno' document.id %}">-->
 <!--          Zwróć dokument do anotacji <i class="material-icons def-col-button">undo</i>-->
 <!--      </button>-->
  
@@ -61,6 +61,8 @@ urlpatterns = [
          name='download_source'),
     path('document-list/', login_required(views.DocumentListView.as_view()), name='document_list'),
     path('draft-list/<str:user_id>', login_required(views.DraftListView.as_view()), name='draft_list'),
-    path('retake-doc-for-annotation/<str:doc_id>', login_required(views.RetakeDocForAnnotationView.as_view()),
-         name='retake_doc_for_annotation')
+    path('retake-doc-for-annotation/<str:doc_id>', login_required(views.RetakeDocForAnnoView.as_view()),
+         name='retake_doc_for_anno'),
+    path('retake-doc-for-anno-for-prev-annot/<str:doc_id>',
+         login_required(views.RetakeDocForAnnoForPrevAnnotView.as_view()), name='retake_doc_for_anno_for_prev_annot')
 ]
@@ -1056,7 +1056,7 @@ class DocumentListView(ListView):
         return docs
  
  
-class RetakeDocForAnnotationView(UserPassesTestMixin, RedirectView):
+class RetakeDocForAnnoView(UserPassesTestMixin, RedirectView):
  
     def get_redirect_url(self, *args, **kwargs):
         return reverse('document_list')
@@ -1079,6 +1079,31 @@ class RetakeDocForAnnotationView(UserPassesTestMixin, RedirectView):
         return HttpResponse('Wymagana jest rola redaktora, aby uzyskać dostęp do tej strony.')
  
  
+class RetakeDocForAnnoForPrevAnnotView(UserPassesTestMixin, RedirectView):
+
+    def get_redirect_url(self, *args, **kwargs):
+        return reverse('document_list')
+
+    def get(self, request, *args, **kwargs):
+        return render(self.request, 'storage/delete.html', {'msg': 'Czy na pewno chcesz zwrócić dokument do ponownej '
+                                                                   'anotacji dla poprzedniego anotatora?',
+                                                            'submit_btn_text': 'Zwróć'})
+
+    def post(self, request, *args, **kwargs):
+        document = Document.objects.get(id=kwargs['doc_id'])
+        document.change_processing_status('to_correct')
+        last_annotator = document.annotations.order_by('-finish_time')[0].user
+        Annotation.objects.create(user=last_annotator, document=document)
+        document.save()
+        return super().get(request, *args, **kwargs)
+
+    def test_func(self):
+        return self.request.user.groups.filter(name='Editors').exists()
+
+    def handle_no_permission(self):
+        return HttpResponse('Wymagana jest rola redaktora, aby uzyskać dostęp do tej strony.')
+
+
 class DraftListView(ListView):
     model = Document
     template_name = 'storage/draft_list.html'