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.

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

Conversation

davwas
Copy link
Contributor

@davwas davwas commented Sep 11, 2023

Short Description

Links to Ticket and related Pull-Requests

https://ticketsystem.dbildungscloud.de/browse/BC-4938
hpi-schul-cloud/dof_app_deploy#635
hpi-schul-cloud/schulcloud-server#4399
hpi-schul-cloud/schulcloud-client#3301

Changes

Data-security

Deployment

New Repos, NPM packages or vendor scripts

Screenshots of UI changes

Checklist before merging

  • QA: In addition to review, the code has been manually tested (if manual testing is possible)
  • PO: Any deviation from requirements was agreed with Product-Owner / ticket author / support-team
  • DEV: Every new component is implemented having accessibility in mind (e.g. aria-label, role property)

Notice: Please keep this Pull-Request as a Draft (or add WIP label), until it is ready to be reviewed

@davwas davwas added the waiting for review Someone should review this ASAP label Sep 11, 2023
@davwas davwas self-assigned this Sep 11, 2023
wiaderwek
wiaderwek previously approved these changes Sep 11, 2023
src/components/organisms/administration/SchoolTerms.vue Outdated Show resolved Hide resolved
src/components/organisms/administration/SchoolTerms.vue Outdated Show resolved Hide resolved
src/components/organisms/administration/SchoolTerms.vue Outdated Show resolved Hide resolved
src/main.ts Outdated Show resolved Hide resolved
>{{ link.text }}
</span>
>{{ link.text }}</span
>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Preferably adjust format like (same for lines 11-13)

<span>
    {{ link.text }}
</span>

Copy link
Contributor Author

@davwas davwas Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it looks ugly but I've changed it to remove extra spaces at the end of footer links because it has been bothering me for some time now :) let me know if you want me to revert that
image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh I wouldn't think that how we format our code should change the ui in any way, but it's not a biggie, so don't worry about it

src/components/organisms/administration/SchoolPolicy.vue Outdated Show resolved Hide resolved
>{{ link.text }}
</span>
>{{ link.text }}</span
>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh I wouldn't think that how we format our code should change the ui in any way, but it's not a biggie, so don't worry about it

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

92.6% 92.6% Coverage
0.5% 0.5% Duplication

warning The version of Java (11.0.20) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@davwas davwas removed the waiting for review Someone should review this ASAP label Sep 13, 2023
@davwas davwas merged commit 31f3013 into main Sep 13, 2023
39 checks passed
@davwas davwas deleted the BC-4938-add-school-specific-terms branch September 13, 2023 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants