TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
ABB infoscreen fixes

See merge request vtmk/web2.0!107
This commit is contained in:
Aarni Halinen
2018-02-01 22:22:02 +02:00
parent fe71f24ced a56e8ef241
commit f9bb4bba25
6 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ilmotunkki/README.md
+37 -37
View File
@@ -1,49 +1,49 @@
# Ilmotunkki
## Terms
- Signup, Form with collection of questions
- Response, One answer to some signup
- Quota, Amount of people allowed to respond with some option selected.
- In generic case there is no option and quota is just max number of people.
- Signup, Form with collection of questions
- Response, One answer to some signup
- Quota, Amount of people allowed to respond with some option selected.
- In generic case there is no option and quota is just max number of people.
## Requirements
- Officials may generate signups forms
- Officials may see results from signups
- Officials may see some stats from their signups
- for example distributions of multiple choice answers
- Officials should be able to edit signups wherever possible
- Propably not possible to edit after first response
- Officials should be able to delete responses
- Officials should be able to embed payment information to the signup?
- TODO: is there need for unique reference numbers for every response?
- Officials should be able to save a signup to a reusable template.
- Possibility to save templates?
- Officials may generate signups forms
- Officials may see results from signups
- Officials may see some stats from their signups
- for example distributions of multiple choice answers
- Officials should be able to edit signups wherever possible
- Propably not possible to edit after first response
- Officials should be able to delete responses
- Officials should be able to embed payment information to the signup?
- TODO: is there need for unique reference numbers for every response?
- Officials should be able to save a signup to a reusable template.
- Possibility to save templates?
- Signup may be attached to an event
- Multiple signups to a single event should be possible (FTMK uses for museum visits? Erna asked if it was possible in old web)
- Possibility for external service (Google Form, URL will suffice)
- Signup may be attached to an event
- Multiple signups to a single event should be possible (FTMK uses for museum visits? Erna asked if it was possible in old web)
- Possibility for external service (Google Form, URL will suffice)
- Signup should support custom quotas
- Atleast quotas from multiple choices and checkboxes
- Text quotas are risky (typos everywhere!!)
- Signup should have start and end times
- signup should support atleast following questiontypes
- Text
- multiple choice (select one)
- checkbox (boolean yes/no)
- Signup should support custom quotas
- Atleast quotas from multiple choices and checkboxes
- Text quotas are risky (typos everywhere!!)
- Signup should have start and end times
- Signup should support atleast following questiontypes
- Text
- multiple choice (select one)
- checkbox (boolean yes/no)
- Signup should support reserve slots.
TODO: quota based reserves or generic? or both?
- Signup should support reserve slots.
- TODO: quota based reserves or generic? or both?
- Responding should send confirm email
- Response should be editable by responder and only by the responder until the closing of the signup
- TODO: is there need to custom edit period or disable?
- Responding should send confirm email
- Response should be editable by responder and only by the responder until the closing of the signup
- TODO: is there need to custom edit period or disable?
- Responders should see amount of quotas left.
- Responders should see some information about other responses
- TODO: names? should this be editable by officials?
- Or superadmin can edit and the one signing up within edit period
- NOTE: Quota related info is exposed if any info is printed
- When quotas need to be hidden? PoTa?
- Responders should see amount of quotas left.
- Responders should see some information about other responses
- TODO: names? should this be editable by officials?
- Or superadmin can edit and the one signing up within edit period
- NOTE: Quota related info is exposed if any info is printed
- When quotas need to be hidden? PoTa?
infoscreen/static/infoscreen/css/abb.css
+4 -1
View File
@@ -2,7 +2,10 @@ body {
font-family: 'Open Sans', sans-serif;
}
#header {
#header:after {
content: " ";
display: block;
clear: both;
}
#header-logo {
infoscreen/static/infoscreen/html/abb.html
+1 -1
View File
@@ -28,6 +28,6 @@
<!-- If there are no jobs, show a static image -->
<div class="row" ng-if="jobs.length == 0">
<img src="/static/img/ABB_uralle.png" style="position:absolute;left:0;top:0;width:100vw;">
<img src="/static/infoscreen/img/ABB_uralle.png" style="position:absolute;left:0;top:0;width:100vw;">
</div>
</div>
locale/en/LC_MESSAGES/django.po
+8 -11
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-30 15:54+0200\n"
"POT-Creation-Date: 2018-02-01 22:11+0200\n"
"PO-Revision-Date: 2017-11-02 23:09+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -237,7 +237,7 @@ msgstr "Kaehmy comment"
msgid "Kaehmykommentit"
msgstr "Kaehmy comments"
#: kaehmy/models.py:58 ohlhafv/models.py:38
#: kaehmy/models.py:58 ohlhafv/models.py:37
msgid "Message"
msgstr ""
@@ -839,18 +839,14 @@ msgid "Victim"
msgstr ""
#: ohlhafv/models.py:35
msgid "Challenger email"
msgstr ""
#: ohlhafv/models.py:36
msgid "Victim email"
msgstr ""
#: ohlhafv/models.py:37
#: ohlhafv/models.py:36
msgid "Series"
msgstr ""
#: ohlhafv/models.py:42
#: ohlhafv/models.py:41
msgid "Ohlhafv challenge: {} vs. {}"
msgstr ""
@@ -867,8 +863,9 @@ msgid "-sarjassa"
msgstr "series"
#: ohlhafv/templates/email.html:6
msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3"
msgstr "Remeber to confirm the challenge at Smökki on Thursday 15.3. at the event"
msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.2"
msgstr ""
"Remeber to confirm the challenge at Smökki on Thursday 15.2. at the event"
#: ohlhafv/templates/email.html:8
msgid "Käy kurkkaamassa muutkin haasteet osoitteessa"
@@ -898,7 +895,7 @@ msgstr ""
msgid "Challenge"
msgstr "Challenge"
#: ohlhafv/views.py:43
#: ohlhafv/views.py:42
msgid "Sinut on haastettu Øhlhäfviin!"
msgstr "You have been challenged at Ohlhafv!"
locale/fi/LC_MESSAGES/django.po
+10 -11
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-30 15:54+0200\n"
"POT-Creation-Date: 2018-02-01 22:11+0200\n"
"PO-Revision-Date: 2017-11-02 23:04+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -242,7 +242,7 @@ msgstr "Kaehmykommentti"
msgid "Kaehmykommentit"
msgstr "Kaehmykommentit"
#: kaehmy/models.py:58 ohlhafv/models.py:38
#: kaehmy/models.py:58 ohlhafv/models.py:37
msgid "Message"
msgstr "Viesti"
@@ -844,18 +844,14 @@ msgid "Victim"
msgstr "Uhri"
#: ohlhafv/models.py:35
msgid "Challenger email"
msgstr "Haastajan sähköpostiosoite"
#: ohlhafv/models.py:36
msgid "Victim email"
msgstr "Uhrin sähköpostiosoite"
#: ohlhafv/models.py:37
#: ohlhafv/models.py:36
msgid "Series"
msgstr "Sarja"
#: ohlhafv/models.py:42
#: ohlhafv/models.py:41
msgid "Ohlhafv challenge: {} vs. {}"
msgstr "Ohlhafv-haaste: {} vs. {}"
@@ -868,11 +864,11 @@ msgid "on haastanut sinut oluenjuontimittelöön"
msgstr ""
#: ohlhafv/templates/email.html:4
msgid "-sarjassa."
msgid "-sarjassa"
msgstr ""
#: ohlhafv/templates/email.html:6
msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3."
msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.2"
msgstr ""
#: ohlhafv/templates/email.html:8
@@ -903,7 +899,7 @@ msgstr "Haasta kaverisi mittelöön!"
msgid "Challenge"
msgstr "Haasta"
#: ohlhafv/views.py:43
#: ohlhafv/views.py:42
msgid "Sinut on haastettu Øhlhäfviin!"
msgstr ""
@@ -1160,6 +1156,9 @@ msgstr "Sössö"
msgid "Corporate"
msgstr "Yritys"
#~ msgid "Challenger email"
#~ msgstr "Haastajan sähköpostiosoite"
#~ msgid "SIK Admin"
#~ msgstr "SIK Hallintapaneeli"
ohlhafv/templates/email.html
+1 -1
View File
@@ -3,6 +3,6 @@
{{ challenge.challenger }} {% trans "on haastanut sinut oluenjuontimittelöön" %} {{ challenge.get_series_display }} {% trans "-sarjassa" %}!
{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3" %}.
{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.2" %}.
{% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }}