Merge pull request #94 from StudentsAgainstCovid19/develop

Continuous release
StudentsAgainstCovid19 · Jul 22, 2020 · c0aa4d1 · c0aa4d1
2 parents 9eeee57 + 46cedff
commit c0aa4d1
Show file tree

Hide file tree

Showing 48 changed files with 47,786 additions and 40,397 deletions.
diff --git a/src/assets/icons/blur_filter.svg b/src/assets/icons/blur_filter.svg
diff --git a/src/assets/icons/check-circle.svg b/src/assets/icons/check-circle.svg
diff --git a/src/assets/icons/checkbox_not_set.svg b/src/assets/icons/checkbox_not_set.svg
diff --git a/src/assets/icons/close_button.svg b/src/assets/icons/close_button.svg
diff --git a/src/assets/icons/exampleWellbeingHistory.svg b/src/assets/icons/exampleWellbeingHistory.svg
diff --git a/src/assets/icons/example_progressbar.svg b/src/assets/icons/example_progressbar.svg
diff --git a/src/assets/icons/help.svg b/src/assets/icons/help.svg
diff --git a/src/assets/icons/last_button.svg b/src/assets/icons/last_button.svg
diff --git a/src/assets/icons/list_button.svg b/src/assets/icons/list_button.svg
diff --git a/src/assets/icons/list_button2.svg b/src/assets/icons/list_button2.svg
diff --git a/src/assets/icons/next_button.svg b/src/assets/icons/next_button.svg
diff --git a/src/assets/icons/reset_zoom.svg b/src/assets/icons/reset_zoom.svg
diff --git a/src/assets/icons/search_magnifier.svg b/src/assets/icons/search_magnifier.svg
diff --git a/src/assets/icons/wellbeing_slider.svg b/src/assets/icons/wellbeing_slider.svg
diff --git a/src/assets/markers/example_pie_chart.svg b/src/assets/markers/example_pie_chart.svg
diff --git a/src/assets/markers/high_prio.svg b/src/assets/markers/high_prio.svg
diff --git a/src/assets/markers/intermed_prio.svg b/src/assets/markers/intermed_prio.svg
diff --git a/src/assets/markers/lower_prio.svg b/src/assets/markers/lower_prio.svg
diff --git a/src/assets/markers/tried_call.svg b/src/assets/markers/tried_call.svg
diff --git a/src/assets/markers/veryhigh_prio.svg b/src/assets/markers/veryhigh_prio.svg
diff --git a/src/assets/wellbeing_indicators/wellbeing_bad.svg b/src/assets/wellbeing_indicators/wellbeing_bad.svg
diff --git a/src/assets/wellbeing_indicators/wellbeing_good.svg b/src/assets/wellbeing_indicators/wellbeing_good.svg
diff --git a/src/assets/wellbeing_indicators/wellbeing_intermediate.svg b/src/assets/wellbeing_indicators/wellbeing_intermediate.svg
diff --git a/src/assets/wellbeing_indicators/wellbeing_verybad.svg b/src/assets/wellbeing_indicators/wellbeing_verybad.svg
diff --git a/src/assets/wellbeing_indicators/wellbeing_verygood.svg b/src/assets/wellbeing_indicators/wellbeing_verygood.svg
diff --git a/src/css/detailed_view.css b/src/css/detailed_view.css
@@ -499,4 +499,10 @@ input[type="checkbox"] {
 
 #wellbeingHistorySpaceRight {
     padding-right: 2em;
-}
+}
+
+.disabledButton{
+    background: lightgray;
+    border: 3px solid lightgray;
+    cursor: auto;
+}
diff --git a/src/css/interaction_props.css b/src/css/interaction_props.css
@@ -159,13 +159,20 @@
     position: absolute;
     top: 1%;
     right: 1%;
-    width: 200px;
-    height: 20px;
+    width: 250px;
+    height: 25px;
     background-color: transparent;
     display: flex;
     z-index: 5;
 }
 
+#progressBar {
+    border-style: solid;
+    border-radius: 13px;
+    border-width: 1px;
+    border-color: black;
+}
+
 #actionBar {
     left: 1%;
     bottom: 1%;

diff --git a/src/dtd/district.dtd b/src/dtd/district.dtd
@@ -0,0 +1,14 @@
+<?xml encoding="UTF-8"?>
+
+<!ELEMENT List (item)*>
+
+<!ELEMENT item (id,name,city,postalCode,geometry)>
+<!ELEMENT id (#PCDATA)>
+<!ELEMENT city (#PCDATA)>
+<!ELEMENT postalCode (#PCDATA)>
+<!ELEMENT geometry (name,ring)>
+<!ELEMENT ring (point)+>
+<!ELEMENT point (lon,lat)>
+<!ELEMENT lon (#PCDATA)>
+<!ELEMENT lat (#PCDATA)>
+<!ELEMENT name (#PCDATA)>
diff --git a/src/dtd/district_analytics.dtd b/src/dtd/district_analytics.dtd
@@ -0,0 +1,16 @@
+<?xml encoding="UTF-8"?>
+
+<!ELEMENT Set (item)*>
+
+<!ELEMENT item (id,name,city,area,postalCode,infected,geometry)>
+<!ELEMENT id (#PCDATA)>
+<!ELEMENT city (#PCDATA)>
+<!ELEMENT area (#PCDATA)>
+<!ELEMENT postalCode (#PCDATA)>
+<!ELEMENT infected (#PCDATA)>
+<!ELEMENT geometry (name,ring)>
+<!ELEMENT ring (point)+>
+<!ELEMENT point (lon,lat)>
+<!ELEMENT lon (#PCDATA)>
+<!ELEMENT lat (#PCDATA)>
+<!ELEMENT name (#PCDATA)>
diff --git a/src/dtd/help_popup.dtd b/src/dtd/help_popup.dtd
@@ -0,0 +1,9 @@
+<?xml encoding="UTF-8"?>
+
+<!ELEMENT helpPages (helpPage)*>
+
+<!ELEMENT helpPage (id,name,operation,path)>
+<!ELEMENT id (#PCDATA)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT operation (#PCDATA)>
+<!ELEMENT path (#PCDATA)>
diff --git a/src/help/colors.html b/src/help/colors.html
@@ -1,7 +1,8 @@
-<!DOCTYPE html>
-<html lang="de">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+        "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de">
     <head>
-        <meta charset="UTF-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <title>Colors</title>
 
         <link rel="stylesheet" href="../css/scrollbars.css" type="text/css" />

diff --git a/src/help/help_popup.xml b/src/help/help_popup.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE helpPages SYSTEM "https://www.corona-aid-ka.de/dtd/help_popup.dtd">
 <helpPages>
     <helpPage>
         <id>1</id>

diff --git a/src/help/navigation.html b/src/help/navigation.html
@@ -1,7 +1,8 @@
-<!DOCTYPE html>
-<html lang="de">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+        "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de">
     <head>
-        <meta charset="UTF-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <title>Navigation / Buttons</title>
 
         <link rel="stylesheet" href="../css/scrollbars.css" type="text/css" />

diff --git a/src/help/optimization.html b/src/help/optimization.html
@@ -1,7 +1,8 @@
-<!DOCTYPE html>
-<html lang="de">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+        "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de">
     <head>
-        <meta charset="UTF-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <title>Optimierung</title>
 
         <link rel="stylesheet" href="../css/scrollbars.css" type="text/css" />

diff --git a/src/help/piecharts.html b/src/help/piecharts.html
@@ -1,7 +1,8 @@
-<!DOCTYPE html>
-<html lang="de">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+        "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de">
     <head>
-        <meta charset="UTF-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <title>Tortendiagramme</title>
 
         <link rel="stylesheet" href="../css/scrollbars.css" type="text/css" />

diff --git a/src/help/priority.html b/src/help/priority.html
@@ -1,7 +1,8 @@
-<!DOCTYPE html>
-<html lang="de">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+        "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de">
     <head>
-        <meta charset="UTF-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <title>Prioritäten</title>
 
         <link rel="stylesheet" href="../css/scrollbars.css" type="text/css" />