Commit 39e96bc5 authored by Yoann Pietri's avatar Yoann Pietri Committed by Hugo LEVY-FALK

Datetimepicker pour les bans et whitelists

parent c693f9f5
Datepicker
=======
Install libjs-jquery
Install libjs-jquery-ui
Install libjs-jquery-timepicker
Install (if not) javascript-common
Enable (if not) javascript-common conf
......@@ -429,6 +429,10 @@ end=$(dialog --clear \
2>&1 >/dev/tty)
}
apt install libjs-jquery
apt install libjs-jquery-ui
apt install libjs-jquery-timepicker
main_function() {
if [ ! -z "$1" ]
then
......
......@@ -159,6 +159,7 @@ BOOTSTRAP_BASE_URL = '/static/bootstrap/'
# Use only absolute paths with '/' delimiters even on Windows
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'static').replace('\\', '/'),
os.path.join(BASE_DIR, 'javascript').replace('\\', '/'),
)
# Directory where the static files served by the server are stored
STATIC_ROOT = os.path.join(BASE_DIR, 'static_files')
......
......@@ -569,13 +569,12 @@ class BanForm(FormRevMixin, ModelForm):
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
super(BanForm, self).__init__(*args, prefix=prefix, **kwargs)
self.fields['date_end'].label = 'Date de fin'
self.fields['date_end'].help_text = get_input_formats_help_text(
self.fields['date_end'].input_formats
)
self.fields['date_end'].localize = False
class Meta:
model = Ban
exclude = ['user']
widgets = {'date_end':DateTimePicker}
class WhitelistForm(FormRevMixin, ModelForm):
......
{% load static %}
<script src="{% static 'js/jquery-2.2.4.min.js' %}"></script>
<script src="{% static 'js/jquery-ui-1.12.1/jquery-ui.min.js' %}"></script>
<script src="{% static 'js/jquery-ui-timepicker-addon.js' %}"></script>
<link href="{% static 'js/jquery-ui-1.12.1/jquery-ui.min.css' %}" rel="stylesheet"/>
<link href="{% static 'css/jquery-ui-timepicker-addon.css' %}" rel="stylesheet"/>
<input {{attrs}} name="datetimepicker" type="text" class="form-control" placeholder="Date"/>
<script>
$(document).ready(function(){
$("#{{id}}").datetimepicker({
closeText: "{{closeText}}",
currentText: "{{currentText}}",
dateFormat:'yy-mm-dd',
dayNames: {{dayNames}},
dayNamesMin: {{dayNamesMin}},
dayNamesShort: {{dayNamesShort}},
firstDay: {{firstDay}},
isRTL: {{isRTL}},
monthNames: {{monthNames}},
monthNamesShort: {{monthNamesShort}},
nextText: {{nextText}},
prevText: {{prevText}},
timeFormat: 'HH:mm:ss',
weekHeader: {{weekHeader}},
closeText: "{{closeText}}",
})
});
</script>
......@@ -3,21 +3,47 @@ from django.forms.utils import flatatt
from django.utils.safestring import mark_safe
from django.template import Context, Template
from django.template.loader import get_template
from django.conf import settings
from django.utils.translation import ugettext_lazy as _, get_language_bidi
from django.utils.dates import (
WEEKDAYS,
WEEKDAYS_ABBR,
MONTHS,
MONTHS_3,
MONTHS_AP,
MONTHS_ALT
)
def list2str(str_iterable):
"""
Utility function to return a string representing a list of string
:params str_iterable: An iterable object where each element is of type str
:returns: A representation of the iterable as a list (e.g '["a", "b"]')
"""
return '["' + '", "'.join(str_iterable) + '"]'
class DateTimePicker(Input):
is_localized = False
def render(self, name, value, attrs=None):
super().render(name, value, attrs)
flat_attrs = flatatt(attrs)
html = '''{% load static %}<script src="{% static 'js/jquery-2.2.4.min.js' %}"></script><script src="{% static 'js/jquery-ui-1.12.1/jquery-ui.min.js' %}"></script><script src="{% static 'js/jquery-ui-timepicker-addon.js' %}"></script><link href="{% static 'js/jquery-ui-1.12.1/jquery-ui.min.css' %}" rel="stylesheet"/><link href="{% static 'css/jquery-ui-timepicker-addon.css' %}" rel="stylesheet"/>'''
html += '''<input %(attrs)s name="datetimepicker" type="text" class="form-control" id="datetimepicker"/>
<script>
$(document).ready(function(){
$("#%(id)s").datetimepicker({
dateFormat:'yy-mm-dd',
timeFormat: 'HH:mm:ss',
context = Context({
'attrs': flat_attrs,
'id': attrs['id'],
'closeText': _("Close"),
'currentText': _("Today"),
'dayNames': mark_safe(list2str((str(item[1]) for item in WEEKDAYS.items()))),
'dayNamesMin': mark_safe(list2str((str(item[1]) for item in WEEKDAYS_ABBR.items()))),
'dayNamesShort': mark_safe(list2str((str(item[1]) for item in WEEKDAYS_ABBR.items()))),
'firstDay': mark_safe('"' + str(WEEKDAYS[settings.FIRST_DAY_OF_WEEK]) + '"'),
'isRTL': str(get_language_bidi()).lower(),
'monthNames': mark_safe(list2str((str(item[1]) for item in MONTHS.items()))),
'monthNamesShort': mark_safe(list2str((str(item[1]) for item in MONTHS_3.items()))),
'nextText': mark_safe('"' + str(_('Next')) + '"'),
'prevText': mark_safe('"' + str(_('Previous')) + '"'),
'weekHeader': mark_safe('"' + str(_('Wk')) + '"' ),
})
});
</script>'''%{'attrs':flat_attrs, 'id':attrs['id']}
template = Template(html)
context = Context({})
template = get_template('users/datetimepicker.html')
return template.render(context)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment