Change documents str representation

Marcel Kawski
1 parent d6e74585
Showing 4 changed files with 21 additions and 14 deletions
collector/storage/forms.py
collector/storage/models.py
collector/storage/templates/storage/annotation.html
collector/storage/templates/storage/review.html
@@ -36,23 +36,22 @@ class ChunkForm(ModelForm):
                                                    sequence=self.cleaned_data['sequence'],
                                                    text=self.cleaned_data['text'])
         else:
-            old_chunk_seq = self.old_sequence
             new_chunk_seq = self.cleaned_data['sequence']
             try:
                 doc = Document.objects.get(id=self.instance.document.id)
-                doc.chunks.get(sequence=new_chunk_seq)
-                if old_chunk_seq > new_chunk_seq:
-                    chunks = doc.chunks.filter(sequence__gte=new_chunk_seq,
-                                               sequence__lt=old_chunk_seq)
-                    if chunks is not None:
-                        for chunk in chunks:
+                doc.chunks.get(sequence=new_chunk_seq)  # if the new sequence is the same as other chunk's sequence
+                if self.old_sequence > new_chunk_seq:
+                    chunks_to_move = doc.chunks.filter(sequence__gte=new_chunk_seq,
+                                               sequence__lt=self.old_sequence)
+                    if chunks_to_move is not None:
+                        for chunk in chunks_to_move:
                             chunk.sequence += 1
                             chunk.save()
-                elif old_chunk_seq < new_chunk_seq:
-                    chunks = doc.chunks.filter(sequence__gt=old_chunk_seq,
+                elif self.old_sequence < new_chunk_seq:
+                    chunks_to_move = doc.chunks.filter(sequence__gt=self.old_sequence,
                                                sequence__lte=new_chunk_seq)
-                    if chunks is not None:
-                        for chunk in chunks:
+                    if chunks_to_move is not None:
+                        for chunk in chunks_to_move:
                             chunk.sequence -= 1
                             chunk.save()
             except Chunk.DoesNotExist:
@@ -341,4 +340,12 @@ class MoveChunkForm(Form):
     def __init__(self, *args, **kwargs):
         poss_move_docs = kwargs.pop('poss_move_docs')
         super(MoveChunkForm, self).__init__(*args, **kwargs)
+        self.fields['move_doc'].label_from_instance = self.label_from_instance
         self.fields['move_doc'].queryset = poss_move_docs
+
+    @staticmethod
+    def label_from_instance(obj):
+        if obj.parent is not None:
+            return f'{obj} (fragment nr: {obj.sequence})'
+        else:
+            return f'{obj} (dokument główny)'
@@ -150,7 +150,7 @@ class Document(models.Model):
         ]
  
     def __str__(self):
-        return str(self.id) + '-' + self.name
+        return f'{self.name}-{self.id}'
  
  
 class Chunk(models.Model):
@@ -112,7 +112,7 @@
         <tbody>
           {% for subdocument in subdocuments %}
           <tr>
-            <td><a href="{% url 'annotation' subdocument.id %}">{{ subdocument.name }}-{{ subdocument.id  }}</a></td>
+            <td><a href="{% url 'annotation' subdocument.id %}">{{ subdocument }}</a></td>
             <td>{{ subdocument.sequence }}</td>
             <td class="actions">
               {% if user.is_authenticated %}
@@ -98,7 +98,7 @@
         <tbody>
           {% for subdocument in subdocuments %}
           <tr>
-            <td><a href="{% url 'review' subdocument.id %}">{{ subdocument.name }}-{{ subdocument.id  }}</a></td>
+            <td><a href="{% url 'review' subdocument.id %}">{{ subdocument }}</a></td>
             <td>{{ subdocument.sequence }}</td>
           </tr>
           <tr>