Refactored for uniform contributor affiliations

The <root>/contributors.json file contains the names and affiliations for contributors. The Templates (`documentation_generator/jinja2_resources`) pull this information through a filter added in `vocab_management.py`. This results in changes propogating to all documents for affiliations being edited or changed.
w3c · Sep 10, 2022 · 412aed2 · 412aed2
1 parent 2bbc91a
commit 412aed2
Show file tree

Hide file tree

Showing 34 changed files with 640 additions and 295 deletions.
diff --git a/contributors.json b/contributors.json
@@ -0,0 +1,21 @@
+{
+    "Axel Polleres": "Vienna University of Economics and Business",      
+    "Beatriz Esteves": "Universidad Politécnica de Madrid",      
+    "Bert Bos": "W3C/ERCIM",      
+    "Bud Bruegger": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein",      
+    "Elmar Kiesling": "Vienna University of Technology",      
+    "Eva Schlehahn": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein",      
+    "David Hickey": "Dublin City University",      
+    "Fajar J. Ekaputra": "Vienna University of Technology",      
+    "Georg P. Krog": "Signatu AS",      
+    "Harshvardhan J. Pandit": "ADAPT Centre, Trinity College Dublin",
+    "Javier D. Fernández": "Vienna University of Economics and Business",      
+    "Julian Flake": "University of Koblenz-Landau",      
+    "Mark Lizar": "OpenConsent/Kantara Initiative",      
+    "Paul Ryan": "Uniphar PLC",      
+    "Piero Bonatti": "Università di Napoli Federico II",      
+    "Ramisa Gachpaz Hamed": "Trinity College Dublin",      
+    "Rigo Wenning": "W3C/ERCIM",      
+    "Rob Brennan": "University College Dublin",      
+    "Simon Steyskal": "Siemens"
+}
diff --git a/documentation-generator/003_generate_respec_html.py b/documentation-generator/003_generate_respec_html.py
@@ -36,6 +36,8 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 TEMPLATE_DATA = {}
 
 G = DataGraph()
@@ -101,6 +103,7 @@ def saved_label(item):
     'prefix_this': prefix_this,
     'subclasses': get_subclasses,
     'saved_label': saved_label,
+    'generate_author_affiliation': generate_author_affiliation,
 }
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')

diff --git a/documentation-generator/003_generate_respec_html_owl.py b/documentation-generator/003_generate_respec_html_owl.py
@@ -35,6 +35,8 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 TEMPLATE_DATA = {}
 
 G = DataGraph()
@@ -107,6 +109,7 @@ def saved_label(item):
     'prefix_this': prefix_this,
     'subclasses': get_subclasses,
     'saved_label': saved_label,
+    'generate_author_affiliation': generate_author_affiliation,
 }
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')

diff --git a/documentation-generator/003_generate_respec_html_skos.py b/documentation-generator/003_generate_respec_html_skos.py
@@ -35,6 +35,8 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 TEMPLATE_DATA = {}
 
 G = DataGraph()
@@ -100,6 +102,7 @@ def saved_label(item):
     'prefix_this': prefix_this,
     'subclasses': get_subclasses,
     'saved_label': saved_label,
+    'generate_author_affiliation': generate_author_affiliation,
 }
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')

diff --git a/documentation-generator/004_generate_guides.py b/documentation-generator/004_generate_guides.py
@@ -14,9 +14,13 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 # JINJA2 for templating and generating HTML
 from jinja2 import FileSystemLoader, Environment
-JINJA2_FILTERS = {}
+JINJA2_FILTERS = {
+    'generate_author_affiliation': generate_author_affiliation,
+}
 TEMPLATE_DATA = {}
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')

diff --git a/documentation-generator/006_generate_primer.py b/documentation-generator/006_generate_primer.py
@@ -14,9 +14,13 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 # JINJA2 for templating and generating HTML
 from jinja2 import FileSystemLoader, Environment
-JINJA2_FILTERS = {}
+JINJA2_FILTERS = {
+    'generate_author_affiliation': generate_author_affiliation,
+}
 TEMPLATE_DATA = {}
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')

diff --git a/documentation-generator/jinja2_resources/template_dpv.jinja2 b/documentation-generator/jinja2_resources/template_dpv.jinja2
@@ -28,95 +28,93 @@
     editors: [
     {
       name: "Harshvardhan J. Pandit",
-      url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      url: "https://harshp.com/",
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -627,5 +625,19 @@
   </table>
 </section>
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
+
 </body>
 </html>
diff --git a/documentation-generator/jinja2_resources/template_dpv_gdpr.jinja2 b/documentation-generator/jinja2_resources/template_dpv_gdpr.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -278,5 +276,18 @@
 </section>
 {% endif %}
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>