Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions api/serializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@
from .password import PasswordSerializer # noqa: F401
from .managerinvitation import ManagerInvitationSerializer # noqa: F401
from .teledeclaration import ( # noqa: F401
ShortTeledeclarationSerializer,
CampaignDatesSerializer,
CampaignDatesFullSerializer,
) # noqa: F401
)
from .purchase import ( # noqa: F401
PurchaseSerializer,
PurchaseSummarySerializer,
Expand Down
3 changes: 0 additions & 3 deletions api/serializers/diagnostic.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

from data.models import Diagnostic

from .teledeclaration import ShortTeledeclarationSerializer
from .utils import appro_to_percentages

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -153,8 +152,6 @@ def return_value(serializer, data, field_name):


class FullDiagnosticSerializer(DiagnosticSerializer):
teledeclaration = ShortTeledeclarationSerializer(source="latest_submitted_teledeclaration")

class Meta:
model = Diagnostic
fields = (
Expand Down
14 changes: 0 additions & 14 deletions api/serializers/teledeclaration.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
from rest_framework import serializers

from data.models import Teledeclaration


class ShortTeledeclarationSerializer(serializers.ModelSerializer):
class Meta:
model = Teledeclaration
fields = (
"id",
"creation_date",
"modification_date",
"status",
)
read_only_fields = fields


class CampaignDatesSerializer(serializers.Serializer):
year = serializers.IntegerField()
Expand Down
7 changes: 0 additions & 7 deletions data/models/diagnostic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1622,13 +1622,6 @@ def canteen_snapshot_sector_list_display(self):
return ", ".join([x["name"] for x in (self.canteen_snapshot.get("sectors") or [])])
return None

@property
def latest_submitted_teledeclaration(self):
submitted_teledeclarations = self.teledeclaration_set.submitted()
if submitted_teledeclarations.count() == 0:
return None
return submitted_teledeclarations.order_by("-creation_date").first()

@property
def appro_badge(self) -> bool | None:
total = self.valeur_totale
Expand Down
Loading