remove datetimepicker for bootstrap

abonapp/forms.py

@@ -167,6 +167,9 @@ class PeriodicPayForIdForm(forms.ModelForm):
     class Meta:
         model = models.PeriodicPayForId
         exclude = ('account',)
+        widgets = {
+            'next_pay': forms.DateInput(attrs={'class': 'form-control', 'type': 'date'})
+        }
 
 
 class ExportUsersForm(forms.Form):

abonapp/templates/abonapp/buy_tariff.html

@@ -34,9 +34,9 @@
                             <select class="form-control" name="tariff" id="id_tariffs">
                                 {% for trf in tariffs %}
                                     {% if trf == selected_tariff %}
-                                        <option value="{{ trf.pk }}" data-deadline='{{ trf.calc_deadline|date:"Y-m-d H:i:s" }}' selected>
+                                        <option value="{{ trf.pk }}" data-deadline='{{ trf.calc_deadline|date:"Y-m-d\TH:i:s" }}' selected>
                                     {% else %}
-                                        <option value="{{ trf.pk }}" data-deadline='{{ trf.calc_deadline|date:"Y-m-d H:i:s" }}'>
+                                        <option value="{{ trf.pk }}" data-deadline='{{ trf.calc_deadline|date:"Y-m-d\TH:i:s" }}'>
                                     {% endif %}
                                     {{ trf.title }}. {{ trf.amount }}{% trans 'currency' %} (Вх:{{ trf.speedIn }}MBit/s. Исх:{{ trf.speedOut }} MBit/s)
                                         </option>
@@ -47,15 +47,12 @@
                             <div class="input-group">
                                 <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
                                 {% if selected_tariff %}
-                                    <input type="text" class="form-control" name="deadline" id="id_deadline" value="{{ selected_tariff.calc_deadline|date:'Y-m-d H:i:s' }}">
+                                    <input type="datetime-local" class="form-control" name="deadline" id="id_deadline" value="{{ selected_tariff.calc_deadline|date:'Y-m-d\TH:i:s' }}">
                                 {% else %}
-                                    <input type="text" class="form-control" name="deadline" id="id_deadline" value="{{ tariffs.0.calc_deadline|date:'Y-m-d H:i:s' }}">
+                                    <input type="datetime-local" class="form-control" name="deadline" id="id_deadline" value="{{ tariffs.0.calc_deadline|date:'Y-m-d\TH:i:s' }}">
                                 {% endif %}
                                 <script type="text/javascript">
                                     $(function () {
-                                        $('#id_deadline').datetimepicker({
-                                            format: 'YYYY-MM-DD HH:mm:ss'
-                                        });
                                         $('#id_tariffs').on('change', function(){
                                             var a = $(this).find('option:selected');
                                             $('#id_deadline').val(a.attr('data-deadline'));

abonapp/templates/abonapp/modal_periodic_pay.html

@@ -14,13 +14,6 @@
 
         {% bootstrap_icon 'time' as ic %}
         {% bootstrap_field form.next_pay addon_before=ic %}
-        <script type="text/javascript">
-            $(function () {
-                $('#{{ form.next_pay.id_for_label }}').datetimepicker({
-                    format: 'YYYY-MM-DD'
-                });
-            });
-        </script>
 
         <div class="btn-group">
             <button type="submit" class="btn btn-sm btn-success">

abonapp/views.py

@@ -8,14 +8,14 @@ from dialing_app.models import AsteriskCDR
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin, \
-    PermissionRequiredMixin as PermissionRequiredMixin_django, \
-    PermissionRequiredMixin
+from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.db import IntegrityError, ProgrammingError, transaction
 from django.db.models import Count, Q
-from django.http import HttpResponse, HttpResponseBadRequest, \
+from django.http import (
+    HttpResponse, HttpResponseBadRequest,
     HttpResponseRedirect
+)
 from django.shortcuts import render, redirect, get_object_or_404, resolve_url
 from django.urls import reverse_lazy
 
@@ -26,8 +26,11 @@ from djing import lib
 from djing import ping
 from djing.global_base_views import OrderedFilteredList, SecureApiView
 from djing.lib.decorators import json_view, only_admins
-from djing.lib.mixins import OnlyAdminsMixin, LoginAdminPermissionMixin, \
+from djing.lib.mixins import (
+    OnlyAdminsMixin,
+    LoginAdminPermissionMixin,
     LoginAdminMixin
+)
 from group_app.models import Group
 from guardian.decorators import \
     permission_required_or_403 as permission_required
@@ -97,7 +100,7 @@ class GroupListView(LoginRequiredMixin, OnlyAdminsMixin, OrderedFilteredList):
 
 
 class AbonCreateView(LoginRequiredMixin, OnlyAdminsMixin,
-                     PermissionRequiredMixin_django, CreateView):
+                     PermissionRequiredMixin, CreateView):
     permission_required = 'abonapp.add_abon'
     group = None
     abon = None
@@ -428,7 +431,7 @@ def pick_tariff(request, gid: int, uname):
                     'deadline': deadline
                     }
             if deadline:
-                deadline = datetime.strptime(deadline, '%Y-%m-%d %H:%M:%S')
+                deadline = datetime.strptime(deadline, '%Y-%m-%dT%H:%M:%S')
                 abon.pick_tariff(trf, request.user, deadline=deadline,
                                  comment=log_comment)
             else:

dialing_app/templates/index.html

@@ -32,14 +32,7 @@
                         <div class="form-group">
                             <label class="sr-only" for="dialtime">{% trans 'Find by dates' %}</label>
                             <div class="input-group input-group-sm">
-                                <input type="text" class="form-control" id="dialtime" placeholder="{% trans 'calldate' %}" name="sd"{% if sd %} value="{{ sd }}"{% endif %}>
-                                <script type="text/javascript">
-                                    $(function () {
-                                        $('#dialtime').datetimepicker({
-                                            format: 'YYYY-MM-DD'
-                                        });
-                                    });
-                                </script>
+                                <input type="datetime-local" class="form-control" id="dialtime" placeholder="{% trans 'calldate' %}" name="sd"{% if sd %} value="{{ sd }}"{% endif %}>
                                 <div class="input-group-btn">
                                     <button class="btn btn-default" type="submit">
                                         <span class="glyphicon glyphicon-search"></span>

taskapp/forms.py

@@ -38,7 +38,7 @@ class TaskFrm(forms.ModelForm):
             'recipients': forms.SelectMultiple(attrs={
                 'size': 10
             }),
-            'out_date': forms.DateInput(attrs={'class': 'form-control'}),
+            'out_date': forms.DateInput(attrs={'class': 'form-control', 'type': 'date'}),
             'abon': forms.Select(attrs={'class': 'form-control'})
         }
 

taskapp/templates/taskapp/add_edit_task.html

@@ -69,13 +69,6 @@
                             <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
                             {{ form.out_date }}{{ form.out_date.errors }}
                         </div>
-                        <script type="text/javascript">
-                            $(function () {
-                                $('#id_out_date').datetimepicker({
-                                    format: 'YYYY-MM-DD'
-                                });
-                            });
-                        </script>
                     </div>
 
                     {% bootstrap_icon 'picture' as ic %}

templates/all_base.html

@@ -5,7 +5,8 @@
     <meta charset="UTF-8">
     <!--[if lt IE 9]><meta http-equiv="refresh" content="0;URL=/static/bad_ie.html" /><![endif]-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="/static/css/all.min.css">
+    <link rel="stylesheet" href="/static/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/static/css/bootstrap-theme.min.css">
     <link rel="stylesheet" href="/static/css/custom.css">
     <script src="/static/js/all.min.js"></script>
     {% block additional_link %}{% endblock %}