Skip to content

Commit bc4d762

Browse files
Refactor NK: Full document creation and test for simple costs.
1 parent fb67bdb commit bc4d762

13 files changed

Lines changed: 854 additions & 150 deletions

File tree

django/geno/api_views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ class ContractViewSet(viewsets.ReadOnlyModelViewSet):
7979
# permission_classes = [permissions.IsAuthenticated]
8080

8181

82+
# TODO: This is now done directly in report/nk/contract.py => Remove together with legacy code in report/nk_report.py
8283
class Akonto(APIView):
8384
"""
8485
Get paid akonto amount for contract and billing period.
@@ -162,6 +163,7 @@ def get_akonto_for_all_contracts(self):
162163
return akonto_total
163164

164165

166+
# TODO: This is now done directly in report/nk/bill.py => Remove together with legacy code in report/nk_report.py
165167
class QRBill(APIView):
166168
"""
167169
Create and return QRBill and execute corresponding accounting transactions.

django/geno/models.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,23 @@ class Building(GenoBase):
734734
egid = models.PositiveIntegerField("EGID", null=True, blank=True)
735735
active = models.BooleanField("Aktiv", default=True)
736736

737+
@property
738+
def full_name(self):
739+
ret = self.name
740+
if self.street_name and self.house_number:
741+
address = "%s %s" % (self.street_name, self.house_number)
742+
else:
743+
address = self.street_name
744+
if address and address != self.name:
745+
ret += ", %s" % address
746+
if self.city_zipcode and self.city_name:
747+
ret += ", %s %s" % (self.city_zipcode, self.city_name)
748+
elif self.city_name:
749+
ret += ", %s" % self.city_name
750+
if self.country and self.country != get_default_country_code():
751+
ret += ", %s" % self.get_country_display()
752+
return ret
753+
737754
class Meta:
738755
ordering = ["name"]
739756
verbose_name = "Liegenschaft"

django/geno/tests/data.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,16 @@ def create_registrationevents(cls):
555555

556556
def create_buildings(cls, count=2):
557557
cls.buildings = []
558-
for i in range(count):
558+
cls.buildings.append(
559+
Building.objects.create(
560+
name="Musterweg 1",
561+
street_name="Musterweg",
562+
house_number="1",
563+
city_zipcode="3000",
564+
city_name="Bern",
565+
)
566+
)
567+
for i in range(2, count):
559568
cls.buildings.append(Building.objects.create(name=f"Musterweg {i + 1}"))
560569

561570

0 commit comments

Comments
 (0)