Skip to content

Commit

Permalink
fix missing Contract in DPV Legal Basis section
Browse files Browse the repository at this point in the history
- contract was missing in DPV legal basis section (HTML)
- fixed by generating the hierarchy without a head concept
- issue is caused by Contract having parents from two different modules
  - dpv:LegalBasis and dpv:Agreement (Organisational measure)
- future work here requires a fix to detect such overlapping concept and
  ensure they are not removed from the hierarchy
- fix is in 300_generate_HTML.py function organise_hierarchy
  • Loading branch information
coolharsh55 committed Jun 29, 2024
1 parent a921489 commit 5ddcf01
Show file tree
Hide file tree
Showing 5 changed files with 169 additions and 1 deletion.
42 changes: 42 additions & 0 deletions 2.0/dpv/dpv-en.html
Original file line number Diff line number Diff line change
Expand Up @@ -4117,6 +4117,46 @@ <h2>Legal Bases</h2>
<aside class="issue" data-number="111"></aside>

<div class="list-hierarchy"><ul class="concept-list">
<li>
<strong>dpv:Contract</strong>: Creation, completion, fulfilment, or performance of a contract involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#Contract" class="local-link">go to full definition</a></small>
<ul class="concept-list">
<li>
<strong>dpv:ContractPerformance</strong>: Fulfilment or performance of a contract involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#ContractPerformance" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataControllerContract</strong>: Creation, completion, fulfilment, or performance of a contract, with Data Controllers as parties being Joint Data Controllers, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataControllerContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataProcessorContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Data Processor as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataProcessorContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataSubjectContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Data Subject as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataSubjectContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:EnterIntoContract</strong>: Processing necessary to enter into contract
<small><a href="https://w3id.org/dpv#EnterIntoContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:ThirdPartyContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Third Party as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#ThirdPartyContract" class="local-link">go to full definition</a></small>

</li>
</ul>
</li>
<li>
<strong>dpv:LegalBasis</strong>: Legal basis used to justify processing of data or use of technology in accordance with a law
<small><a href="https://w3id.org/dpv#LegalBasis" class="local-link">go to full definition</a></small>
<ul class="concept-list">
<li>
<strong>dpv:Consent</strong>: Consent of the Data Subject for specified process or activity
<small><a href="https://w3id.org/dpv#Consent" class="local-link">go to full definition</a></small>
Expand Down Expand Up @@ -4180,6 +4220,8 @@ <h2>Legal Bases</h2>
</li>
</ul>
</li>
</ul>
</li>
</ul></div>

<section id="vocab-legal-basis-consent">
Expand Down
42 changes: 42 additions & 0 deletions 2.0/dpv/dpv.html
Original file line number Diff line number Diff line change
Expand Up @@ -4117,6 +4117,46 @@ <h2>Legal Bases</h2>
<aside class="issue" data-number="111"></aside>

<div class="list-hierarchy"><ul class="concept-list">
<li>
<strong>dpv:Contract</strong>: Creation, completion, fulfilment, or performance of a contract involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#Contract" class="local-link">go to full definition</a></small>
<ul class="concept-list">
<li>
<strong>dpv:ContractPerformance</strong>: Fulfilment or performance of a contract involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#ContractPerformance" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataControllerContract</strong>: Creation, completion, fulfilment, or performance of a contract, with Data Controllers as parties being Joint Data Controllers, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataControllerContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataProcessorContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Data Processor as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataProcessorContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataSubjectContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Data Subject as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataSubjectContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:EnterIntoContract</strong>: Processing necessary to enter into contract
<small><a href="https://w3id.org/dpv#EnterIntoContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:ThirdPartyContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Third Party as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#ThirdPartyContract" class="local-link">go to full definition</a></small>

</li>
</ul>
</li>
<li>
<strong>dpv:LegalBasis</strong>: Legal basis used to justify processing of data or use of technology in accordance with a law
<small><a href="https://w3id.org/dpv#LegalBasis" class="local-link">go to full definition</a></small>
<ul class="concept-list">
<li>
<strong>dpv:Consent</strong>: Consent of the Data Subject for specified process or activity
<small><a href="https://w3id.org/dpv#Consent" class="local-link">go to full definition</a></small>
Expand Down Expand Up @@ -4180,6 +4220,8 @@ <h2>Legal Bases</h2>
</li>
</ul>
</li>
</ul>
</li>
</ul></div>

<section id="vocab-legal-basis-consent">
Expand Down
42 changes: 42 additions & 0 deletions 2.0/dpv/index-en.html
Original file line number Diff line number Diff line change
Expand Up @@ -4117,6 +4117,46 @@ <h2>Legal Bases</h2>
<aside class="issue" data-number="111"></aside>

<div class="list-hierarchy"><ul class="concept-list">
<li>
<strong>dpv:Contract</strong>: Creation, completion, fulfilment, or performance of a contract involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#Contract" class="local-link">go to full definition</a></small>
<ul class="concept-list">
<li>
<strong>dpv:ContractPerformance</strong>: Fulfilment or performance of a contract involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#ContractPerformance" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataControllerContract</strong>: Creation, completion, fulfilment, or performance of a contract, with Data Controllers as parties being Joint Data Controllers, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataControllerContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataProcessorContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Data Processor as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataProcessorContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataSubjectContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Data Subject as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataSubjectContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:EnterIntoContract</strong>: Processing necessary to enter into contract
<small><a href="https://w3id.org/dpv#EnterIntoContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:ThirdPartyContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Third Party as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#ThirdPartyContract" class="local-link">go to full definition</a></small>

</li>
</ul>
</li>
<li>
<strong>dpv:LegalBasis</strong>: Legal basis used to justify processing of data or use of technology in accordance with a law
<small><a href="https://w3id.org/dpv#LegalBasis" class="local-link">go to full definition</a></small>
<ul class="concept-list">
<li>
<strong>dpv:Consent</strong>: Consent of the Data Subject for specified process or activity
<small><a href="https://w3id.org/dpv#Consent" class="local-link">go to full definition</a></small>
Expand Down Expand Up @@ -4180,6 +4220,8 @@ <h2>Legal Bases</h2>
</li>
</ul>
</li>
</ul>
</li>
</ul></div>

<section id="vocab-legal-basis-consent">
Expand Down
42 changes: 42 additions & 0 deletions 2.0/dpv/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4117,6 +4117,46 @@ <h2>Legal Bases</h2>
<aside class="issue" data-number="111"></aside>

<div class="list-hierarchy"><ul class="concept-list">
<li>
<strong>dpv:Contract</strong>: Creation, completion, fulfilment, or performance of a contract involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#Contract" class="local-link">go to full definition</a></small>
<ul class="concept-list">
<li>
<strong>dpv:ContractPerformance</strong>: Fulfilment or performance of a contract involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#ContractPerformance" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataControllerContract</strong>: Creation, completion, fulfilment, or performance of a contract, with Data Controllers as parties being Joint Data Controllers, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataControllerContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataProcessorContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Data Processor as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataProcessorContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:DataSubjectContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Data Subject as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#DataSubjectContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:EnterIntoContract</strong>: Processing necessary to enter into contract
<small><a href="https://w3id.org/dpv#EnterIntoContract" class="local-link">go to full definition</a></small>

</li>
<li>
<strong>dpv:ThirdPartyContract</strong>: Creation, completion, fulfilment, or performance of a contract, with the Data Controller and Third Party as parties, and involving specified processing of data or technologies
<small><a href="https://w3id.org/dpv#ThirdPartyContract" class="local-link">go to full definition</a></small>

</li>
</ul>
</li>
<li>
<strong>dpv:LegalBasis</strong>: Legal basis used to justify processing of data or use of technology in accordance with a law
<small><a href="https://w3id.org/dpv#LegalBasis" class="local-link">go to full definition</a></small>
<ul class="concept-list">
<li>
<strong>dpv:Consent</strong>: Consent of the Data Subject for specified process or activity
<small><a href="https://w3id.org/dpv#Consent" class="local-link">go to full definition</a></small>
Expand Down Expand Up @@ -4180,6 +4220,8 @@ <h2>Legal Bases</h2>
</li>
</ul>
</li>
</ul>
</li>
</ul></div>

<section id="vocab-legal-basis-consent">
Expand Down
2 changes: 1 addition & 1 deletion code/jinja2_resources/template_dpv.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@

<aside class="issue" data-number="111"></aside>

{{ list_hierarchy(modules['legal_basis']['classes'], head='dpv:LegalBasis') }}
{{ list_hierarchy(modules['legal_basis']['classes']) }}

<section id="vocab-legal-basis-consent">
<h3>Consent</h3>
Expand Down

0 comments on commit 5ddcf01

Please sign in to comment.