Merge branch 'module/poll' into dev

frontend/src/Components/Histogram.svelte

@@ -13,11 +13,10 @@
    }
 
    .bar {
-       display: flex;              /* flexbox for text alignment */
+       display: flex;
-       align-items: flex-end;      /* text sticks to bottom of bar */
+       align-items: flex-end;
-       height: 100%;              /* full height of flex item */
+       padding: 0 2px;
-       padding: 0 2px;          /* space for text */
+       box-sizing: border-box;
-       box-sizing: border-box;    /* include padding in height */
    }
 </style>
 

frontend/src/routes/poll/Edit.svelte

@@ -176,7 +176,7 @@
 				{/each}
 				<tr>
 					<td class="new_option">
-						{t('add element',{element:t('options')})}
+						{t('add_object',{object:t('option')})}
 						<input type="text" bind:value={new_option.name} />
 					</td>
 					<td>

frontend/src/routes/poll/Evaluate.svelte

@@ -33,23 +33,6 @@
 	onMount(load);
 </script>
 
-<style>
-	.histogram > span{
-		display: inline-block;
-		border: 1px solid lime;
-		vertical-align: bottom;
-		position: relative;
-		width: 20px;
-	}
-	.histogram{
-		height: 60px;
-	}
-	.histogram span span{
-		position: absolute;
-		bottom: 0;
-	}
-</style>
-
 {#if poll}
 <fieldset>
 	<legend>{poll.name}</legend>

translations/src/main/resources/de.json

@@ -23,6 +23,7 @@
   "allowed_states": "zulässige Status",
   "amount": "Menge",
   "archive": "archivieren",
+  "average": "Durchschnitt",
 
   "bank_account": "Bankverbindung",
   "base_url": "Basis-URL",
@@ -116,6 +117,7 @@
   "end": "Ende",
   "estimated_time": "geschätzte Zeit",
   "estimated_times": "geschätzte Zeiten",
+  "evaluate": "auswerten",
   "expand_on_click": "Anklicken zum Anzeigen",
   "extended_settings": "erweiterte Einstellungen",
 
@@ -169,6 +171,7 @@
   "hide": "ausblenden",
   "hide_closed": "geschlossene ausblenden",
   "hide_on_index_page": "nicht in der Aufgabenübersicht anzeigen",
+  "histogram": "Histogramm",
   "hours": "Stunden",
 
   "id": "Id",
@@ -263,8 +266,11 @@
 
   "oidc_Login"       : "Anmeldung mit OIDC",
   "old_password": "altes Passwort",
+  "option": "Option",
+  "options": "Optionen",
   "organization": "Organisation",
   "other_tags": "andere Tags",
+  "owner": "Eigentümer",
 
   "page": "Seite",
   "parent_task": "übergeordnete Aufgabe",
@@ -281,6 +287,7 @@
   "permission_read_only": "lesen",
   "phone": "Telefon",
   "pieces": "Stück",
+  "poll": "Umfrage",
   "polls": "Umfragen",
   "pos": "Pos",
   "position": "Position",
@@ -422,6 +429,8 @@
   "voted {count} times": "{count} mal gewählt",
 
   "website": "Website",
+  "weight": "Gewichtung",
+  "weights": "Gewichtungen",
   "welcome" : "Willkommen, {0}",
   "When shall messages be delivered?": "Wann sollen Nachrichten zugestellt werden?",
   "wiki": "Wiki",

translations/src/main/resources/en.json

@@ -23,6 +23,7 @@
   "allowed_states": "allowed states",
   "amount": "amount",
   "archive": "archive",
+  "average": "average",
 
   "bank_account": "bank account",
   "base_url": "base URL",
@@ -116,6 +117,7 @@
   "end": "end",
   "estimated_time": "estimated duration",
   "estimated_times": "estimated durations",
+  "evaluate": "evaluate",
   "expand_on_click": "click to expand",
   "extended_settings": "extended settings",
 
@@ -169,6 +171,7 @@
   "hide": "hide",
   "hide_closed": "hide closed",
   "hide_on_index_page": "hide on index page",
+  "histogram": "histogram",
   "hours": "hours",
 
   "id": "ID",
@@ -263,8 +266,11 @@
 
   "oidc_Login"       : "Login via OIDC",
   "old_password": "old password",
+  "option": "option",
+  "options": "options",
   "organization": "organization",
   "other_tags": "other tags",
+  "owner": "owner",
 
   "page": "page",
   "parent_task": "parent task",
@@ -281,6 +287,7 @@
   "permission_read_only": "read-only",
   "phone": "phone",
   "pieces": "pieces",
+  "poll": "poll",
   "polls": "polls",
   "pos": "pos",
   "position": "position",
@@ -422,6 +429,8 @@
   "voted {count} times": "voted {count} times",
 
   "website": "website",
+  "weight": "weight",
+  "weights": "weights",
   "welcome" : "Welcome, {0}",
   "When shall messages be delivered?": "When shall messages be delivered?",
   "wiki": "Wiki",