Skip to content

Commit 430f6e7

Browse files
xzzyxzzy
authored
Merge pull request #655 from shibaken/working-privacy-notice-das
Add privacy notice to DAS-legacy
2 parents 6f48ba6 + 583caa1 commit 430f6e7

1 file changed

Lines changed: 64 additions & 24 deletions

File tree

‎disturbance/frontend/disturbance/src/components/common/privacy_notice.vue‎

Lines changed: 64 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div v-if="apiaryTemplateGroup" class="privacy-notice-container">
2+
<div v-if="apiaryTemplateGroup || dasTemplateGroup" class="privacy-notice-container">
33
<div class="panel panel-info">
44
<div class="panel-heading" @click="toggleCollapse" style="cursor: pointer;">
55
<h4 class="panel-title">
@@ -10,29 +10,61 @@
1010
</div>
1111
<transition name="slide">
1212
<div v-show="isExpanded" class="panel-body">
13-
<p>
14-
The Department of Biodiversity, Conservation and Attractions (DBCA) collects this personal
15-
information to assess, approve and grant an Apiary Authority that allows you to
16-
legally carry out beekeeping activities in Western Australia's national parks, conservation
17-
reserves and certain Crown lands for beekeeping.
18-
</p>
19-
<p>
20-
You are required to provide this information under the
21-
<em>Conservation and Land Management Act 1984</em> and
22-
<em>Conservation and Land Management Regulations 2002</em>.
23-
</p>
24-
<p>
25-
If you choose not to provide personal information, you will not be able to legally carry
26-
out beekeeping activities in Western Australia's national parks, conservation reserves and
27-
certain Crown lands for beekeeping.
28-
</p>
29-
<p>
30-
For further details on how DBCA manage your personal information, you can read our
31-
<a :href="privacyPolicyUrl" target="_blank">Privacy Policy</a>.
32-
If you have any questions about how your personal information will be handled, or if you
33-
would like to access your personal information, please email
34-
<a href="mailto:privacy@dbca.wa.gov.au">privacy@dbca.wa.gov.au</a>.
35-
</p>
13+
<!-- DAS-specific content -->
14+
<div v-if="dasTemplateGroup">
15+
<p>
16+
The Department of Biodiversity, Conservation and Attractions (DBCA) collects personal information, to:
17+
</p>
18+
<ul>
19+
<li>provide you with access to the Disturbance Approval System (DAS)</li>
20+
<li>assign users to the appropriate organisation</li>
21+
<li>enable communication regarding proposals, assessments, and approval processes</li>
22+
</ul>
23+
<p>
24+
We may share this information with:
25+
</p>
26+
<ul>
27+
<li>the relevant organisation you are seeking to be linked to, for the purpose of confirming your association</li>
28+
<li>the assigned assessor and approver of a proposal, to enable the proponent to be contacted and notified</li>
29+
</ul>
30+
<p>
31+
If you choose not to provide this information, DBCA will be unable to grant you access to DAS or link you to an organisation (including establishing a new organisation within DAS).
32+
</p>
33+
<p>
34+
For further details on how DBCA manage your personal information, you can read our
35+
<a :href="privacyPolicyUrl" target="_blank">Privacy Policy</a>.
36+
If you have any questions about how your personal information will be handled, or if you
37+
would like to access your personal information, please email DBCA at
38+
<a href="mailto:privacy@dbca.wa.gov.au">privacy@dbca.wa.gov.au</a>.
39+
</p>
40+
</div>
41+
42+
<!-- Apiary-specific content -->
43+
<div v-if="apiaryTemplateGroup">
44+
<p>
45+
The Department of Biodiversity, Conservation and Attractions (DBCA) collects this personal
46+
information to assess, approve and grant an Apiary Authority that allows you to
47+
legally carry out beekeeping activities in Western Australia's national parks, conservation
48+
reserves and certain Crown lands for beekeeping.
49+
</p>
50+
<p>
51+
You are required to provide this information under the
52+
<em>Conservation and Land Management Act 1984</em> and
53+
<em>Conservation and Land Management Regulations 2002</em>.
54+
</p>
55+
<p>
56+
If you choose not to provide personal information, you will not be able to legally carry
57+
out beekeeping activities in Western Australia's national parks, conservation reserves and
58+
certain Crown lands for beekeeping.
59+
</p>
60+
<p>
61+
For further details on how DBCA manage your personal information, you can read our
62+
<a :href="privacyPolicyUrl" target="_blank">Privacy Policy</a>.
63+
If you have any questions about how your personal information will be handled, or if you
64+
would like to access your personal information, please email
65+
<a href="mailto:privacy@dbca.wa.gov.au">privacy@dbca.wa.gov.au</a>.
66+
</p>
67+
</div>
3668
</div>
3769
</transition>
3870
</div>
@@ -46,6 +78,7 @@ export default {
4678
return {
4779
isExpanded: true,
4880
apiaryTemplateGroup: false,
81+
dasTemplateGroup: false,
4982
privacyPolicyUrl: '#'
5083
}
5184
},
@@ -59,8 +92,15 @@ export default {
5992
this.$http.get('/template_group', {
6093
emulateJSON: true
6194
}).then(res => {
95+
console.log('[PrivacyNotice] Template group:', res.body.template_group, 'Route path:', this.$route.path);
6296
if (res.body.template_group === 'apiary') {
6397
this.apiaryTemplateGroup = true;
98+
} else if (res.body.template_group === 'das' || res.body.template_group === 'disturbance') {
99+
// DAS: only display on /account/ page (with or without trailing slash)
100+
if (this.$route.path === '/account' || this.$route.path === '/account/') {
101+
this.dasTemplateGroup = true;
102+
console.log('[PrivacyNotice] DAS template group activated for /account/');
103+
}
64104
}
65105
}, err => {
66106
console.error('Error fetching template group:', err);

0 commit comments

Comments
 (0)