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

Jump to bottom

Unify costs views for English and German #237

Merged
merged 6 commits into from
Nov 17, 2023
Merged

Unify costs views for English and German #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f043d6
Add files via upload
Zack-83 Nov 3, 2023
110a8ff
Delete rdmorganiser/views/costs-de.xml
Zack-83 Nov 3, 2023
985c559
Delete rdmorganiser/views/costs-en.xml
Zack-83 Nov 3, 2023
f35d24b
Update rdmorganiser/views/costs.xml
yasmindemerdash Nov 17, 2023
9fefab2
Update rdmorganiser/views/costs.xml
yasmindemerdash Nov 17, 2023
72d52ed
Update rdmorganiser/views/costs.xml
yasmindemerdash Nov 17, 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
187 changes: 0 additions & 187 deletions rdmorganiser/views/costs-en.xml
View file
Open in desktop

This file was deleted.

178 changes: 170 additions & 8 deletions rdmorganiser/views/costs-de.xml → rdmorganiser/views/costs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>costs</key>
<dc:comment/>
<title lang="en">Cost overview [de]</title>
<help lang="en">Overview of the personnel and non-personnel costs [de]</help>
<title lang="de">Kostenübersicht [de]</title>
<help lang="de">Übersicht der Personal- und Sachkosten [de]</help>
<title lang="en">Cost overview</title>
<help lang="en">Overview of the personnel and non-personnel costs</help>
<title lang="de">Kostenübersicht</title>
<help lang="de">Übersicht der Personal- und Sachkosten</help>
<catalogs/>
<template>{% load view_tags %}
{% load mathfilters %}

{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}
{% get_set 'project/dataset' as datasets %}
{% get_number 'project/costs/creation/personnel' as creationp %}
{% get_number 'project/costs/creation/non_personnel' as creationnp %}
Expand All @@ -32,8 +33,9 @@
{% get_number 'project/costs/preservation/personnel' as preservationp %}
{% get_number 'project/costs/preservation/non_personnel' as preservationnp %}

&lt;h1&gt;
Kostenübersicht&lt;/h1&gt;
{% if LANGUAGE_CODE == &quot;de&quot; %}

&lt;h1&gt;Kostenübersicht&lt;/h1&gt;

&lt;h2&gt;1. Datengröße
&lt;/h2&gt;
Expand Down Expand Up @@ -182,6 +184,166 @@
&lt;p&gt;
Wie werden die Kosten für das Datenmanagement im Projekt aufgebracht?
{% render_value 'project/costs/preservation/cover_how' %}
&lt;/p&gt;</template>
&lt;/p&gt;

{% endif %}
&lt;! --------------------------------------- Wenn die Sprache Englisch eingestellt ist --------------------------------------------------!&gt;
{% if LANGUAGE_CODE == &quot;en&quot; %}

&lt;h1&gt;Cost Overview&lt;/h1&gt;

&lt;h2&gt;1. Data Sizes
&lt;/h2&gt;

&lt;table&gt;
&lt;tr&gt;
&lt;th&gt;
&lt;b&gt;Dataset&lt;/b&gt;

&lt;/th&gt;
&lt;th&gt;
&lt;b&gt;Data size&lt;/b&gt;

&lt;/th&gt;
&lt;th&gt;
&lt;b&gt;Growth rate / Year&lt;/b&gt;
&lt;/th&gt;
&lt;/tr&gt;
{% for dataset in datasets %}
&lt;tr&gt;
&lt;td&gt;{% render_set_value dataset 'project/dataset/id' %}&lt;/td&gt;
&lt;td&gt;{% render_set_value dataset 'project/dataset/size/volume' %}&lt;/td&gt;
&lt;td&gt;{% render_set_value dataset 'project/dataset/rate' %}&lt;/td&gt;
&lt;/tr&gt;
{% endfor %}
&lt;/table&gt;

&lt;p&gt;
&lt;b&gt;
Duration of the project
&lt;/b&gt;:
{% render_value 'project/schedule/project_start' %}
bis
{% render_value 'project/schedule/project_end' %}
&lt;/p&gt;

&lt;p&gt;
To what extent will
&lt;b&gt;infrastructure resources&lt;/b&gt;
required?
{% render_value 'project/dataset/usage_infrastructure' %}
&lt;/p&gt;
&lt;h2&gt;
2. Personnel and material costs
&lt;/h2&gt;

&lt;table&gt;
&lt;tr&gt;
&lt;th&gt;
&lt;b&gt;Category&lt;/b&gt;
&lt;/th&gt;
&lt;th&gt;
&lt;b&gt;Personnel costs&lt;/b&gt;
&lt;/th&gt;
&lt;th&gt;
&lt;b&gt;Material costs&lt;/b&gt;
&lt;/th&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Data collection
&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/creation/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/creation/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Data use
&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/usage/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/usage/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Data storage
&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/storage/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/storage/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Metadata&lt;/td&gt;

&lt;td&gt;
{% render_value 'project/costs/metadata/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/metadata/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Persistent identifiers&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/pid/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/pid/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Anonymising sensitive data&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/sensitive_data/anonymization/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/sensitive_data/anonymization/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Security measures for sensitive data&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/sensitive_data/security/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/sensitive_data/security/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Copyright and property rights&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/ipr/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/ipr/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
Long-term archiving&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/preservation/personnel' %}&lt;/td&gt;
&lt;td&gt;
{% render_value 'project/costs/preservation/non_personnel' %}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;
&lt;b&gt;Total&lt;/b&gt;
&lt;/td&gt;
&lt;td&gt;
{{ creationp | addition:usagep | addition:storagep | addition:metadatap | addition:pidp | addition:anonymizationp | addition:securityp | addition:iprp | addition:preservationp }}
PM
&lt;/td&gt;
&lt;td&gt;
{{ creationnp | addition:usagenp | addition:storagenp | addition:metadatanp | addition:pidnp | addition:anonymizationnp | addition:securitynp | addition:iprnp | addition:preservationnp }}
Euro&lt;/td&gt;
&lt;/tr&gt;
&lt;/table&gt;

&lt;p&gt;
How are the costs for data management raised in the project?
{% render_value 'project/costs/preservation/cover_how' %}
&lt;/p&gt;

{% endif %}</template>
</view>
</rdmo>