moritz/coinmanager
1
0
Fork 0
Code Issues 22 Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://willipink.eu:3456/moritz/coinmanager

Browse Source
This commit is contained in:
Moritz Münch 2020-05-31 21:39:39 +00:00
commit 3ad9c0e7f6
8 changed files with 158 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coinmanager/coinc/static/coinc/main.js
View File

@ -149,7 +149,7 @@ function render_response(data, td, set) {
/* add or update marker (and name) if found */ /* add or update marker (and name) if found */
if (set['found'] && set['found_by'] && set['exists']) { if (set['found'] && set['found_by'] && set['exists']) {
div_class = set['found_by']; div_class = set['found_by'];
$(td).find('div.coin span').html('').html('✔'); } $(td).find('div.coin span').html('').html('✓'); }
/* add/update name */ /* add/update name */
if ([201, 202, 203].includes(data['value'])) { if ([201, 202, 203].includes(data['value'])) {
@ -163,7 +163,7 @@ function render_response(data, td, set) {
if (div_special_name.length == 0) { if (div_special_name.length == 0) {
/* append div if not found */ /* append div if not found */
$(td).append('<div class="special' + c + '_name three_lines">' + name + '</div>'); $(td).append('<div class="special_name special' + c + '_name three_lines">' + name + '</div>');
} else if (div_special_name.length == 1) { } else if (div_special_name.length == 1) {
@ -173,7 +173,7 @@ function render_response(data, td, set) {
/* remove name */ /* remove name */
} else if (!set['exists']) { } else if (!set['exists']) {
$(td).find('div.special' + c + '_name').html(); $(td).find('div.special_name').html('');
} }
} }
@ -306,7 +306,7 @@ $(document).ready(function() {
$(td).css('cursor', 'cell'); $(td).css('cursor', 'cell');
if (response.status === 0) { if (response.status === 0) {
render_response(data, this.td, settings); render_response(data, this.td, settings);
detach('add_coin_name'); detach('#add_coin_name');
} else { } else {
alert(response.message); alert(response.message);
} }
@ -409,7 +409,7 @@ $(document).ready(function() {
if (response.status === 0) { if (response.status === 0) {
render_login(name, color); render_login(name, color);
detach('add_user'); detach('#add_user');
} else { } else {
$('#response').html(response.message); $('#response').html(response.message);
$('#response').css('color', 'red'); $('#response').css('color', 'red');

20
coinmanager/coinc/static/coinc/styles.css
View File

@ -257,10 +257,13 @@ td > * {
td.coin { td.coin {
background-color: #cec6ca; background-color: #cec6ca;
font-size: 1.1rem;
border: 2px solid white; border: 2px solid white;
font-size: 1.3rem;
font-family: sans-serif;
} }
.brass { .brass {
background-color: #dec1a8 !important; background-color: #dec1a8 !important;
} }
@ -293,13 +296,18 @@ td.coin {
/* coin div text style */ /* coin div text style */
.ec { .ec {
color: #dc3545; color: #dc3545 !important;
font-weight: bold; font-weight: bold !important;
}
@-moz-document url-prefix() {
td.ec, td.checked {
font-size: 1.7rem !important;
}
} }
.checked { .checked {
color: #28a745; color: #28a745 !important;
font-weight: bold; font-weight: bold !important;
} }
@ -315,7 +323,7 @@ div.coin {
z-index: 1000; z-index: 1000;
height: 40px; height: 40px;
width: 40px; width: 40px;
text-align: inherit; text-align: center;
line-height: 40px; line-height: 40px;
float: left; float: left;
} }

16
coinmanager/coinc/templates/coinc/coin.html
View File

@ -1,9 +1,7 @@
<td class="coin {{ td_class }}" value="{{ value }}" title="{{ name }}"> <td class="coin {{ td_class }}" value="{{ value }}" title="{{ name }}">
<div class="coin"> <div class="coin">
<span>{{ marker }}</span> <span>{{ marker }}</span>
<div class="{{ div_class }}" type="overlay"></div> <div class="{{ div_class }}" type="overlay"></div>
</div> </div>{% if name %}
{% if name %} <div class="special_name {{ special_name }} {{ special_class }}">{{ name }}</div>{% endif %}
<div class="special_name {{ special_name }} {{ special_class }}">{{ name }}</div> </td>
{% endif %}
</td>

182
coinmanager/coinc/templates/coinc/controlbar.html
View File

@ -1,108 +1,108 @@
<style type="text/css">{% for user in users %} <style type="text/css">{% for user in users %}
div.{{ user.name }} { background-color: {{ user.color }} !important; }{% endfor %} div.{{ user.name }} { background-color: {{ user.color }} !important; }{% endfor %}
</style> </style>
<button id="begin_edit" class="btn btn-info">+ hinzufügen</button> <button id="begin_edit" class="btn btn-info">+ hinzufügen</button>
<!-- navbar --> <!-- navbar -->
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-light bg-light">
{% csrf_token %} {% csrf_token %}
<!-- advanced options --> <!-- advanced options -->
<div id="advanced_options"> <div id="advanced_options">
<label for="exists" class="noexist"> <label for="exists" class="noexist">
<input id="exists" type="checkbox"> <input id="exists" type="checkbox">
Existiert nicht Existiert nicht
</label> </label>
<label for="ec" id="label_ec" class="ec"> <label for="ec" id="label_ec" class="ec">
<input id="ec" type="checkbox"> <input id="ec" type="checkbox">
Eurocollector 2002&nbsp; Eurocollector 2002&nbsp;
</label> </label>
<label for="checked" id="label_checked" class="checked"> <label for="checked" id="label_checked" class="checked">
<input id="checked" type="checkbox"> <input id="checked" type="checkbox">
Überprüft, einsortiert&nbsp; Überprüft, einsortiert&nbsp;
</label> </label>
<label for="buy_only" id="label_buy_only" class="buy_only"> <label for="buy_only" id="label_buy_only" class="buy_only">
<input id="buy_only" type="checkbox"> <input id="buy_only" type="checkbox">
Kursmünze&nbsp; Kursmünze&nbsp;
</label> </label>
<label for="circulation"> <label for="circulation">
Auflage Auflage
<input id="circulation" type="text" value="Auflage"> <input id="circulation" type="text" value="Auflage">
</label> </label>
<label for="found_on"> <label for="found_on">
Datum Datum
<input type="text" name="found_on" id="found_on" value="{% now 'd.m.Y' %}"> <input type="text" name="found_on" id="found_on" value="{% now 'd.m.Y' %}">
</label> </label>
<label for="found" id="found_label"> <label for="found" id="found_label">
<input id="found" type="checkbox" checked="checked"> <input id="found" type="checkbox" checked="checked">
Gefunden Gefunden
</label> </label>
</div>
<!-- main options -->
<div id="navbar_toggler">
<label for="found_by">
<select id="found_by" name="found_by" class="form-control">{% for user in users %}
<option value="{{ user.name }}" color="{{ user.color }}">{{ user.name }}</option>{% endfor %}
</select>
</label>
<div id="buttons">
<button id="show_add_user" class="btn btn-secondary">+ Name</button>
<button id="finish_edit" class="btn btn-success">Fertig</button>
<button id="show_advanced_options" class="btn btn-outline-secondary" aria-controls="navbar_toggler" aria-expanded="false" aria-label="Toggle advanced options"><span class="navbar-toggler-icon"></span></button>
</div> </div>
</div>
</nav>
<!-- main options --> <!-- modal add_user -->
<div id="navbar_toggler"> <div id="add_user" class="modal-container">
<label for="found_by"> <div class="modal-dialog" role="document">
<select id="found_by" name="found_by" class="form-control">{% for user in users %} <div class="modal-content">
<option value="{{ user.name }}" color="{{ user.color }}">{{ user.name }}</option>{% endfor %} <div class="modal-header">
</select> <h5 class="modal-title">Name hinzufügen</h5>
</label> <button id="add_user_close" type="button" class="close" data-dismiss="modal" aria-label="Close">
<div id="buttons"> <span aria-hidden="true">×</span>
<button id="show_add_user" class="btn btn-secondary">+ Name</button> </button>
<button id="finish_edit" class="btn btn-success">Fertig</button>
<button id="show_advanced_options" class="btn btn-outline-secondary" aria-controls="navbar_toggler" aria-expanded="false" aria-label="Toggle advanced options"><span class="navbar-toggler-icon"></span></button>
</div> </div>
</div> <div class="modal-body">
</nav> <div class="form-group">
<label for="text_user">Name</label>
<!-- modal add_user --> <input type="text" name="name" id="add_user_name" class="form-control">
<div id="add_user" class="modal-container">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Name hinzufügen</h5>
<button id="add_user_close" type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div> </div>
<div class="modal-body"> <div class="form-group">
<div class="form-group"> <label for="text_color">Farbe</label>
<label for="text_user">Name</label> <input type="text" name="color" id="add_user_color" class="form-control">
<input type="text" name="name" id="add_user_name" class="form-control">
</div>
<div class="form-group">
<label for="text_color">Farbe</label>
<input type="text" name="color" id="add_user_color" class="form-control">
</div>
</div>
<div class="modal-footer">
<span id="response"></span>
<button type="button" id="add_user_action" class="btn btn-primary">+ Name hinzufügen</button>
</div> </div>
</div> </div>
<div class="modal-footer">
<span id="response"></span>
<button type="button" id="add_user_action" class="btn btn-primary">+ Name hinzufügen</button>
</div>
</div> </div>
</div> </div>
</div>
<!-- modal add_coin_name --> <!-- modal add_coin_name -->
<div id="add_coin_name" class="modal-container"> <div id="add_coin_name" class="modal-container">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">Sondermünze</h5> <h5 class="modal-title">Sondermünze</h5>
<button id="add_coin_name_close" type="button" class="close" data-dismiss="modal" aria-label="Close"> <button id="add_coin_name_close" type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span> <span aria-hidden="true">×</span>
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="add_coin_name_name">Name</label> <label for="add_coin_name_name">Name</label>
<input type="text" name="name" id="add_coin_name_name" class="form-control"> <input type="text" name="name" id="add_coin_name_name" class="form-control">
</div>
</div>
<div class="modal-footer">
<span id="response"></span>
<button type="button" id="add_coin_name_action" class="btn btn-primary">+ Münze hinzufügen</button>
</div> </div>
</div> </div>
<div class="modal-footer">
<span id="response"></span>
<button type="button" id="add_coin_name_action" class="btn btn-primary">+ Münze hinzufügen</button>
</div>
</div> </div>
</div> </div>
</div>

76
coinmanager/coinc/templates/coinc/country.html
View File

@ -1,40 +1,38 @@
{% if single_country %} {% if single_country %}{% include 'header.html' with title=country.name %}
{% include 'header.html' with title=country.name %} {% include 'coinc/controlbar.html' with users=users %}{% endif %}
{% include 'coinc/controlbar.html' with users=users %} <div class="container-fluid">
{% endif %} <table name="{{ country.name_iso }}">
<div class="container-fluid"> <thead>
<table name="{{ country.name_iso }}"> <tr>
<thead> <th colspan="12" title="Zurück zur Länderübersicht">
<tr> <div class="float-left">
<th colspan="12" title="Zurück zur Länderübersicht"> <img src="/static/coinc/images/{{ country.name_iso }}.png">
<img src="/static/coinc/images/{{ country.name_iso }}.png" /> {{ country.name }}{% if country.comment %}
{{ country.name }}{% if country.comment %} <small> - {{ country.comment }}</small>{% endif %}
<small> - {{ country.comment }}</small>{% endif %} </div>
<div class="total_coins">{{ total_coins }}</div> <div class="float-right">{{ total_coins }}</div>
</th> </th>
</tr> </tr>
<tr> <tr>
<th>Jahr</th> <th>Jahr</th>
<th>1</th> <th>1</th>
<th>2</th> <th>2</th>
<th>5</th> <th>5</th>
<th class="brass">10</th> <th class="brass">10</th>
<th class="brass">20</th> <th class="brass">20</th>
<th class="brass">50</th> <th class="brass">50</th>
<th>1 €</th> <th>1 €</th>
<th>2 €</th> <th>2 €</th>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
</tr> </tr>
<tr> <tr>
<th colspan="12"></th> <th colspan="12"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for year in country.years %}{% show_year country year %}{% endfor %} </tbody> {% for year in country.years %}{% show_year country year %}{% endfor %} </tbody>
</table> </table>
</div> </div>
{% if single_country %} {% if single_country %}{% include "footer.html" with title="Münzsammlung" %}{% endif %}
{% include "footer.html" with title="Münzsammlung" %}
{% endif %}

1
coinmanager/coinc/templates/coinc/index.html
View File

@ -3,4 +3,5 @@
{% include 'coinc/filter_country.html' with countrys=countrys %} {% include 'coinc/filter_country.html' with countrys=countrys %}
{% else %} {% else %}
<p>Trage zuerst Länder im Adminbereich ein.</p>{% endif %} <p>Trage zuerst Länder im Adminbereich ein.</p>{% endif %}
<small>Version 200531</small>
{% include 'footer.html' with title='Münzsammlung' %} {% include 'footer.html' with title='Münzsammlung' %}

4
coinmanager/coinc/templates/coinc/year.html
View File

@ -1,6 +1,6 @@
{% for stamp in year %} <tr name="{{ year_short }}" stamp="{{ stamp }}"> {% for stamp in year %} <tr name="{{ year_short }}" stamp="{{ stamp }}">
<td class="year {{ year_complete }}"><div class="coin">{{ stamp }}{{ year_short }}</div></td> <td class="year {{ year_complete }}"><div class="coin">{{ stamp }}{{ year_short }}</div></td>
{% for value in values %}{% show_coin country year_short stamp value %}{% endfor %} </tr>{% endfor %}{% ifnotequal year|length 1 %} {% for value in values %}{% show_coin country year_short stamp value %}{% endfor %} </tr>{% endfor %}{% ifnotequal year|length 1 %}
<tr> <tr>
<td class="spacer" colspan="12"></td> <td class="spacer" colspan="12"></td>
</tr>{% endifnotequal %} </tr>{% endifnotequal %}

2
coinmanager/coinc/views.py
View File

@ -193,7 +193,7 @@ def show_coin(country, year, stamp, value):
marker = '' marker = ''
if coin.found_by: if coin.found_by:
div_class = f"found {coin.found_by}" div_class = f"found {coin.found_by}"
marker = '✔' marker = '✓'
name = coin.name if coin.name else '' name = coin.name if coin.name else ''
special_class = '' special_class = ''