Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-4938 - Add school specific Terms of Use (Nutzungsordnung) for new school admin page #2799

Merged
merged 24 commits into from
Sep 13, 2023
Merged

BC-4938 - Add school specific Terms of Use (Nutzungsordnung) for new school admin page #2799

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8bc7de9
add new feature flag
davwas Sep 7, 2023
13d34b4
remove unused component
davwas Sep 7, 2023
e88d7aa
add new translations
davwas Sep 7, 2023
bc00218
add terms of use module
davwas Sep 7, 2023
d24612c
add terms of use vue components
davwas Sep 7, 2023
ccfb859
add terms of use components to school settings page
davwas Sep 7, 2023
bd0c17d
add correct link to terms of use
davwas Sep 7, 2023
2bd644b
add tests
davwas Sep 7, 2023
aed4254
Merge branch 'main' into BC-4938-add-school-specific-terms
davwas Sep 7, 2023
1fffcd6
change /datenchutz link to /privacypolicy
davwas Sep 7, 2023
b3c2fb0
remove unused files and references
davwas Sep 7, 2023
972a3f2
Merge branch 'main' into BC-4938-add-school-specific-terms
davwas Sep 11, 2023
01f8e43
remove unused reference
davwas Sep 11, 2023
140757f
adjust const names
davwas Sep 11, 2023
0cabd0f
Merge branch 'main' into BC-4938-add-school-specific-terms
davwas Sep 11, 2023
efb2878
fix test
davwas Sep 12, 2023
56b0eb8
localise date
davwas Sep 12, 2023
97ad0ff
remove unnecessary variables
davwas Sep 12, 2023
655a683
use i18n composable
davwas Sep 12, 2023
a800c93
replace inject with injectStrict
davwas Sep 12, 2023
5678c54
replace inject with injectStrict for schoolsModule
davwas Sep 12, 2023
a09df7c
Merge branch 'main' into BC-4938-add-school-specific-terms
davwas Sep 12, 2023
b47cc69
fix icons reference
davwas Sep 12, 2023
d5074ee
fix icons reference
davwas Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/components/organisms/administration/SchoolPolicy.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/>
<v-list-item v-else two-line dense class="mb-6" data-testid="policy-item">
<v-list-item-icon>
<v-icon>{{ pdfIcon }}</v-icon>
<v-icon>{{ "$file_pdf_outline" }}</v-icon>
</v-list-item-icon>
<v-list-item-content>
<v-list-item-title class="text-body-1 black--text mb-2">
Expand Down Expand Up @@ -163,7 +163,6 @@ export default defineComponent({
const error: ComputedRef<BusinessError> = computed(
() => privacyPolicyModule.getBusinessError
);
const pdfIcon = "$file_pdf_outline";

const downloadFile = () => {
const link = document.createElement("a");
Expand All @@ -187,7 +186,6 @@ export default defineComponent({
error,
mdiPencilOutline,
mdiTrayArrowDown,
pdfIcon,
downloadFile,
dayjs,
closeDialog,
Expand Down
4 changes: 1 addition & 3 deletions src/components/organisms/administration/SchoolTerms.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/>
<v-list-item v-else two-line dense class="mb-6" data-testid="terms-item">
<v-list-item-icon>
<v-icon>{{ pdfIcon }}</v-icon>
<v-icon>{{ "$file_pdf_outline" }}</v-icon>
</v-list-item-icon>
<v-list-item-content>
<v-list-item-title class="text-body-1 black--text mb-2">
Expand Down Expand Up @@ -159,7 +159,6 @@ export default defineComponent({
const error: ComputedRef<BusinessError> = computed(
() => termsOfUseModule.getBusinessError
);
const pdfIcon = "$file_pdf_outline";

const downloadFile = () => {
const link = document.createElement("a");
Expand All @@ -183,7 +182,6 @@ export default defineComponent({
error,
mdiPencilOutline,
mdiTrayArrowDown,
pdfIcon,
downloadFile,
dayjs,
closeDialog,
Expand Down