show all listings, Bug Fixes

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

@@ -51,7 +51,7 @@
             </li>
           </ul>
           @if(listing && user && (user.id===listing?.userId || isAdmin())){
-          <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/editListing', listing.id]"></button>
+          <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/editBusinessListing', listing.id]"></button>
           }
         </div>
         <div class="col-12 md:col-6">

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

@@ -61,9 +61,9 @@ export class DetailsBusinessListingComponent {
     private sanitizer: DomSanitizer,
     private location: Location,
   ) {
+    this.mailinfo = { sender: {}, userId: '', email: '' };
     this.userService.getUserObservable().subscribe(user => {
       this.user = user;
-      this.mailinfo = { sender: {}, userId: '', email: user.email };
     });
     this.criteria = onChange(getCriteriaStateObject(), getSessionStorageHandler);
   }
@@ -79,6 +79,7 @@ export class DetailsBusinessListingComponent {
     return this.userService.hasAdminRole();
   }
   async mail() {
+    this.mailinfo.email = this.user.email;
     this.mailinfo.userId = this.listing.userId;
     this.mailinfo.listing = this.listing;
     await this.mailService.mail(this.mailinfo);

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

@@ -51,9 +51,10 @@
                         </ng-template> -->
           </p-galleria>
           @if(listing && user && (user.id===listing?.userId || isAdmin())){
-          <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/editListing', listing.id]"></button>
+          <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/editCommercialPropertyListing', listing.id]"></button>
           }
         </div>
+        @if (mailinfo){
         <div class="col-12 md:col-6">
           <div class="surface-card p-4 border-round p-fluid">
             <div class="font-medium text-xl text-primary text-900 mb-3">Contact The Author of This Listing</div>
@@ -85,6 +86,7 @@
             <button pButton pRipple label="Submit" icon="pi pi-file" class="w-auto" (click)="mail()"></button>
           </div>
         </div>
+        }
       </div>
       }
     </div>

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

@@ -62,9 +62,9 @@ export class DetailsCommercialPropertyListingComponent {
     private sanitizer: DomSanitizer,
     private location: Location,
   ) {
+    this.mailinfo = { sender: {}, userId: '', email: '' };
     this.userService.getUserObservable().subscribe(user => {
       this.user = user;
-      this.mailinfo = { sender: {}, userId: '', email: user.email };
     });
     this.criteria = onChange(getCriteriaStateObject(), getSessionStorageHandler);
   }
@@ -81,6 +81,7 @@ export class DetailsCommercialPropertyListingComponent {
     return this.userService.hasAdminRole();
   }
   async mail() {
+    this.mailinfo.email = this.user.email;
     this.mailinfo.userId = this.listing.userId;
     this.mailinfo.listing = this.listing;
     await this.mailService.mail(this.mailinfo);

bizmatch/src/app/pages/details/details-user/details-user.component.html

@@ -92,11 +92,12 @@
                 }
               </div>
             </li>
+            @if(businessListings?.length>0){
             <li class="flex align-items-center py-3 px-2 flex-wrap surface-ground">
-              <div class="text-500 w-full md:w-2 font-medium">My Listings For Sale</div>
+              <div class="text-500 w-full md:w-2 font-medium">My Business Listings For Sale</div>
               <div class="text-900 w-full md:w-10">
                 <div class="grid mt-0 mr-0">
-                  @for (listing of userListings; track listing) {
+                  @for (listing of businessListings; track listing) {
                   <div class="col-12 md:col-6 cursor-pointer" [routerLink]="['/details-business-listing', listing.id]">
                     <div class="p-3 border-1 surface-border border-round surface-card">
                       <div class="text-900 mb-2">
@@ -112,6 +113,30 @@
                 </div>
               </div>
             </li>
+            } @if(commercialPropListings?.length>0){
+            <li class="flex align-items-center py-3 px-2 flex-wrap surface-ground">
+              <div class="text-500 w-full md:w-2 font-medium">My Commercial Property Listings For Sale</div>
+              <div class="text-900 w-full md:w-10">
+                <div class="grid mt-0 mr-0">
+                  @for (listing of commercialPropListings; track listing) {
+                  <div class="col-12 md:col-6 cursor-pointer" [routerLink]="['/details-commercial-property-listing', listing.id]">
+                    <div class="p-3 border-1 surface-border border-round surface-card">
+                      <div class="text-900 mb-2 flex align-items-center">
+                        @if (listing.imageOrder?.length>0){
+                        <img src="property/{{ listing.imagePath }}/{{ listing.imageOrder[0] }}" class="mr-3" style="width: 45px; height: 45px" />
+                        } @else {
+                        <img src="assets/images/placeholder_properties.jpg" class="mr-3" style="width: 45px; height: 45px" />
+                        }
+                        <span class="font-medium">{{ selectOptions.getCommercialProperty(listing.type) }}</span>
+                      </div>
+                      <div class="text-700">{{ listing.title }}</div>
+                    </div>
+                  </div>
+                  }
+                </div>
+              </div>
+            </li>
+            }
           </ul>
         </div>
       </div>

bizmatch/src/app/pages/details/details-user/details-user.component.ts

@@ -5,7 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { MessageService } from 'primeng/api';
 import { GalleriaModule } from 'primeng/galleria';
 import { Observable } from 'rxjs';
-import { BusinessListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
+import { BusinessListing, CommercialPropertyListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
 import { KeyValue, ListingCriteria } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { ImageService } from '../../../services/image.service';
@@ -28,7 +28,8 @@ export class DetailsUserComponent {
   user$: Observable<User>;
   environment = environment;
   criteria: ListingCriteria;
-  userListings: BusinessListing[];
+  businessListings: BusinessListing[];
+  commercialPropListings: CommercialPropertyListing[];
   companyOverview: SafeHtml;
   offeredServices: SafeHtml;
   userLicensedIn: KeyValue[];
@@ -49,7 +50,10 @@ export class DetailsUserComponent {
     this.userLicensedIn = this.user.licensedIn.map(l => {
       return { name: l.split('|')[0], value: l.split('|')[1] };
     });
-    this.userListings = await this.listingsService.getListingByUserId(this.id);
+    const results = await Promise.all([await this.listingsService.getListingByUserId(this.id, 'business'), await this.listingsService.getListingByUserId(this.id, 'commercialProperty')]);
+    // Zuweisen der Ergebnisse zu den Member-Variablen der Klasse
+    this.businessListings = results[0];
+    this.commercialPropListings = results[1];
     this.user$ = this.userService.getUserObservable();
     this.companyOverview = this.sanitizer.bypassSecurityTrustHtml(this.user.companyOverview);
     this.offeredServices = this.sanitizer.bypassSecurityTrustHtml(this.user.offeredServices);