summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.eu>2020-01-12 00:24:47 +0100
committerRené 'Necoro' Neumann <necoro@necoro.eu>2020-01-12 00:24:47 +0100
commit9ec5cdfea4bb85f335b237bebe4a026611184b7f (patch)
tree69b8f291e74cd0179cac8f6900e3f8020d5b5e07
parentc1c0602d583436b700a004d8c135cb9e2050d8fe (diff)
downloadkosten-9ec5cdfea4bb85f335b237bebe4a026611184b7f.tar.gz
kosten-9ec5cdfea4bb85f335b237bebe4a026611184b7f.tar.bz2
kosten-9ec5cdfea4bb85f335b237bebe4a026611184b7f.zip
Use HTML5 Datepicker
-rw-r--r--app/forms.py12
-rw-r--r--app/views/expenses.py1
-rw-r--r--static/js/kosten.js10
-rw-r--r--templates/expenses/add.jinja8
4 files changed, 9 insertions, 22 deletions
diff --git a/app/forms.py b/app/forms.py
index 164534f..951ce1b 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -1,8 +1,9 @@
# -*- encoding: utf-8 -*-
import flask
from flask_wtf import FlaskForm
-from wtforms.fields import BooleanField, DateField, IntegerField, StringField, HiddenField, PasswordField
-from wtforms import fields, validators, ValidationError, Form as WTForm
+from wtforms.fields import BooleanField, StringField, HiddenField, PasswordField, DecimalField as WTFDecimalField
+from wtforms.fields.html5 import DateField, IntegerField
+from wtforms import validators, ValidationError, Form as WTForm
from wtforms.ext.sqlalchemy.fields import QuerySelectField
@@ -12,7 +13,12 @@ from . import app
def is_hidden_field(f):
return isinstance(f, HiddenField)
-class DecimalField(fields.DecimalField):
+class DecimalField(WTFDecimalField):
+ def __init__(self, *args, **kwargs):
+ self.render_kw = kwargs.pop('render_kw', dict())
+ self.render_kw['inputmode'] = 'decimal'
+ super().__init__(*args, **kwargs)
+
def process_formdata(self, valuelist):
if valuelist:
value = valuelist[0].replace(',','.')
diff --git a/app/views/expenses.py b/app/views/expenses.py
index fb87c6d..90c8ffd 100644
--- a/app/views/expenses.py
+++ b/app/views/expenses.py
@@ -20,7 +20,6 @@ mod = Blueprint('expenses', __name__)
#
class ExpenseForm(F.Form):
date = F.DateField('Datum', F.req,
- format="%d.%m.%Y",
default=lambda: today())
expense = F.DecimalField('Betrag', F.req,
diff --git a/static/js/kosten.js b/static/js/kosten.js
index a3bb3b6..3821283 100644
--- a/static/js/kosten.js
+++ b/static/js/kosten.js
@@ -66,16 +66,6 @@ let searchController = function() {
$(searchController);
-var addJS = jq(() => {
- const datepicker = $('input[name=date]');
- datepicker.datepicker({
- dateFormat: 'dd.mm.yy',
- firstDay: 1
- });
-
- datepicker.blur(() => extendDate(datepicker));
-});
-
var showJS = jq(() => {
setLang();
diff --git a/templates/expenses/add.jinja b/templates/expenses/add.jinja
index 027c845..cc0680f 100644
--- a/templates/expenses/add.jinja
+++ b/templates/expenses/add.jinja
@@ -5,14 +5,6 @@
Neue Ausgabe hinzufügen
{% endblock %}
-{% set JSFunction = "addJS" %}
-{% set additionalJS = "jqueryui" %}
-
-{% block style %}
- {{ super() }}
- <link href="{{ "jqueryui/css/ui-darkness/jquery-ui.css" | static_url }}" rel="stylesheet" type="text/css">
-{% endblock %}
-
{% block content %}
<form name="add_expense" method="post">
{{ render_form(form, expense = {'autofocus' : True}) }}