BugFixes:141,140,139,138,137,129

bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html

@@ -14,13 +14,17 @@
         <p class="mb-4" [innerHTML]="description"></p>
 
         <div class="space-y-2">
-          <div class="flex flex-col sm:flex-row" [ngClass]="{ 'bg-gray-100': i % 2 === 0 }" *ngFor="let item of listingDetails; let i = index">
-            <div class="w-full sm:w-1/3 font-semibold p-2">{{ item.label }}</div>
-            @if(item.label==='Category'){
-            <span class="bg-blue-100 text-blue-800 font-medium me-2 px-2.5 py-0.5 rounded-full dark:bg-blue-900 dark:text-blue-300 my-1">{{ item.value }}</span>
-            } @else {
-            <div class="w-full sm:w-2/3 p-2">{{ item.value }}</div>
-            }
+          <div *ngFor="let detail of listingDetails; let i = index" class="flex flex-col sm:flex-row" [ngClass]="{ 'bg-gray-100': i % 2 === 0 }">
+            <div class="w-full sm:w-1/3 font-semibold p-2">{{ detail.label }}</div>
+
+            <div class="w-full sm:w-2/3 p-2" *ngIf="!detail.isHtml && !detail.isListingBy">{{ detail.value }}</div>
+
+            <div class="w-full sm:w-2/3 p-2 flex space-x-2" [innerHTML]="detail.value" *ngIf="detail.isHtml && !detail.isListingBy"></div>
+
+            <div class="w-full sm:w-2/3 p-2 flex space-x-2" *ngIf="detail.isListingBy">
+              <a routerLink="/details-user/{{ listingUser.id }}" class="text-blue-600 dark:text-blue-500 hover:underline">{{ listingUser.firstname }} {{ listingUser.lastname }}</a>
+              <img src="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imageName }}.avif?_ts={{ ts }}" class="mr-5 lg:mb-0" style="max-height: 30px; max-width: 100px" />
+            </div>
           </div>
         </div>
         <div class="py-4 print:hidden">
@@ -84,17 +88,6 @@
           <div>
             <app-validated-textarea label="Questions/Comments" name="comments" [(ngModel)]="mailinfo.sender.comments"></app-validated-textarea>
           </div>
-          @if(listingUser){
-          <div class="flex items-center space-x-2">
-            <p>Listing by</p>
-            <!-- <p class="text-sm font-semibold">Noah Nguyen</p> -->
-            <a routerLink="/details-user/{{ listingUser.id }}" class="text-blue-600 dark:text-blue-500 hover:underline">{{ listingUser.firstname }} {{ listingUser.lastname }}</a>
-            <!-- <img src="https://placehold.co/20x20" alt="Broker logo" class="w-5 h-5" /> -->
-            @if(listingUser.hasCompanyLogo){
-            <img src="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imageName }}.avif?_ts={{ ts }}" class="mr-5 lg:mb-0" style="max-height: 30px; max-width: 100px" />
-            }
-          </div>
-          }
           <button (click)="mail()" class="w-full sm:w-auto px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-opacity-50">Submit</button>
         </form>
       </div>

bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts

@@ -159,6 +159,16 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
       { label: 'Reason for Sale', value: this.listing.reasonForSale },
       { label: 'Broker licensing', value: this.listing.brokerLicencing },
       { label: 'Listed since', value: `${this.dateInserted()} - ${this.getDaysListed()} days` },
+      {
+        label: 'Listing by',
+        value: null, // Wird nicht verwendet
+        isHtml: true,
+        isListingBy: true, // Flag für den speziellen Fall
+        user: this.listingUser, // Übergebe das User-Objekt
+        imagePath: this.listing.imageName,
+        imageBaseUrl: this.env.imageBaseUrl,
+        ts: this.ts,
+      },
     ];
     if (this.listing.draft) {
       result.push({ label: 'Draft', value: this.listing.draft ? 'Yes' : 'No' });

bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html

@@ -16,7 +16,18 @@
           <div class="space-y-2">
             <div *ngFor="let detail of propertyDetails; let i = index" class="flex flex-col sm:flex-row" [ngClass]="{ 'bg-gray-100': i % 2 === 0 }">
               <div class="w-full sm:w-1/3 font-semibold p-2">{{ detail.label }}</div>
-              <div class="w-full sm:w-2/3 p-2">{{ detail.value }}</div>
+
+              <!-- Standard Text -->
+              <div class="w-full sm:w-2/3 p-2" *ngIf="!detail.isHtml && !detail.isListingBy">{{ detail.value }}</div>
+
+              <!-- HTML Content (nicht für RouterLink) -->
+              <div class="w-full sm:w-2/3 p-2 flex space-x-2" [innerHTML]="detail.value" *ngIf="detail.isHtml && !detail.isListingBy"></div>
+
+              <!-- Speziell für Listing By mit RouterLink -->
+              <div class="w-full sm:w-2/3 p-2 flex space-x-2" *ngIf="detail.isListingBy">
+                <a [routerLink]="['/details-user', detail.user.id]" class="text-blue-600 dark:text-blue-500 hover:underline"> {{ detail.user.firstname }} {{ detail.user.lastname }} </a>
+                <img *ngIf="detail.user.hasCompanyLogo" [src]="detail.imageBaseUrl + '/pictures/logo/' + detail.imagePath + '.avif?_ts=' + detail.ts" class="mr-5 lg:mb-0" style="max-height: 30px; max-width: 100px" />
+              </div>
             </div>
           </div>
           <div class="py-4 print:hidden">
@@ -88,15 +99,6 @@
               </div>
 
               <div class="flex items-center justify-between">
-                @if(listingUser){
-                <div class="flex items-center space-x-2">
-                  <p>Listing by</p>
-                  <a routerLink="/details-user/{{ listingUser.id }}" class="text-blue-600 dark:text-blue-500 hover:underline">{{ listingUser.firstname }} {{ listingUser.lastname }}</a>
-                  @if(listingUser.hasCompanyLogo){
-                  <img src="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imagePath }}.avif?_ts={{ ts }}" class="mr-5 lg:mb-0" style="max-height: 30px; max-width: 100px" />
-                  }
-                </div>
-                }
                 <button (click)="mail()" class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600">Submit</button>
               </div>
             </form>

bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts

@@ -111,6 +111,16 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
         { label: this.listing.location.name ? 'City' : 'County', value: this.listing.location.name ? this.listing.location.name : this.listing.location.county },
         { label: 'Asking Price:', value: `$${this.listing.price?.toLocaleString()}` },
         { label: 'Listed since', value: `${this.dateInserted()} - ${this.getDaysListed()} days` },
+        {
+          label: 'Listing by',
+          value: null, // Wird nicht verwendet
+          isHtml: true,
+          isListingBy: true, // Flag für den speziellen Fall
+          user: this.listingUser, // Übergebe das User-Objekt
+          imagePath: this.listing.imagePath,
+          imageBaseUrl: this.env.imageBaseUrl,
+          ts: this.ts,
+        },
       ];
       if (this.listing.draft) {
         this.propertyDetails.push({ label: 'Draft', value: this.listing.draft ? 'Yes' : 'No' });