completed export feature

parent 98aa19b3
Pipeline #21012921 canceled with stage
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-04 18:58+0000\n"
"POT-Creation-Date: 2018-04-24 14:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -18,26 +18,75 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: failmap/game/models.py:46
msgid "contest"
#: failmap/game/forms.py:68
msgid "Incorrect secret or team. Try again!"
msgstr ""
#: failmap/game/forms.py:111
#, python-format
msgid ""
"This organization %(organization)s already exists in the database for this "
"group."
msgstr ""
#: failmap/game/forms.py:193
#, python-format
msgid "Invalid or missing suffix (like .com etc): %(url)s"
msgstr ""
#: failmap/game/forms.py:201
#, python-format
msgid "URL does not resolve (anymore): %(url)s."
msgstr ""
#: failmap/game/forms.py:230
#, python-format
msgid ""
"This URL %(url)s is already in the production data for organization "
"%(organization)s"
msgstr ""
#: failmap/game/forms.py:238
#, python-format
msgid "This URL %(url)s is already suggested for organization %(organization)s"
msgstr ""
#: failmap/game/models.py:15
msgid "Contest name"
msgstr ""
#: failmap/game/models.py:47
msgid "contest"
msgstr ""
#: failmap/game/models.py:48
msgid "contests"
msgstr ""
#: failmap/game/models.py:78
#: failmap/game/models.py:60
msgid "Team name"
msgstr ""
#: failmap/game/models.py:83
msgid "team"
msgstr ""
#: failmap/game/models.py:79
#: failmap/game/models.py:84
msgid "teams"
msgstr ""
#: failmap/game/models.py:159
msgid "submission"
#: failmap/game/models.py:173
msgid "organisation submission"
msgstr ""
#: failmap/game/models.py:174
msgid "organisation submissions"
msgstr ""
#: failmap/game/models.py:237
msgid "url submission"
msgstr ""
#: failmap/game/models.py:160
msgid "submissions"
#: failmap/game/models.py:238
msgid "url submissions"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-04 18:58+0000\n"
"POT-Creation-Date: 2018-04-24 14:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -18,26 +18,85 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: failmap/game/models.py:46
msgid "contest"
#: failmap/game/forms.py:68
msgid "Incorrect secret or team. Try again!"
msgstr ""
#: failmap/game/forms.py:111
#, python-format
msgid ""
"This organization %(organization)s already exists in the database for this "
"group."
msgstr ""
#: failmap/game/forms.py:193
#, python-format
msgid "Invalid or missing suffix (like .com etc): %(url)s"
msgstr ""
#: failmap/game/forms.py:201
#, python-format
msgid "URL does not resolve (anymore): %(url)s."
msgstr ""
#: failmap/game/forms.py:230
#, python-format
msgid ""
"This URL %(url)s is already in the production data for organization "
"%(organization)s"
msgstr ""
#: failmap/game/forms.py:238
#, python-format
msgid "This URL %(url)s is already suggested for organization %(organization)s"
msgstr ""
#: failmap/game/models.py:15
#, fuzzy
#| msgid "contest"
msgid "Contest name"
msgstr "wedstrijd"
#: failmap/game/models.py:47
msgid "contest"
msgstr "wedstrijd"
#: failmap/game/models.py:48
msgid "contests"
msgstr "wedstrijden"
#: failmap/game/models.py:78
#: failmap/game/models.py:60
msgid "Team name"
msgstr ""
#: failmap/game/models.py:83
msgid "team"
msgstr "team"
#: failmap/game/models.py:79
#: failmap/game/models.py:84
msgid "teams"
msgstr "teams"
#: failmap/game/models.py:159
msgid "submission"
#: failmap/game/models.py:173
#, fuzzy
#| msgid "submission"
msgid "organisation submission"
msgstr "inzending"
#: failmap/game/models.py:174
#, fuzzy
#| msgid "submissions"
msgid "organisation submissions"
msgstr "inzendingen"
#: failmap/game/models.py:237
#, fuzzy
#| msgid "submission"
msgid "url submission"
msgstr "inzending"
#: failmap/game/models.py:160
msgid "submissions"
#: failmap/game/models.py:238
#, fuzzy
#| msgid "submissions"
msgid "url submissions"
msgstr "inzendingen"
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-04 18:58+0000\n"
"POT-Creation-Date: 2018-04-24 14:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -17,26 +17,75 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: failmap/game/models.py:46
msgid "contest"
#: failmap/game/forms.py:68
msgid "Incorrect secret or team. Try again!"
msgstr ""
#: failmap/game/forms.py:111
#, python-format
msgid ""
"This organization %(organization)s already exists in the database for this "
"group."
msgstr ""
#: failmap/game/forms.py:193
#, python-format
msgid "Invalid or missing suffix (like .com etc): %(url)s"
msgstr ""
#: failmap/game/forms.py:201
#, python-format
msgid "URL does not resolve (anymore): %(url)s."
msgstr ""
#: failmap/game/forms.py:230
#, python-format
msgid ""
"This URL %(url)s is already in the production data for organization "
"%(organization)s"
msgstr ""
#: failmap/game/forms.py:238
#, python-format
msgid "This URL %(url)s is already suggested for organization %(organization)s"
msgstr ""
#: failmap/game/models.py:15
msgid "Contest name"
msgstr ""
#: failmap/game/models.py:47
msgid "contest"
msgstr ""
#: failmap/game/models.py:48
msgid "contests"
msgstr ""
#: failmap/game/models.py:78
#: failmap/game/models.py:60
msgid "Team name"
msgstr ""
#: failmap/game/models.py:83
msgid "team"
msgstr ""
#: failmap/game/models.py:79
#: failmap/game/models.py:84
msgid "teams"
msgstr ""
#: failmap/game/models.py:159
msgid "submission"
#: failmap/game/models.py:173
msgid "organisation submission"
msgstr ""
#: failmap/game/models.py:174
msgid "organisation submissions"
msgstr ""
#: failmap/game/models.py:237
msgid "url submission"
msgstr ""
#: failmap/game/models.py:160
msgid "submissions"
#: failmap/game/models.py:238
msgid "url submissions"
msgstr ""
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-04 18:58+0000\n"
"POT-Creation-Date: 2018-04-24 14:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -18,8 +18,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: failmap/map/static/js/failmap.js:71 failmap/map/static/js/views.js:506
#: failmap/map/static/js/views.js:511 failmap/map/static/js/views.js:514
#: failmap/map/static/js/failmap.js:71 failmap/map/static/js/views.js:686
#: failmap/map/static/js/views.js:691 failmap/map/static/js/views.js:694
msgid "View Full Screen"
msgstr ""
......@@ -417,56 +417,56 @@ msgstr ""
msgid "week"
msgstr ""
#: failmap/map/static/js/views.js:127 failmap/map/static/js/views.js:130
#: failmap/map/static/js/views.js:133 failmap/map/static/js/views.js:135
#: failmap/map/static/js/views.js:137
#: failmap/map/static/js/views.js:151 failmap/map/static/js/views.js:154
#: failmap/map/static/js/views.js:157 failmap/map/static/js/views.js:159
#: failmap/map/static/js/views.js:161
msgid "Documentation"
msgstr ""
#: failmap/map/static/js/views.js:128 failmap/map/static/js/views.js:131
#: failmap/map/static/js/views.js:152 failmap/map/static/js/views.js:155
msgid "Second opinion"
msgstr ""
#: failmap/map/static/js/views.js:153
#: failmap/map/static/js/views.js:177
msgid "score perfect"
msgstr ""
#: failmap/map/static/js/views.js:155
#: failmap/map/static/js/views.js:179
msgid "score high"
msgstr ""
#: failmap/map/static/js/views.js:157
#: failmap/map/static/js/views.js:181
msgid "score medium"
msgstr ""
#: failmap/map/static/js/views.js:159
#: failmap/map/static/js/views.js:183
msgid "score low"
msgstr ""
#: failmap/map/static/js/views.js:285 failmap/map/static/js/views.js:290
#: failmap/map/static/js/views.js:320 failmap/map/static/js/views.js:325
msgid "top congratulations"
msgstr ""
#: failmap/map/static/js/views.js:286 failmap/map/static/js/views.js:291
#: failmap/map/static/js/views.js:321 failmap/map/static/js/views.js:326
msgid "top position"
msgstr ""
#: failmap/map/static/js/views.js:287
#: failmap/map/static/js/views.js:322
msgid "top fail on failmap"
msgstr ""
#: failmap/map/static/js/views.js:288 failmap/map/static/js/views.js:293
#: failmap/map/static/js/views.js:323 failmap/map/static/js/views.js:328
msgid "hastag fail"
msgstr ""
#: failmap/map/static/js/views.js:288 failmap/map/static/js/views.js:293
#: failmap/map/static/js/views.js:323 failmap/map/static/js/views.js:328
msgid "hastag failmap"
msgstr ""
#: failmap/map/static/js/views.js:292
#: failmap/map/static/js/views.js:327
msgid "top win on failmap"
msgstr ""
#: failmap/map/static/js/views.js:512
#: failmap/map/static/js/views.js:692
msgid "Exit Full Screen"
msgstr ""
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-04 18:58+0000\n"
"POT-Creation-Date: 2018-04-24 14:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -18,8 +18,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: failmap/map/static/js/failmap.js:71 failmap/map/static/js/views.js:506
#: failmap/map/static/js/views.js:511 failmap/map/static/js/views.js:514
#: failmap/map/static/js/failmap.js:71 failmap/map/static/js/views.js:686
#: failmap/map/static/js/views.js:691 failmap/map/static/js/views.js:694
msgid "View Full Screen"
msgstr "Volledig scherm"
......@@ -420,57 +420,57 @@ msgstr "Oostenrijk"
msgid "week"
msgstr "week"
#: failmap/map/static/js/views.js:127 failmap/map/static/js/views.js:130
#: failmap/map/static/js/views.js:133 failmap/map/static/js/views.js:135
#: failmap/map/static/js/views.js:137
#: failmap/map/static/js/views.js:151 failmap/map/static/js/views.js:154
#: failmap/map/static/js/views.js:157 failmap/map/static/js/views.js:159
#: failmap/map/static/js/views.js:161
msgid "Documentation"
msgstr "Documentatie"
#: failmap/map/static/js/views.js:128 failmap/map/static/js/views.js:131
#: failmap/map/static/js/views.js:152 failmap/map/static/js/views.js:155
msgid "Second opinion"
msgstr "Second opinion"
#: failmap/map/static/js/views.js:153
#: failmap/map/static/js/views.js:177
msgid "score perfect"
msgstr "perfect"
#: failmap/map/static/js/views.js:155
#: failmap/map/static/js/views.js:179
msgid "score high"
msgstr "hoog"
#: failmap/map/static/js/views.js:157
#: failmap/map/static/js/views.js:181
msgid "score medium"
msgstr "midden"
#: failmap/map/static/js/views.js:159
#: failmap/map/static/js/views.js:183
msgid "score low"
msgstr "laag"
#: failmap/map/static/js/views.js:285 failmap/map/static/js/views.js:290
#: failmap/map/static/js/views.js:320 failmap/map/static/js/views.js:325
msgid "top congratulations"
msgstr "gefeliciteerd"
#: failmap/map/static/js/views.js:286 failmap/map/static/js/views.js:291
#: failmap/map/static/js/views.js:321 failmap/map/static/js/views.js:326
msgid "top position"
msgstr "positie"
#: failmap/map/static/js/views.js:287
#: failmap/map/static/js/views.js:322
msgid "top fail on failmap"
msgstr "slechtste organisaties op faalkaart"
#: failmap/map/static/js/views.js:288 failmap/map/static/js/views.js:293
#: failmap/map/static/js/views.js:323 failmap/map/static/js/views.js:328
msgid "hastag fail"
msgstr "faal"
#: failmap/map/static/js/views.js:288 failmap/map/static/js/views.js:293
#: failmap/map/static/js/views.js:323 failmap/map/static/js/views.js:328
msgid "hastag failmap"
msgstr "faalkaart"
#: failmap/map/static/js/views.js:292
#: failmap/map/static/js/views.js:327
msgid "top win on failmap"
msgstr "beste organisaties op faalkaart"
#: failmap/map/static/js/views.js:512
#: failmap/map/static/js/views.js:692
msgid "Exit Full Screen"
msgstr "Sluit volledig scherm"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-04 18:58+0000\n"
"POT-Creation-Date: 2018-04-24 14:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -18,8 +18,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: failmap/map/static/js/failmap.js:71 failmap/map/static/js/views.js:506
#: failmap/map/static/js/views.js:511 failmap/map/static/js/views.js:514
#: failmap/map/static/js/failmap.js:71 failmap/map/static/js/views.js:686
#: failmap/map/static/js/views.js:691 failmap/map/static/js/views.js:694
msgid "View Full Screen"
msgstr "🌈"
......@@ -423,57 +423,57 @@ msgstr "🌈"
msgid "week"
msgstr "🌈"
#: failmap/map/static/js/views.js:127 failmap/map/static/js/views.js:130
#: failmap/map/static/js/views.js:133 failmap/map/static/js/views.js:135
#: failmap/map/static/js/views.js:137
#: failmap/map/static/js/views.js:151 failmap/map/static/js/views.js:154
#: failmap/map/static/js/views.js:157 failmap/map/static/js/views.js:159
#: failmap/map/static/js/views.js:161
msgid "Documentation"
msgstr "🌈"
#: failmap/map/static/js/views.js:128 failmap/map/static/js/views.js:131
#: failmap/map/static/js/views.js:152 failmap/map/static/js/views.js:155
msgid "Second opinion"
msgstr "🌈"
#: failmap/map/static/js/views.js:153
#: failmap/map/static/js/views.js:177
msgid "score perfect"
msgstr "🌈"
#: failmap/map/static/js/views.js:155
#: failmap/map/static/js/views.js:179
msgid "score high"
msgstr "🌈"
#: failmap/map/static/js/views.js:157
#: failmap/map/static/js/views.js:181
msgid "score medium"
msgstr "🌈"
#: failmap/map/static/js/views.js:159
#: failmap/map/static/js/views.js:183
msgid "score low"
msgstr "🌈"
#: failmap/map/static/js/views.js:285 failmap/map/static/js/views.js:290
#: failmap/map/static/js/views.js:320 failmap/map/static/js/views.js:325
msgid "top congratulations"
msgstr "🌈"
#: failmap/map/static/js/views.js:286 failmap/map/static/js/views.js:291
#: failmap/map/static/js/views.js:321 failmap/map/static/js/views.js:326
msgid "top position"
msgstr "🌈"
#: failmap/map/static/js/views.js:287
#: failmap/map/static/js/views.js:322
msgid "top fail on failmap"
msgstr "🌈"
#: failmap/map/static/js/views.js:288 failmap/map/static/js/views.js:293
#: failmap/map/static/js/views.js:323 failmap/map/static/js/views.js:328
msgid "hastag fail"
msgstr "🌈"
#: failmap/map/static/js/views.js:288 failmap/map/static/js/views.js:293
#: failmap/map/static/js/views.js:323 failmap/map/static/js/views.js:328
msgid "hastag failmap"
msgstr "🌈"
#: failmap/map/static/js/views.js:292
#: failmap/map/static/js/views.js:327
msgid "top win on failmap"
msgstr "🌈"
#: failmap/map/static/js/views.js:512
#: failmap/map/static/js/views.js:692
msgid "Exit Full Screen"
msgstr "🌈"
......
......@@ -47,14 +47,20 @@ Date.prototype.humanTimeStamp = function () {
// todo: the week should also be in the state.
// and this is where we slowly creep towards vuex.
var state_mixin = {
data: {
data: {
category: "",
country: ""
},
// watchers have implicit behaviour: if code is depending on two variables, setting each one seperately
// causes wathchers to execute the code twice. Therefore the watcher has been replaced by a function.
methods: {
set_state: function(country, category) {
// prevent loading when things didn't change.
if (country === this.country && category === this.category)
return;
this.country = country;
this.category = category;
this.load();
......@@ -403,6 +409,7 @@ function views() {
$.getJSON('/data/categories/' + this.country + '/', function (categories) {
// it's fine to clear the navbar if there are no categories for this country
self.categories = categories;
vueExport.categories = categories;
// but then don't clear the current category, so it's easier to go back
if (categories.length) {
......@@ -660,7 +667,18 @@ function views() {
}
});
window.vueExport = new Vue({
mixins: [translation_mixin, state_mixin],
el: '#export',
data: {
categories: Array
},
methods: {
create_link: function(category, linktype){
return '/data/export/' + linktype + '/' + this.country + '/' + category + '/';
}
}
});
window.vueFullscreen = new Vue({
......@@ -805,6 +823,7 @@ function views() {
vueLatestXXSSProtection.set_state(this.country, this.category);
vueGraphs.set_state(this.country, this.category);
vueImprovements.set_state(this.country, this.category);
vueExport.set_state(this.country, this.category);
},
// slowly moving the failmap into a vue.
load: function (week) {
......
......@@ -95,6 +95,7 @@
<li><a href="#charts">{% trans "Charts" %}</a></li>
<li><a href="#updates">{% trans "Updates" %}</a></li>
<li><a href="#report">{% trans "Report" %}</a></li>
<li><a href="#export">{% trans "Export" %}</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
{% if debug %}
......@@ -769,6 +770,44 @@
</div>
</div>
<div id="export">
<div class="page-header">
<a name="export" class="jumptonav"></a>
<h2>{% trans "Export" %}</h2>
{% trans "Export explanation" %}
<p></p>
<a href="#" class="backtomap">{% trans "back to map" %} ↑</a>
</div>
<div class="row">
<div class="col-md-12">
<table style="width:100%">
<thead>
<tr>
<th>{% trans "Category" %}</th>
<th>{% trans "List of only urls" %}</th>
<th>{% trans "Copy of organization_types" %}*</th>
<th>{% trans "Copy of organizations" %}*</th>
<th>{% trans "Copy of coordinates" %}*</th>
<th>{% trans "Copy of urls" %}*</th>
</tr>
</thead>