Skip to content

Commit

Permalink
Merge branch 'hotfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
ychung-mot committed Sep 23, 2024
2 parents 5a6f938 + 0e0f34f commit 441eef4
Show file tree
Hide file tree
Showing 4 changed files with 231 additions and 97 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h2>Platform Upload History</h2>
<i class="pi pi-download" *ngIf="row.errors>0"></i></button>
<ng-template #zero>{{0}}</ng-template>
</td>
<td>{{ row.updDtm |date:'YYYY-MM-dd' }}</td>
<td>{{ row.updDtm |date:'yyyy-MM-dd' }}</td>
<td>{{ row.uploadedBy }}</td>
</tr>
</ng-template>
Expand Down Expand Up @@ -142,4 +142,4 @@ <h2>Platform Upload History</h2>
[currentPageReportTemplate]="'Rows per page: 10 &nbsp; {first}-{last} of {totalRecords}'"></p-paginator>
</ng-template>

</p-card>
</p-card>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="message info">
<i class="pi pi-info-circle"></i>
<strong class="message-text">Data last updated on {{dateLastUpdated
| date: 'YYYY-MM-dd'}}</strong>
| date: 'yyyy-MM-dd'}}</strong>
</div>
</ng-template>
<ng-template #warn>
Expand Down Expand Up @@ -34,4 +34,4 @@ <h4>Download listings as .CSV file</h4>

<div class="actions">
<button pButton [disabled]="!selectedJurisdiction" (click)="onDownload()">Download</button>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ <h2>Detailed Listing Information for</h2>
<td>{{ addressChange.type }}</td>
<td>{{ addressChange.platformAddress }}</td>
<td>{{ addressChange.bestMatchAddress }}</td>
<td>{{ addressChange.date |date:'YYYY-MM-dd' }}</td>
<td>{{ addressChange.date |date:'yyyy-MM-dd' }}</td>
<td>{{ addressChange.user }}</td>
</tr>
</ng-template>
Expand Down Expand Up @@ -264,7 +264,7 @@ <h2>Detailed Listing Information for</h2>
<div class="property-info-container">
<strong class="panel-header-text">Business Licence Information</strong>
<p-tag class="last-bl-update-date" *ngIf="blInfo?.updDtm">
<strong class="tag-text">BL Records Last Uploaded:</strong>{{blInfo.updDtm |date:'YYYY-MM-dd' }}
<strong class="tag-text">BL Records Last Uploaded:</strong>{{blInfo.updDtm |date:'yyyy-MM-dd' }}
</p-tag>
</div>
</ng-template>
Expand Down Expand Up @@ -307,9 +307,9 @@ <h2>Detailed Listing Information for</h2>
</div>

<div *ngIf="blInfo?.businessLicenceNo ||
blInfo?.licenceTypeTxt ||
blInfo?.expiryDt ||
blInfo?.licenceStatusType ||
blInfo?.licenceTypeTxt ||
blInfo?.expiryDt ||
blInfo?.licenceStatusType ||
blInfo?.restrictionTxt
" class="spacer-hr"></div>

Expand All @@ -321,9 +321,7 @@ <h2>Detailed Listing Information for</h2>
<strong>Licence Type:</strong> <span class="value">{{blInfo.licenceTypeTxt ||'-'}}</span>
</div>
<div *ngIf="blInfo?.expiryDt" class="row">
<strong>Expiry Date: </strong> <span class="value"
[class.status-red]="blInfo.licenceStatusType =='EXPIRED'">{{blInfo.expiryDt
|date:'YYYY-MM-dd'}}</span>
<strong>Expiry Date: </strong> <span class="value">{{blInfo.expiryDt |date:'yyyy-MM-dd'}}</span>
</div>
<div *ngIf="blInfo?.licenceStatusType" class="row">
<strong>Status:</strong> <span class="status-name value"
Expand Down Expand Up @@ -359,8 +357,8 @@ <h2>Detailed Listing Information for</h2>
<strong>Phone: </strong> <span class="value">{{blInfo.businessOwnerPhoneNo ||'-'}}</span>
</div>

<div *ngIf="blInfo?.businessOperatorNm ||
blInfo?.businessOperatorEmailAddressDsc ||
<div *ngIf="blInfo?.businessOperatorNm ||
blInfo?.businessOperatorEmailAddressDsc ||
blInfo?.businessOperatorPhoneNo" class="spacer-hr"></div>

<div *ngIf="blInfo?.businessOperatorNm" class="row">
Expand All @@ -373,11 +371,11 @@ <h2>Detailed Listing Information for</h2>
<strong>Phone: </strong> <span class="value">{{blInfo.businessOperatorPhoneNo ||'-'}}</span>
</div>

<div *ngIf="blInfo?.propertyZoneTxt ||
blInfo?.availableBedroomsQty ||
blInfo?.maxGuestsAllowedQty ||
isBoolDefined(blInfo?.isPrincipalResidence) ||
isBoolDefined(blInfo?.isOwnerLivingOnsite) ||
<div *ngIf="blInfo?.propertyZoneTxt ||
blInfo?.availableBedroomsQty ||
blInfo?.maxGuestsAllowedQty ||
isBoolDefined(blInfo?.isPrincipalResidence) ||
isBoolDefined(blInfo?.isOwnerLivingOnsite) ||
isBoolDefined(blInfo?.isOwnerPropertyTenant) ||
blInfo?.infractionTxt ||
blInfo?.infractionDt " class="spacer-hr"></div>
Expand Down Expand Up @@ -410,11 +408,11 @@ <h2>Detailed Listing Information for</h2>
</div>
<div *ngIf="blInfo?.infractionDt" class="row">
<strong>Infraction Date: </strong> <span
class="value">{{blInfo.infractionDt|date:'YYYY-MM-dd'}}</span>
class="value">{{blInfo.infractionDt|date:'yyyy-MM-dd'}}</span>
</div>

<div *ngIf="blInfo?.propertyFolioNo ||
blInfo?.propertyParcelIdentifierNo ||
<div *ngIf="blInfo?.propertyFolioNo ||
blInfo?.propertyParcelIdentifierNo ||
blInfo?.propertyLegalDescriptionTxt" class="spacer-hr"></div>

<div *ngIf="blInfo?.propertyFolioNo" class="row">
Expand Down
Loading

0 comments on commit 441eef4

Please sign in to comment.