diff --git a/multigranja/apps/entities/templates/rotation/active_rotation_card.html b/multigranja/apps/entities/templates/rotation/active_rotation_card.html deleted file mode 100644 index c0e4262..0000000 --- a/multigranja/apps/entities/templates/rotation/active_rotation_card.html +++ /dev/null @@ -1,21 +0,0 @@ -
-
-

{{ obj.batch.identifier }} em piquete {{ obj.paddock.paddock_number }}

-
- -
-

Há {{ obj.duration_display_day }} dias, desde {{ obj.entry_date|date:"d/m/Y" }}

-
- -
-

Animais: {{ obj.animal_count }}

-
- -
-

UGM: {{ obj.livestock_unit }}

-
- -
- Ver mais -
-
\ No newline at end of file diff --git a/multigranja/apps/entities/templates/rotation/rotation_list.html b/multigranja/apps/entities/templates/rotation/rotation_list.html index ae77a8b..8203ece 100644 --- a/multigranja/apps/entities/templates/rotation/rotation_list.html +++ b/multigranja/apps/entities/templates/rotation/rotation_list.html @@ -8,22 +8,19 @@ {% endblock extra_css %} {% block before_table %} +{% if open_rotations %}

Movimentações em aberto

- {% if not open_rotations %} -

Nenhuma movimentação em aberto

- {% else %} - {% for obj in open_rotations %}
-

{{ obj.batch.identifier }} em piquete {{ obj.paddock.paddock_number }}

+

Lote {{ obj.batch.identifier }} em piquete {{ obj.paddock.paddock_number }}

Há {{ obj.duration_display_day }} dias, desde {{ obj.entry_date|date:"d/m/Y" }}

- +

Animais: {{ obj.animal_count }}

@@ -33,23 +30,12 @@
- Ver mais +

Ver mais

- {% include "rotation/active_rotation_card.html" %} {% endfor %} - {% for obj in open_rotations %} - {% include "rotation/active_rotation_card.html" %} - {% endfor %} - {% for obj in open_rotations %} - {% include "rotation/active_rotation_card.html" %} - {% endfor %} - {% for obj in open_rotations %} - {% include "rotation/active_rotation_card.html" %} - {% endfor %} - -{% endif %} +{% endif %} {% endblock %} {% block table %} diff --git a/multigranja/apps/entities/views/list/rotation.py b/multigranja/apps/entities/views/list/rotation.py index 01ab69b..ccd27a5 100644 --- a/multigranja/apps/entities/views/list/rotation.py +++ b/multigranja/apps/entities/views/list/rotation.py @@ -24,6 +24,7 @@ class RotationListView(BaseListView): details_url = "entities:rotation:rotation_home" # Trocar pela url de detalhe filter_fields = ["id", "batch", "paddock"] + order_by = ["id"] # Orders from oldest to newest def get_queryset(self): queryset = super().get_queryset()