Skip to content

Commit 146f8fd

Browse files
authored
Merge branch 'bcgov:main' into main
2 parents c3adc31 + 935428f commit 146f8fd

File tree

7 files changed

+66
-1
lines changed

7 files changed

+66
-1
lines changed

frontend/src/app/common/layout/layout.component.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ <h1 class="main-title">Short-Term Rental Data Portal</h1>
2727
</div>
2828
<div class="footer do-not-print-it" role="contentinfo">
2929
<div class="cc">© 2024 Government of British Columbia.</div>
30+
<div class="contacts">
31+
For technical support, contact <a href="mailto:DSSadmin@gov.bc.ca">DSSadmin&#64;gov.bc.ca</a>
32+
</div>
3033
</div>
3134

3235
<p-toast [life]="25000"></p-toast>

frontend/src/app/common/layout/layout.component.scss

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,28 @@
107107
position: sticky;
108108
bottom: 0;
109109
z-index: 10;
110+
111+
display: flex;
112+
justify-content: space-between;
113+
align-items: center;
114+
115+
.contacts {
116+
font-size: smaller;
117+
text-align: end;
118+
119+
a {
120+
color: #FFFFFF;
121+
text-decoration: none;
122+
123+
&:hover {
124+
text-decoration: underline;
125+
}
126+
127+
&:visited {
128+
color: #FFFFFF;
129+
}
130+
}
131+
}
110132
}
111133

112134
@media only screen and (max-width: 1500px) {

frontend/src/app/features/components/listings-table/listings-table.component.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ <h2 class="title">Individual Listings</h2>
3636
Send Takedown Request
3737
</button>
3838
</div>
39+
<div class="actions left-alignment" *ngIf="isCEU">
40+
<button pButton icon="pi pi-envelope" [disabled]="!listingsSelected" id="send_compliance_order_btn"
41+
(click)="onContactHost()">
42+
&nbsp;Contact Host
43+
</button>
44+
</div>
3945
<div class="content">
4046
<p-panel class="listing-table-panel">
4147
<ng-template pTemplate="header">

frontend/src/app/features/components/listings-table/listings-table.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,14 @@
112112
}
113113

114114
.actions {
115+
display: flex;
116+
width: 100%;
115117
padding-bottom: 12px;
116118

119+
&.left-alignment {
120+
justify-content: end;
121+
}
122+
117123
button {
118124
margin-right: 6px;
119125
}

frontend/src/app/features/components/listings-table/listings-table.component.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { RadioButtonModule } from 'primeng/radiobutton';
2929
import { FilterPersistenceService } from '../../../common/services/filter-persistence.service';
3030
import { OrganizationService } from '../../../common/services/organization.service';
3131
import { UrlProtocolPipe } from '../../../common/pipes/url-protocol.pipe';
32+
import { ListingDetails } from '../../../common/models/listing-details';
3233

3334
@Component({
3435
selector: 'app-listings-table',
@@ -76,6 +77,10 @@ export class ListingsTableComponent implements OnInit {
7677

7778
readonly addressLowScore = Number.parseInt(environment.ADDRESS_SCORE);
7879

80+
get listingsSelected(): number {
81+
return Object.keys(this.selectedListings).length;
82+
}
83+
7984
constructor(
8085
private listingService: ListingDataService,
8186
private userService: UserDataService,
@@ -179,6 +184,15 @@ export class ListingsTableComponent implements OnInit {
179184
this.router.navigate(['/bulk-takedown-request'], { queryParams: { returnUrl: this.getUrlFromState() } });
180185
}
181186

187+
onContactHost(): void {
188+
this.searchStateService.selectedListings = Object.values(
189+
this.selectedListings,
190+
) as unknown as Array<ListingDetails>;
191+
this.router.navigate(['/send-compliance-order'], {
192+
queryParams: { returnUrl: this.getUrlFromState() },
193+
});
194+
}
195+
182196
onPageChange(value: any): void {
183197
this.currentPage.pageSize = value.rows;
184198
this.currentPage.pageNumber = value.page + 1;

frontend/src/app/features/components/manage-jurisdictions/manage-jurisdictions.component.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,27 @@ <h2>Manage Jurisdictions</h2>
122122
<i class="pi pi-angle-up"
123123
*ngIf="this.sortSub && this.sortSub.prop === 'isBusinessLicenceRequired' && this.sortSub.dir === 'asc'"></i>
124124
</th>
125+
<th class="sortable-header" id="isActive_header"
126+
[class.sorted]="this.sortSub && this.sortSub.prop === 'isActive'" (click)="onSortSub('isActive')">
127+
Active
128+
<i class="pi pi-angle-down"
129+
*ngIf="this.sortSub && this.sortSub.prop === 'isActive' && this.sortSub.dir === 'desc'"></i>
130+
<i class="pi pi-angle-up"
131+
*ngIf="this.sortSub && this.sortSub.prop === 'isActive' && this.sortSub.dir === 'asc'"></i>
132+
</th>
125133
<th *ngIf="canEdit"> Update Jurisdiction Info </th>
126134
</tr>
127135
</ng-template>
128136

129137
<ng-template pTemplate="body" let-jurisdiction let-index>
130-
<tr>
138+
<tr [class.inactive-jurisdiction]="!jurisdiction.isActive">
131139
<td>{{jurisdiction.organizationNm || '-'}}</td>
132140
<td>{{jurisdiction.shapeFileId || '-'}}</td>
133141
<td>{{jurisdiction.isPrincipalResidenceRequired?'Yes':'No'}} </td>
134142
<td>{{jurisdiction.isStrProhibited?'Yes':'No'}} </td>
135143
<td>{{jurisdiction.isStraaExempt?'Yes':'No'}} </td>
136144
<td>{{jurisdiction.isBusinessLicenceRequired?'Yes':'No'}} </td>
145+
<td>{{jurisdiction.isActive?'Yes':'No'}} </td>
137146
<td *ngIf="canEdit" style="text-align: center">
138147
<a id="jurisdiction-edit-{{index}}-icon"
139148
[routerLink]="'/update-jurisdiction-information/'+jurisdiction.organizationId">

frontend/src/app/features/components/manage-jurisdictions/manage-jurisdictions.component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
background-color: #C1DDFC;
2323
}
2424
}
25+
26+
&.inactive-jurisdiction {
27+
color: #999999;
28+
background-color: #fcfcfc;
29+
}
2530
}
2631

2732
th {

0 commit comments

Comments
 (0)