From 20420e352cf44f6b24d2aa101f6e7c22208d7fc3 Mon Sep 17 00:00:00 2001
From: Stephan Pantl <stephan.prantl@gmail.com>
Date: Sat, 8 Mar 2025 13:19:54 +0100
Subject: [PATCH] adapted for long names, improved styling

---
 .../src/main/resources/db-migration-testdata/testdata.sql | 2 +-
 .../select-shelters/select-shelters.component.html        | 8 ++++++--
 .../select-shelters/select-shelters.component.spec.ts     | 6 +++---
 .../select-shelters/select-shelters.component.ts          | 5 ++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/resources/db-migration-testdata/testdata.sql b/backend/src/main/resources/db-migration-testdata/testdata.sql
index b788a7145..4a1fddc48 100644
--- a/backend/src/main/resources/db-migration-testdata/testdata.sql
+++ b/backend/src/main/resources/db-migration-testdata/testdata.sql
@@ -591,7 +591,7 @@ INSERT INTO shelters (id, created_at, updated_at, name, address_street, address_
 values (1, NOW(), NOW(), 'Shelter 1', 'Erdberg', 1, null, null, '1030', 'Wien', 'Right around the corner', 100);
 INSERT INTO shelters (id, created_at, updated_at, name, address_street, address_houseNumber, address_stairway,
                       address_door, address_postalCode, address_city, note, persons_count)
-values (2, NOW(), NOW(), 'Shelter 2', 'Erdberg', 2, null, null, '1030', 'Wien', null, 50);
+values (2, NOW(), NOW(), 'Shelter 2 with a very long name', 'Erdberg', 2, '1', '10', '1030', 'Wien', null, 50);
 INSERT INTO shelters (id, created_at, updated_at, name, address_street, address_houseNumber, address_stairway,
                       address_door, address_postalCode, address_city, note, persons_count)
 values (3, NOW(), NOW(), 'Shelter 3', 'Erdberg', 3, null, null, '1030', 'Wien', null, 0);
diff --git a/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.html b/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.html
index d9b327c71..e73a52485 100644
--- a/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.html
+++ b/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.html
@@ -29,13 +29,17 @@ <h4 class="text-white">Notschlafstellen auswählen</h4>
                 </c-col>
                 <c-col class="col-5 text-start">
                   <c-row>
-                    <c-col class="text-start">
+                    <c-col class="text-start text-wrap">
                       <strong>{{shelter.name}}</strong>
                     </c-col>
                   </c-row>
                   <c-row>
                     <c-col class="text-start text-wrap">
-                      <label cFormCheckLabel [for]="'shelter-' + shelter.id">{{ formatShelterAddress(shelter) }}</label>
+                      <label cFormCheckLabel [for]="'shelter-' + shelter.id">
+                        {{ formatStreet(shelter) }}
+                        <br>
+                        {{ shelter.addressPostalCode }} {{ shelter.addressCity }}
+                      </label>
                     </c-col>
                   </c-row>
                 </c-col>
diff --git a/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.spec.ts b/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.spec.ts
index bcfde8f12..bf4310195 100644
--- a/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.spec.ts
+++ b/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.spec.ts
@@ -84,13 +84,13 @@ describe('SelectSheltersComponent', () => {
     expect(component.showSelectSheltersModal).toBeFalse();
   });
 
-  it('format shelter address', () => {
+  it('format street', () => {
     const fixture = TestBed.createComponent(SelectSheltersComponent);
     const component = fixture.componentInstance;
 
-    const address = component.formatShelterAddress(testShelters[0]);
+    const address = component.formatStreet(testShelters[0]);
 
-    expect(address).toBe('Test Street 1, Stiege A, Top B, 12345 Test City');
+    expect(address).toBe('Test Street 1, Stiege A, Top B');
   });
 
 });
diff --git a/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.ts b/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.ts
index 3875be48a..e961c7115 100644
--- a/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.ts
+++ b/frontend/src/main/webapp/src/app/modules/dashboard/components/select-shelters/select-shelters.component.ts
@@ -96,12 +96,11 @@ export class SelectSheltersComponent implements OnInit {
     this.showSelectSheltersModal = false;
   }
 
-  formatShelterAddress(shelter: ShelterItem): string {
+  formatStreet(shelter: ShelterItem): string {
     const addressFormatted = [
       [shelter.addressStreet, shelter.addressHouseNumber].join(' ').trim(),
       shelter.addressStairway ? 'Stiege ' + shelter.addressStairway : undefined,
-      shelter.addressDoor ? 'Top ' + shelter.addressDoor : undefined,
-      [shelter.addressPostalCode, shelter.addressCity].join(' ').trim()
+      shelter.addressDoor ? 'Top ' + shelter.addressDoor : undefined
     ]
       .filter(value => value?.trim().length > 0)
       .join(', ');