diff --git a/README.md b/README.md
index 26a197b..91e85fa 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,21 @@
- [Bootstrap](https://getbootstrap.com/) CSS, License: [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE)
- [Bootswatch](https://bootswatch.com/default/) CSS Theme, License: [MIT License](https://github.com/thomaspark/bootswatch/blob/master/LICENSE)
- Flag symbols from [Flagpedia](https://flagpedia.net), License: public domain
+
+Was wird erfasst auf zellebene:
+
+1. eck-marker: wer hat die münze gefunden
+
+2. kreuzfarbe
+- rot wenn im original Eurocollector
+- grün wenn überprüft und einsortiert
+
+3. hintergrund-farbe:
+- blau-weiss zeilenwechsel
+- messing-gelb
+- rot = kms
+- braun = selten
+- grau = existiert nicht
+- hellgrau = unbekannt
+
+4. sonderfall: jahr komplett = grün
diff --git a/coinmanager/coinc/static/coinc/styles.css b/coinmanager/coinc/static/coinc/styles.css
index 64f3b2a..67053d3 100644
--- a/coinmanager/coinc/static/coinc/styles.css
+++ b/coinmanager/coinc/static/coinc/styles.css
@@ -17,6 +17,14 @@
along with this program. If not, see .
*/
+html, table, tr, td, div {
+ margin: 0;
+ padding: 0;
+}
+
+body {
+ margin: 5px;
+}
a, a:hover, a:active, a:visited {
text-decoration: none;
@@ -24,6 +32,10 @@ a, a:hover, a:active, a:visited {
cursor: default;
}
+a.nav-link:hover {
+ color: white !important;
+}
+
li {
padding: 0px 5px 5px 0px;
}
@@ -35,19 +47,77 @@ img.country {
table {
margin-top: 30px;
border-collapse: collapse;
- width: 500px;
+ width: 360px;
+ table-layout: fixed;
+ white-space: nowrap;
}
-table td { padding: 5px; }
+table tr {
+ height: 30px;
+}
-table > thead > tr > td {
+table td {
+ overflow: hidden;
+ vertical-align: middle;
+ white-space: nowrap;
+}
+
+table > thead > tr > th {
border-bottom: 2px solid black;
- background-color: #9fc5e8;
+ background-image: linear-gradient(0, #9fc5e8, white);
+ background-position: 100% 100%;
}
table > tbody > tr > td {
border: 1px solid gray;
+ text-align: center;
}
-table > tbody > tr:nth-of-type(odd) { background: white; }
+td > * {
+ vertical-align: middle;
+ overflow: hidden;
+}
+
+table > tbody > tr > td {
+ background-color: lightgray;
+}
+
+td.noexist {
+ background-color: gray;
+}
+
+td.brass {
+ background-color: yellow;
+}
+
+td.rare {
+ background-color: brown;
+}
+
+td.kms {
+ background-color: red;
+}
+
+td.year {
+ background-color: white;
+}
+
+td.year-finished {
+ background-color: green;
+}
+
+/*table > tbody > tr:nth-of-type(odd) { background: white; }
table > tbody > tr:nth-of-type(even) { background: lightblue; }
+table > tbody > tr > td:nth-of-type(5) { background: #ffff99; }
+table > tbody > tr > td:nth-of-type(6) { background: #ffff99; }
+table > tbody > tr > td:nth-of-type(7) { background: #ffff99; }*/
+
+div.user {
+ height:30px;
+ width:30px;
+ clip-path: polygon(100% 70%, 100% 100%, 70% 100%);
+}
+
+div.moritz {
+ background-color: red;
+}
diff --git a/coinmanager/coinc/templates/coinc/country.html b/coinmanager/coinc/templates/coinc/country.html
index 777c132..56d37de 100644
--- a/coinmanager/coinc/templates/coinc/country.html
+++ b/coinmanager/coinc/templates/coinc/country.html
@@ -1,27 +1,18 @@
-
+ |
- {{ country.name }} |
- | x € |
- |
+ {{ country.name }}{% if country.comment %} - {{ country.comment }}{% endif %}
+
+ x € |
- {% for year in country.years %}
+ {% for year in country.years %}
- {{ year }} | {% comment %}
- {% for col in row.cols %}
- {{ col.x }} |
- {% endfor %}
- {% col.special1_name %} |
- {% col.special1_x %} |
- {% col.special2_name %} |
- {% col.special2_x %} |
- {% col.special3_name %} |
- {% col.special3_x %} |
- {% endcomment %}
-
{% endfor %}
+ {{ year }} | {% for coin in country|coins:year %}
+ | {% endfor %}
+ {% endfor %}
diff --git a/coinmanager/coinc/templates/coinc/index.html b/coinmanager/coinc/templates/coinc/index.html
index 73a53e0..96027b9 100644
--- a/coinmanager/coinc/templates/coinc/index.html
+++ b/coinmanager/coinc/templates/coinc/index.html
@@ -18,9 +18,10 @@
along with this program. If not, see .
-->
-
+
+
Münzsammlung {% load static %}
diff --git a/coinmanager/coinc/views.py b/coinmanager/coinc/views.py
index e21e94b..b396b33 100644
--- a/coinmanager/coinc/views.py
+++ b/coinmanager/coinc/views.py
@@ -46,6 +46,11 @@ def navigation(countrys):
return {'countrys': countrys}
+@register.filter(name='coins')
+def coins(country, year):
+ return country['years'][year]
+
+
@register.inclusion_tag('coinc/country.html')
def show_country(country):
year_now = datetime.now().year
@@ -58,21 +63,19 @@ def show_country(country):
}
for year in range(country.euro_member_since, year_now + 1):
- c['years'][year] = {
- '1': 1,
- '2': 2,
- '5': 5,
- '10': 10,
- '20': 20,
- '50': 50,
- '100': 100,
- '200': 200,
- '200_1_name': 'name 1',
- '200_1': 200,
- '200_2_name': 'name 2',
- '200_2': 200,
- '200_3_name': 'name 3',
- '200_3': 200
+ y = str(year)[2:4]
+ c['years'][y] = {
+ '1': 'x',
+ '2': '',
+ '5': '',
+ '10': '',
+ '20': 'x',
+ '50': '',
+ '100': '',
+ '200': 'x',
+ '201': '',
+ '202': '',
+ '203': ''
}
return {'country': c}