Skip to content

Commit 6015125

Browse files
authored
Merge pull request #561 from bcgov/oleks
BL stories: DSS-735, DSS-693, DSS-736, DSS-738, DSS-708
2 parents 215f70c + d9cd627 commit 6015125

30 files changed

+911
-123
lines changed

frontend/src/app/app.routes.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { PageNotFoundComponent } from './common/components/page-not-found/page-n
99
import { approvedUserGuard } from './common/guards/approved-user.guard';
1010
import { activeUserGuard } from './common/guards/active-user.guard';
1111
import { accessRequestTokenGuard } from './common/guards/access-request-token.guard';
12-
import { listing_file_upload, listing_read, role_read, role_write, takedown_action, upload_history_read, user_read, user_write } from './common/consts/permissions.const';
12+
import { licence_file_upload, listing_file_upload, listing_read, role_read, role_write, takedown_action, upload_history_read, user_read, user_write } from './common/consts/permissions.const';
1313
import { hasPermissionsGuard } from './common/guards/has-permissions.guard';
1414
import { TermsAndConditionsComponent } from './common/components/terms-and-conditions/terms-and-conditions.component';
1515
import { areTermsAceptedGuard } from './common/guards/are-terms-acepted.guard';
@@ -23,6 +23,7 @@ import { RolesListComponent } from './features/components/roles-list/roles-list.
2323
import { RoleDetailsComponent } from './features/components/roles-list/role-details/role-details.component';
2424
import { UserDetailsComponent } from './features/components/user-management/user-details/user-details.component';
2525
import { ExportListingsComponent } from './features/components/export-listings/export-listings.component';
26+
import { UploadBusinessLicenseComponent } from './features/components/upload-business-license/upload-business-license.component';
2627

2728
export const routes: Routes = [
2829
{
@@ -36,6 +37,12 @@ export const routes: Routes = [
3637
component: UploadListingsComponent,
3738
data: { permissions: [listing_file_upload] }
3839
},
40+
{
41+
path: 'upload-business-licence-data',
42+
canActivate: [approvedUserGuard, activeUserGuard, areTermsAceptedGuard, hasPermissionsGuard],
43+
component: UploadBusinessLicenseComponent,
44+
data: { permissions: [licence_file_upload] }
45+
},
3946
{
4047
path: 'upload-listing-history',
4148
canActivate: [approvedUserGuard, activeUserGuard, areTermsAceptedGuard, hasPermissionsGuard],

frontend/src/app/common/components/upload-file/upload-file.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export class UploadFileComponent {
5151
}
5252

5353
this.filesSelected.emit(validFiles);
54+
(fileInput as any).value = null;
5455
}
5556
});
5657

frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h2>Platform Upload History</h2>
2-
<p-card *ngIf="currentUser">
2+
<p-card *ngIf="currentUser" class="upload-history-card">
33
<div class="form-group-row" *ngIf="!isSmall && currentUser.organizationType !== 'Platform'">
44
<div class="form-group-row-col">
55
<label for="platformId">Select Platform</label>

frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
:host {
22
width: 100%;
3+
background-color: #FFFFFF;
34

45
h2 {
56
padding: 0;
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
export interface BusinessLicence {
2+
3+
businessLicenceId: number;
4+
5+
updDtm: string;
6+
7+
businessNm?: string;
8+
physicalRentalAddressTxt: string;
9+
10+
businessLicenceNo: string;
11+
licenceTypeTxt: string;
12+
expiryDt: string;
13+
licenceStatusType: 'ISSUED' | 'EXPIRED' | 'SUSPENDED' | 'REVOKED' | 'CANCELLED' | 'PENDING';
14+
restrictionTxt?: string;
15+
16+
businessOwnerNm?: string;
17+
businessOwnerEmailAddressDsc?: string;
18+
businessOwnerPhoneNo?: string;
19+
20+
businessOperatorNm?: string;
21+
businessOperatorEmailAddressDsc?: string;
22+
businessOperatorPhoneNo?: string;
23+
24+
propertyZoneTxt?: string;
25+
availableBedroomsQty: number;
26+
maxGuestsAllowedQty: number;
27+
isPrincipalResidence: boolean;
28+
isOwnerLivingOnsite: boolean;
29+
isOwnerPropertyTenant: boolean;
30+
infractionTxt?: string;
31+
infractionDt?: string;
32+
33+
propertyFolioNo?: string;
34+
propertyParcelIdentifierNo?: string;
35+
propertyLegalDescriptionTxt?: string;
36+
37+
providingOrganizationId: number;
38+
affectedByPhysicalAddressId: number;
39+
updUserGuid: string;
40+
licenceStatus: {
41+
licenceStatusType: "ISSUED";
42+
licenceStatusTypeNm: "Issued";
43+
licenceStatusSortNo: number;
44+
}
45+
46+
mailingStreetAddressTxt: string;
47+
mailingCityNm: string;
48+
mailingProvinceCd: string;
49+
mailingPostalCd: string;
50+
}

frontend/src/app/common/models/listing-details.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { BusinessLicence } from "./business-licence";
2+
13
export interface ListingDetails {
24
rentalListingId: number;
35
listingStatusType: 'N' | 'I' | 'R' | 'A' | 'T';
@@ -44,6 +46,7 @@ export interface ListingDetails {
4446
actionHistory: Array<ListingDetailsActionHistory>;
4547
hasAtLeastOneValidHostEmail: boolean;
4648
hostsInfo: Array<ListingDetailsHostInfo>;
49+
bizLicenceInfo: BusinessLicence;
4750
}
4851

4952
export interface ListingDetailsWithHostCheckboxExtension extends ListingDetails {

frontend/src/app/common/models/listing-filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export interface ListingFilter {
88
};
99
byLocation: {
1010
isPrincipalResidenceRequired: '' | 'Yes' | 'No';
11-
isBusinessLicenseRequired: '' | 'Yes' | 'No';
11+
isBusinessLicenceRequired: '' | 'Yes' | 'No';
1212
};
1313
community: number;
1414
}

frontend/src/app/common/models/listing-search-request.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ export interface ListingSearchRequest {
44
url?: string;
55
listingId?: string;
66
hostName?: string;
7-
businessLicense?: string;
7+
businessLicence?: string;
88
}

frontend/src/app/common/models/listing-search-state.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export interface ListingSearchState {
22
searchTerm?: string;
3-
searchBy?: 'all' | 'address' | 'url' | 'listingId' | 'hostName' | 'businessLicense';
3+
searchBy?: 'all' | 'address' | 'url' | 'listingId' | 'hostName' | 'businessLicence';
44
sortColumn?: string;
55
sortDirection?: 'asc' | 'desc';
66
pageNumber?: number;

frontend/src/app/common/models/listing-table-row.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export interface ListingTableRow {
88
isEntireUnit: boolean;
99
nightsBookedYtdQty: number;
1010
businessLicenceNo: string;
11+
businessLicenceNoMatched: string;
1112
lastActionNm: string;
1213
lastActionDtm: string;
1314

0 commit comments

Comments
 (0)