diff --git a/chrono/manager/forms.py b/chrono/manager/forms.py
index c3e66c4f..baa6263d 100644
--- a/chrono/manager/forms.py
+++ b/chrono/manager/forms.py
@@ -38,17 +38,7 @@ from chrono.agendas.models import (
)
from . import widgets
-
-
-DATETIME_OPTIONS = {
- 'weekStart': 1,
- 'autoclose': True,
-}
-
-
-class DateTimeWidget(widgets.DateTimeWidget):
- def __init__(self, *args, **kwargs):
- super(DateTimeWidget, self).__init__(*args, options=DATETIME_OPTIONS, **kwargs)
+from .widgets import DateTimeWidget
class AgendaAddForm(forms.ModelForm):
diff --git a/chrono/manager/static/css/datetimepicker.css b/chrono/manager/static/css/datetimepicker.css
deleted file mode 100644
index 47720e0a..00000000
--- a/chrono/manager/static/css/datetimepicker.css
+++ /dev/null
@@ -1,372 +0,0 @@
-/*!
- * Datetimepicker for Bootstrap
- *
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- */
-.datetimepicker {
- padding: 4px;
- margin-top: 1px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- direction: ltr;
- /*.dow {
- border-top: 1px solid #ddd !important;
- }*/
-
-}
-.datetimepicker-inline {
- width: 220px;
-}
-.datetimepicker.datetimepicker-rtl {
- direction: rtl;
-}
-.datetimepicker.datetimepicker-rtl table tr td span {
- float: right;
-}
-.datetimepicker-dropdown, .datetimepicker-dropdown-left {
- top: 0;
- left: 0;
-}
-.datetimepicker-dropdown:before {
- content: '';
- display: inline-block;
- border-left: 7px solid transparent;
- border-right: 7px solid transparent;
- border-bottom: 7px solid #ccc;
- border-bottom-color: rgba(0, 0, 0, 0.2);
- position: absolute;
- top: -7px;
- left: 6px;
-}
-.datetimepicker-dropdown:after {
- content: '';
- display: inline-block;
- border-left: 6px solid transparent;
- border-right: 6px solid transparent;
- border-bottom: 6px solid #ffffff;
- position: absolute;
- top: -6px;
- left: 7px;
-}
-.datetimepicker-dropdown-left:before {
- content: '';
- display: inline-block;
- border-left: 7px solid transparent;
- border-right: 7px solid transparent;
- border-bottom: 7px solid #ccc;
- border-bottom-color: rgba(0, 0, 0, 0.2);
- position: absolute;
- top: -7px;
- right: 6px;
-}
-.datetimepicker-dropdown-left:after {
- content: '';
- display: inline-block;
- border-left: 6px solid transparent;
- border-right: 6px solid transparent;
- border-bottom: 6px solid #ffffff;
- position: absolute;
- top: -6px;
- right: 7px;
-}
-.datetimepicker > div {
- display: none;
-}
-.datetimepicker.minutes div.datetimepicker-minutes {
- display: block;
-}
-.datetimepicker.hours div.datetimepicker-hours {
- display: block;
-}
-.datetimepicker.days div.datetimepicker-days {
- display: block;
-}
-.datetimepicker.months div.datetimepicker-months {
- display: block;
-}
-.datetimepicker.years div.datetimepicker-years {
- display: block;
-}
-.datetimepicker table {
- margin: 0;
-}
-.datetimepicker td,
-.datetimepicker th {
- text-align: center;
- width: 20px;
- height: 20px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- border: none;
-}
-.table-striped .datetimepicker table tr td,
-.table-striped .datetimepicker table tr th {
- background-color: transparent;
-}
-.datetimepicker table tr td.minute:hover {
- background: #eeeeee;
- cursor: pointer;
-}
-.datetimepicker table tr td.hour:hover {
- background: #eeeeee;
- cursor: pointer;
-}
-.datetimepicker table tr td.day:hover {
- background: #eeeeee;
- cursor: pointer;
-}
-.datetimepicker table tr td.old,
-.datetimepicker table tr td.new {
- color: #999999;
-}
-.datetimepicker table tr td.disabled,
-.datetimepicker table tr td.disabled:hover {
- background: none;
- color: #999999;
- cursor: default;
-}
-.datetimepicker table tr td.today,
-.datetimepicker table tr td.today:hover,
-.datetimepicker table tr td.today.disabled,
-.datetimepicker table tr td.today.disabled:hover {
- background-color: #fde19a;
- background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
- background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
- background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
- background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
- background-image: linear-gradient(top, #fdd49a, #fdf59a);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
- border-color: #fdf59a #fdf59a #fbed50;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-.datetimepicker table tr td.today:hover,
-.datetimepicker table tr td.today:hover:hover,
-.datetimepicker table tr td.today.disabled:hover,
-.datetimepicker table tr td.today.disabled:hover:hover,
-.datetimepicker table tr td.today:active,
-.datetimepicker table tr td.today:hover:active,
-.datetimepicker table tr td.today.disabled:active,
-.datetimepicker table tr td.today.disabled:hover:active,
-.datetimepicker table tr td.today.active,
-.datetimepicker table tr td.today:hover.active,
-.datetimepicker table tr td.today.disabled.active,
-.datetimepicker table tr td.today.disabled:hover.active,
-.datetimepicker table tr td.today.disabled,
-.datetimepicker table tr td.today:hover.disabled,
-.datetimepicker table tr td.today.disabled.disabled,
-.datetimepicker table tr td.today.disabled:hover.disabled,
-.datetimepicker table tr td.today[disabled],
-.datetimepicker table tr td.today:hover[disabled],
-.datetimepicker table tr td.today.disabled[disabled],
-.datetimepicker table tr td.today.disabled:hover[disabled] {
- background-color: #fdf59a;
-}
-.datetimepicker table tr td.today:active,
-.datetimepicker table tr td.today:hover:active,
-.datetimepicker table tr td.today.disabled:active,
-.datetimepicker table tr td.today.disabled:hover:active,
-.datetimepicker table tr td.today.active,
-.datetimepicker table tr td.today:hover.active,
-.datetimepicker table tr td.today.disabled.active,
-.datetimepicker table tr td.today.disabled:hover.active {
- background-color: #fbf069 \9;
-}
-.datetimepicker table tr td.active,
-.datetimepicker table tr td.active:hover,
-.datetimepicker table tr td.active.disabled,
-.datetimepicker table tr td.active.disabled:hover {
- background-color: #006dcc;
- background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
- background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
- background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
- background-image: -o-linear-gradient(top, #0088cc, #0044cc);
- background-image: linear-gradient(top, #0088cc, #0044cc);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
- border-color: #0044cc #0044cc #002a80;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
- color: #fff;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.datetimepicker table tr td.active:hover,
-.datetimepicker table tr td.active:hover:hover,
-.datetimepicker table tr td.active.disabled:hover,
-.datetimepicker table tr td.active.disabled:hover:hover,
-.datetimepicker table tr td.active:active,
-.datetimepicker table tr td.active:hover:active,
-.datetimepicker table tr td.active.disabled:active,
-.datetimepicker table tr td.active.disabled:hover:active,
-.datetimepicker table tr td.active.active,
-.datetimepicker table tr td.active:hover.active,
-.datetimepicker table tr td.active.disabled.active,
-.datetimepicker table tr td.active.disabled:hover.active,
-.datetimepicker table tr td.active.disabled,
-.datetimepicker table tr td.active:hover.disabled,
-.datetimepicker table tr td.active.disabled.disabled,
-.datetimepicker table tr td.active.disabled:hover.disabled,
-.datetimepicker table tr td.active[disabled],
-.datetimepicker table tr td.active:hover[disabled],
-.datetimepicker table tr td.active.disabled[disabled],
-.datetimepicker table tr td.active.disabled:hover[disabled] {
- background-color: #0044cc;
-}
-.datetimepicker table tr td.active:active,
-.datetimepicker table tr td.active:hover:active,
-.datetimepicker table tr td.active.disabled:active,
-.datetimepicker table tr td.active.disabled:hover:active,
-.datetimepicker table tr td.active.active,
-.datetimepicker table tr td.active:hover.active,
-.datetimepicker table tr td.active.disabled.active,
-.datetimepicker table tr td.active.disabled:hover.active {
- background-color: #003399 \9;
-}
-.datetimepicker table tr td span {
- display: block;
- width: 23%;
- height: 54px;
- line-height: 54px;
- float: left;
- margin: 1%;
- cursor: pointer;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-}
-.datetimepicker .datetimepicker-hours span {
- height: 26px;
- line-height: 26px;
-}
-.datetimepicker .datetimepicker-hours table tr td span.hour_am,
-.datetimepicker .datetimepicker-hours table tr td span.hour_pm {
- width: 14.6%;
-}
-.datetimepicker .datetimepicker-hours fieldset legend,
-.datetimepicker .datetimepicker-minutes fieldset legend {
- margin-bottom: inherit;
- line-height: 30px;
-}
-.datetimepicker .datetimepicker-minutes span {
- height: 26px;
- line-height: 26px;
-}
-.datetimepicker table tr td span:hover {
- background: #eeeeee;
-}
-.datetimepicker table tr td span.disabled,
-.datetimepicker table tr td span.disabled:hover {
- background: none;
- color: #999999;
- cursor: default;
-}
-.datetimepicker table tr td span.active,
-.datetimepicker table tr td span.active:hover,
-.datetimepicker table tr td span.active.disabled,
-.datetimepicker table tr td span.active.disabled:hover {
- background-color: #006dcc;
- background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
- background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
- background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
- background-image: -o-linear-gradient(top, #0088cc, #0044cc);
- background-image: linear-gradient(top, #0088cc, #0044cc);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
- border-color: #0044cc #0044cc #002a80;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
- color: #fff;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.datetimepicker table tr td span.active:hover,
-.datetimepicker table tr td span.active:hover:hover,
-.datetimepicker table tr td span.active.disabled:hover,
-.datetimepicker table tr td span.active.disabled:hover:hover,
-.datetimepicker table tr td span.active:active,
-.datetimepicker table tr td span.active:hover:active,
-.datetimepicker table tr td span.active.disabled:active,
-.datetimepicker table tr td span.active.disabled:hover:active,
-.datetimepicker table tr td span.active.active,
-.datetimepicker table tr td span.active:hover.active,
-.datetimepicker table tr td span.active.disabled.active,
-.datetimepicker table tr td span.active.disabled:hover.active,
-.datetimepicker table tr td span.active.disabled,
-.datetimepicker table tr td span.active:hover.disabled,
-.datetimepicker table tr td span.active.disabled.disabled,
-.datetimepicker table tr td span.active.disabled:hover.disabled,
-.datetimepicker table tr td span.active[disabled],
-.datetimepicker table tr td span.active:hover[disabled],
-.datetimepicker table tr td span.active.disabled[disabled],
-.datetimepicker table tr td span.active.disabled:hover[disabled] {
- background-color: #0044cc;
-}
-.datetimepicker table tr td span.active:active,
-.datetimepicker table tr td span.active:hover:active,
-.datetimepicker table tr td span.active.disabled:active,
-.datetimepicker table tr td span.active.disabled:hover:active,
-.datetimepicker table tr td span.active.active,
-.datetimepicker table tr td span.active:hover.active,
-.datetimepicker table tr td span.active.disabled.active,
-.datetimepicker table tr td span.active.disabled:hover.active {
- background-color: #003399 \9;
-}
-.datetimepicker table tr td span.old {
- color: #999999;
-}
-.datetimepicker th.switch {
- width: 145px;
-}
-.datetimepicker thead tr:first-child th,
-.datetimepicker tfoot tr:first-child th {
- cursor: pointer;
-}
-.datetimepicker thead tr:first-child th:hover,
-.datetimepicker tfoot tr:first-child th:hover {
- background: #eeeeee;
-}
-.input-append.date .add-on i,
-.input-prepend.date .add-on i {
- cursor: pointer;
- width: 14px;
- height: 14px;
-}
-
-
-
-.dropdown-menu {
- position: absolute;
- top: 100%;
- left: 0;
- z-index: 1000;
- display: none;
- float: left;
- min-width: 160px;
- padding: 5px 0;
- margin: 2px 0 0;
- list-style: none;
- background-color: #ffffff;
- border: 1px solid #cccccc;
- border: 1px solid rgba(0, 0, 0, 0.15);
- border-radius: 4px;
- -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
- box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
- background-clip: padding-box;
-}
-
-.icon-arrow-left:before {
- content: "←";
-}
-
-.icon-arrow-right:before {
- content: "→";
-}
diff --git a/chrono/manager/static/css/style.scss b/chrono/manager/static/css/style.scss
index da406897..348e2325 100644
--- a/chrono/manager/static/css/style.scss
+++ b/chrono/manager/static/css/style.scss
@@ -273,3 +273,7 @@ ul.objects-list.single-links li a.link-action-icon.refresh {
content: "\f021"; /* refresh */
}
}
+
+div.ui-dialog form p span.datetime input {
+ width: auto;
+}
diff --git a/chrono/manager/static/js/bootstrap-datetimepicker.js b/chrono/manager/static/js/bootstrap-datetimepicker.js
deleted file mode 100644
index b2dd1047..00000000
--- a/chrono/manager/static/js/bootstrap-datetimepicker.js
+++ /dev/null
@@ -1,1756 +0,0 @@
-/* =========================================================
- * bootstrap-datetimepicker.js
- * =========================================================
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- * Improvements by Sébastien Malot
- * Improvements by Yun Lai
- * Project URL : http://www.malot.fr/bootstrap-datetimepicker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-/*
- * Improvement by CuGBabyBeaR @ 2013-09-12
- *
- * Make it work in bootstrap v3
- */
-
-!function ($) {
-
- function UTCDate() {
- return new Date(Date.UTC.apply(Date, arguments));
- }
-
- function UTCToday() {
- var today = new Date();
- return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate(), today.getUTCHours(), today.getUTCMinutes(), today.getUTCSeconds(), 0);
- }
-
- // Picker object
-
- var Datetimepicker = function (element, options) {
- var that = this;
-
- this.element = $(element);
-
- // add container for single page application
- // when page switch the datetimepicker div will be removed also.
- this.container = options.container || 'body';
-
- this.language = options.language || this.element.data('date-language') || "en";
- this.language = this.language in dates ? this.language : "en";
- this.isRTL = dates[this.language].rtl || false;
- this.formatType = options.formatType || this.element.data('format-type') || 'standard';
- this.format = DPGlobal.parseFormat(options.format || this.element.data('date-format') || dates[this.language].format || DPGlobal.getDefaultFormat(this.formatType, 'input'), this.formatType);
- this.isInline = false;
- this.isVisible = false;
- this.isInput = this.element.is('input');
-
-
- this.bootcssVer = this.isInput ? (this.element.is('.form-control') ? 3 : 2) : ( this.bootcssVer = this.element.is('.input-group') ? 3 : 2 );
-
- this.component = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar').parent() : this.element.find('.add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar').parent()) : false;
- this.componentReset = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-remove').parent() : this.element.find('.add-on .icon-remove').parent()) : false;
- this.hasInput = this.component && this.element.find('input').length;
- if (this.component && this.component.length === 0) {
- this.component = false;
- }
- this.linkField = options.linkField || this.element.data('link-field') || false;
- this.linkFormat = DPGlobal.parseFormat(options.linkFormat || this.element.data('link-format') || DPGlobal.getDefaultFormat(this.formatType, 'link'), this.formatType);
- this.minuteStep = options.minuteStep || this.element.data('minute-step') || 5;
- this.pickerPosition = options.pickerPosition || this.element.data('picker-position') || 'bottom-right';
- this.showMeridian = options.showMeridian || this.element.data('show-meridian') || false;
- this.initialDate = options.initialDate || new Date();
-
- this._attachEvents();
-
- this.formatViewType = "datetime";
- if ('formatViewType' in options) {
- this.formatViewType = options.formatViewType;
- } else if ('formatViewType' in this.element.data()) {
- this.formatViewType = this.element.data('formatViewType');
- }
-
- this.minView = 0;
- if ('minView' in options) {
- this.minView = options.minView;
- } else if ('minView' in this.element.data()) {
- this.minView = this.element.data('min-view');
- }
- this.minView = DPGlobal.convertViewMode(this.minView);
-
- this.maxView = DPGlobal.modes.length - 1;
- if ('maxView' in options) {
- this.maxView = options.maxView;
- } else if ('maxView' in this.element.data()) {
- this.maxView = this.element.data('max-view');
- }
- this.maxView = DPGlobal.convertViewMode(this.maxView);
-
- this.wheelViewModeNavigation = false;
- if ('wheelViewModeNavigation' in options) {
- this.wheelViewModeNavigation = options.wheelViewModeNavigation;
- } else if ('wheelViewModeNavigation' in this.element.data()) {
- this.wheelViewModeNavigation = this.element.data('view-mode-wheel-navigation');
- }
-
- this.wheelViewModeNavigationInverseDirection = false;
-
- if ('wheelViewModeNavigationInverseDirection' in options) {
- this.wheelViewModeNavigationInverseDirection = options.wheelViewModeNavigationInverseDirection;
- } else if ('wheelViewModeNavigationInverseDirection' in this.element.data()) {
- this.wheelViewModeNavigationInverseDirection = this.element.data('view-mode-wheel-navigation-inverse-dir');
- }
-
- this.wheelViewModeNavigationDelay = 100;
- if ('wheelViewModeNavigationDelay' in options) {
- this.wheelViewModeNavigationDelay = options.wheelViewModeNavigationDelay;
- } else if ('wheelViewModeNavigationDelay' in this.element.data()) {
- this.wheelViewModeNavigationDelay = this.element.data('view-mode-wheel-navigation-delay');
- }
-
- this.startViewMode = 2;
- if ('startView' in options) {
- this.startViewMode = options.startView;
- } else if ('startView' in this.element.data()) {
- this.startViewMode = this.element.data('start-view');
- }
- this.startViewMode = DPGlobal.convertViewMode(this.startViewMode);
- this.viewMode = this.startViewMode;
-
- this.viewSelect = this.minView;
- if ('viewSelect' in options) {
- this.viewSelect = options.viewSelect;
- } else if ('viewSelect' in this.element.data()) {
- this.viewSelect = this.element.data('view-select');
- }
- this.viewSelect = DPGlobal.convertViewMode(this.viewSelect);
-
- this.forceParse = true;
- if ('forceParse' in options) {
- this.forceParse = options.forceParse;
- } else if ('dateForceParse' in this.element.data()) {
- this.forceParse = this.element.data('date-force-parse');
- }
-
- this.picker = $((this.bootcssVer == 3) ? DPGlobal.templateV3 : DPGlobal.template)
- .appendTo(this.isInline ? this.element : this.container) // 'body')
- .on({
- click: $.proxy(this.click, this),
- mousedown: $.proxy(this.mousedown, this)
- });
-
- if (this.maxView == 1) {
- this.picker.addClass('time-only-picker');
- }
-
- if (this.wheelViewModeNavigation) {
- if ($.fn.mousewheel) {
- this.picker.on({mousewheel: $.proxy(this.mousewheel, this)});
- } else {
- console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option");
- }
- }
-
- if (this.isInline) {
- this.picker.addClass('datetimepicker-inline');
- } else {
- this.picker.addClass('datetimepicker-dropdown-' + this.pickerPosition + ' dropdown-menu');
- }
- if (this.isRTL) {
- this.picker.addClass('datetimepicker-rtl');
- if (this.bootcssVer == 3) {
- this.picker.find('.prev span, .next span')
- .toggleClass('glyphicon-arrow-left glyphicon-arrow-right');
- } else {
- this.picker.find('.prev i, .next i')
- .toggleClass('icon-arrow-left icon-arrow-right');
- }
- ;
-
- }
- $(document).on('mousedown', function (e) {
- // Clicked outside the datetimepicker, hide it
- if ($(e.target).closest('.datetimepicker').length === 0) {
- that.hide();
- }
- });
-
- this.autoclose = false;
- if ('autoclose' in options) {
- this.autoclose = options.autoclose;
- } else if ('dateAutoclose' in this.element.data()) {
- this.autoclose = this.element.data('date-autoclose');
- }
-
- this.keyboardNavigation = true;
- if ('keyboardNavigation' in options) {
- this.keyboardNavigation = options.keyboardNavigation;
- } else if ('dateKeyboardNavigation' in this.element.data()) {
- this.keyboardNavigation = this.element.data('date-keyboard-navigation');
- }
-
- this.todayBtn = (options.todayBtn || this.element.data('date-today-btn') || false);
- this.todayHighlight = (options.todayHighlight || this.element.data('date-today-highlight') || false);
-
- this.weekStart = ((options.weekStart || this.element.data('date-weekstart') || dates[this.language].weekStart || 0) % 7);
- this.weekEnd = ((this.weekStart + 6) % 7);
- this.startDate = -Infinity;
- this.endDate = Infinity;
- this.daysOfWeekDisabled = [];
- this.setStartDate(options.startDate || this.element.data('date-startdate'));
- this.setEndDate(options.endDate || this.element.data('date-enddate'));
- this.setDaysOfWeekDisabled(options.daysOfWeekDisabled || this.element.data('date-days-of-week-disabled'));
- this.fillDow();
- this.fillMonths();
- this.update();
- this.showMode();
-
- if (this.isInline) {
- this.show();
- }
- };
-
- Datetimepicker.prototype = {
- constructor: Datetimepicker,
-
- _events: [],
- _attachEvents: function () {
- this._detachEvents();
- if (this.isInput) { // single input
- this._events = [
- [this.element, {
- focus: $.proxy(this.show, this),
- keyup: $.proxy(this.update, this),
- keydown: $.proxy(this.keydown, this)
- }]
- ];
- }
- else if (this.component && this.hasInput) { // component: input + button
- this._events = [
- // For components that are not readonly, allow keyboard nav
- [this.element.find('input'), {
- focus: $.proxy(this.show, this),
- keyup: $.proxy(this.update, this),
- keydown: $.proxy(this.keydown, this)
- }],
- [this.component, {
- click: $.proxy(this.show, this)
- }]
- ];
- if (this.componentReset) {
- this._events.push([
- this.componentReset,
- {click: $.proxy(this.reset, this)}
- ]);
- }
- }
- else if (this.element.is('div')) { // inline datetimepicker
- this.isInline = true;
- }
- else {
- this._events = [
- [this.element, {
- click: $.proxy(this.show, this)
- }]
- ];
- }
- for (var i = 0, el, ev; i < this._events.length; i++) {
- el = this._events[i][0];
- ev = this._events[i][1];
- el.on(ev);
- }
- },
-
- _detachEvents: function () {
- for (var i = 0, el, ev; i < this._events.length; i++) {
- el = this._events[i][0];
- ev = this._events[i][1];
- el.off(ev);
- }
- this._events = [];
- },
-
- show: function (e) {
- this.picker.show();
- this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
- if (this.forceParse && !(this.isVisible && e.type == 'focus')) {
- this.update();
- }
- this.place();
- $(window).on('resize', $.proxy(this.place, this));
- if (e) {
- e.stopPropagation();
- e.preventDefault();
- }
- this.isVisible = true;
- this.element.trigger({
- type: 'show',
- date: this.date
- });
- },
-
- hide: function (e) {
- if (!this.isVisible) return;
- if (this.isInline) return;
- this.picker.hide();
- $(window).off('resize', this.place);
- this.viewMode = this.startViewMode;
- this.showMode();
- if (!this.isInput) {
- $(document).off('mousedown', this.hide);
- }
-
- if (
- this.forceParse &&
- (
- this.isInput && this.element.val() ||
- this.hasInput && this.element.find('input').val()
- )
- )
- this.setValue();
- this.isVisible = false;
- this.element.trigger({
- type: 'hide',
- date: this.date
- });
- },
-
- remove: function () {
- this._detachEvents();
- this.picker.remove();
- delete this.picker;
- delete this.element.data().datetimepicker;
- },
-
- getDate: function () {
- var d = this.getUTCDate();
- return new Date(d.getTime() + (d.getTimezoneOffset() * 60000));
- },
-
- getUTCDate: function () {
- return this.date;
- },
-
- setDate: function (d) {
- this.setUTCDate(new Date(d.getTime() - (d.getTimezoneOffset() * 60000)));
- },
-
- setUTCDate: function (d) {
- if (d >= this.startDate && d <= this.endDate) {
- this.date = d;
- this.setValue();
- this.viewDate = this.date;
- this.fill();
- } else {
- this.element.trigger({
- type: 'outOfRange',
- date: d,
- startDate: this.startDate,
- endDate: this.endDate
- });
- }
- },
-
- setFormat: function (format) {
- this.format = DPGlobal.parseFormat(format, this.formatType);
- var element;
- if (this.isInput) {
- element = this.element;
- } else if (this.component) {
- element = this.element.find('input');
- }
- if (element && element.val()) {
- this.setValue();
- }
- },
-
- setValue: function () {
- var formatted = this.getFormattedDate();
- if (!this.isInput) {
- if (this.component) {
- this.element.find('input').val(formatted);
- }
- this.element.data('date', formatted);
- } else {
- this.element.val(formatted);
- }
- if (this.linkField) {
- $('#' + this.linkField).val(this.getFormattedDate(this.linkFormat));
- }
- },
-
- getFormattedDate: function (format) {
- if (format == undefined) format = this.format;
- return DPGlobal.formatDate(this.date, format, this.language, this.formatType);
- },
-
- setStartDate: function (startDate) {
- this.startDate = startDate || -Infinity;
- if (this.startDate !== -Infinity) {
- this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language, this.formatType);
- }
- this.update();
- this.updateNavArrows();
- },
-
- setEndDate: function (endDate) {
- this.endDate = endDate || Infinity;
- if (this.endDate !== Infinity) {
- this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language, this.formatType);
- }
- this.update();
- this.updateNavArrows();
- },
-
- setDaysOfWeekDisabled: function (daysOfWeekDisabled) {
- this.daysOfWeekDisabled = daysOfWeekDisabled || [];
- if (!$.isArray(this.daysOfWeekDisabled)) {
- this.daysOfWeekDisabled = this.daysOfWeekDisabled.split(/,\s*/);
- }
- this.daysOfWeekDisabled = $.map(this.daysOfWeekDisabled, function (d) {
- return parseInt(d, 10);
- });
- this.update();
- this.updateNavArrows();
- },
-
- place: function () {
- if (this.isInline) return;
-
- var index_highest = 0;
- $('div').each(function () {
- var index_current = parseInt($(this).css("zIndex"), 10);
- if (index_current > index_highest) {
- index_highest = index_current;
- }
- });
- var zIndex = index_highest + 10;
-
- var offset, top, left, containerOffset;
- if (this.container instanceof $) {
- containerOffset = this.container.offset();
- } else {
- containerOffset = $(this.container).offset();
- }
-
- if (this.component) {
- offset = this.component.offset();
- left = offset.left;
- if (this.pickerPosition == 'bottom-left' || this.pickerPosition == 'top-left') {
- left += this.component.outerWidth() - this.picker.outerWidth();
- }
- } else {
- offset = this.element.offset();
- left = offset.left;
- }
-
- if(left+220 > document.body.clientWidth){
- left = document.body.clientWidth-220;
- }
-
- if (this.pickerPosition == 'top-left' || this.pickerPosition == 'top-right') {
- top = offset.top - this.picker.outerHeight();
- } else {
- top = offset.top + this.height;
- }
-
- top = top - containerOffset.top;
- left = left - containerOffset.left;
-
- this.picker.css({
- top: top,
- left: left,
- zIndex: zIndex
- });
- },
-
- update: function () {
- var date, fromArgs = false;
- if (arguments && arguments.length && (typeof arguments[0] === 'string' || arguments[0] instanceof Date)) {
- date = arguments[0];
- fromArgs = true;
- } else {
- date = (this.isInput ? this.element.val() : this.element.find('input').val()) || this.element.data('date') || this.initialDate;
- if (typeof date == 'string' || date instanceof String) {
- date = date.replace(/^\s+|\s+$/g,'');
- }
- }
-
- if (!date) {
- date = new Date();
- fromArgs = false;
- }
-
- this.date = DPGlobal.parseDate(date, this.format, this.language, this.formatType);
-
- if (fromArgs) this.setValue();
-
- if (this.date < this.startDate) {
- this.viewDate = new Date(this.startDate);
- } else if (this.date > this.endDate) {
- this.viewDate = new Date(this.endDate);
- } else {
- this.viewDate = new Date(this.date);
- }
- this.fill();
- },
-
- fillDow: function () {
- var dowCnt = this.weekStart,
- html = '
';
- while (dowCnt < this.weekStart + 7) {
- html += '' + dates[this.language].daysMin[(dowCnt++) % 7] + ' | ';
- }
- html += '
';
- this.picker.find('.datetimepicker-days thead').append(html);
- },
-
- fillMonths: function () {
- var html = '',
- i = 0;
- while (i < 12) {
- html += '' + dates[this.language].monthsShort[i++] + '';
- }
- this.picker.find('.datetimepicker-months td').html(html);
- },
-
- fill: function () {
- if (this.date == null || this.viewDate == null) {
- return;
- }
- var d = new Date(this.viewDate),
- year = d.getUTCFullYear(),
- month = d.getUTCMonth(),
- dayMonth = d.getUTCDate(),
- hours = d.getUTCHours(),
- minutes = d.getUTCMinutes(),
- startYear = this.startDate !== -Infinity ? this.startDate.getUTCFullYear() : -Infinity,
- startMonth = this.startDate !== -Infinity ? this.startDate.getUTCMonth() : -Infinity,
- endYear = this.endDate !== Infinity ? this.endDate.getUTCFullYear() : Infinity,
- endMonth = this.endDate !== Infinity ? this.endDate.getUTCMonth() : Infinity,
- currentDate = (new UTCDate(this.date.getUTCFullYear(), this.date.getUTCMonth(), this.date.getUTCDate())).valueOf(),
- today = new Date();
- this.picker.find('.datetimepicker-days thead th:eq(1)')
- .text(dates[this.language].months[month] + ' ' + year);
- if (this.formatViewType == "time") {
- var hourConverted = hours % 12 ? hours % 12 : 12;
- var hoursDisplay = (hourConverted < 10 ? '0' : '') + hourConverted;
- var minutesDisplay = (minutes < 10 ? '0' : '') + minutes;
- var meridianDisplay = dates[this.language].meridiem[hours < 12 ? 0 : 1];
- this.picker.find('.datetimepicker-hours thead th:eq(1)')
- .text(hoursDisplay + ':' + minutesDisplay + ' ' + (meridianDisplay ? meridianDisplay.toUpperCase() : ''));
- this.picker.find('.datetimepicker-minutes thead th:eq(1)')
- .text(hoursDisplay + ':' + minutesDisplay + ' ' + (meridianDisplay ? meridianDisplay.toUpperCase() : ''));
- } else {
- this.picker.find('.datetimepicker-hours thead th:eq(1)')
- .text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year);
- this.picker.find('.datetimepicker-minutes thead th:eq(1)')
- .text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year);
- }
- this.picker.find('tfoot th.today')
- .text(dates[this.language].today)
- .toggle(this.todayBtn !== false);
- this.updateNavArrows();
- this.fillMonths();
- /*var prevMonth = UTCDate(year, month, 0,0,0,0,0);
- prevMonth.setUTCDate(prevMonth.getDate() - (prevMonth.getUTCDay() - this.weekStart + 7)%7);*/
- var prevMonth = UTCDate(year, month - 1, 28, 0, 0, 0, 0),
- day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth());
- prevMonth.setUTCDate(day);
- prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.weekStart + 7) % 7);
- var nextMonth = new Date(prevMonth);
- nextMonth.setUTCDate(nextMonth.getUTCDate() + 42);
- nextMonth = nextMonth.valueOf();
- var html = [];
- var clsName;
- while (prevMonth.valueOf() < nextMonth) {
- if (prevMonth.getUTCDay() == this.weekStart) {
- html.push('');
- }
- clsName = '';
- if (prevMonth.getUTCFullYear() < year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() < month)) {
- clsName += ' old';
- } else if (prevMonth.getUTCFullYear() > year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) {
- clsName += ' new';
- }
- // Compare internal UTC date with local today, not UTC today
- if (this.todayHighlight &&
- prevMonth.getUTCFullYear() == today.getFullYear() &&
- prevMonth.getUTCMonth() == today.getMonth() &&
- prevMonth.getUTCDate() == today.getDate()) {
- clsName += ' today';
- }
- if (prevMonth.valueOf() == currentDate) {
- clsName += ' active';
- }
- if ((prevMonth.valueOf() + 86400000) <= this.startDate || prevMonth.valueOf() > this.endDate ||
- $.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1) {
- clsName += ' disabled';
- }
- html.push('' + prevMonth.getUTCDate() + ' | ');
- if (prevMonth.getUTCDay() == this.weekEnd) {
- html.push('
');
- }
- prevMonth.setUTCDate(prevMonth.getUTCDate() + 1);
- }
- this.picker.find('.datetimepicker-days tbody').empty().append(html.join(''));
-
- html = [];
- var txt = '', meridian = '', meridianOld = '';
- for (var i = 0; i < 24; i++) {
- var actual = UTCDate(year, month, dayMonth, i);
- clsName = '';
- // We want the previous hour for the startDate
- if ((actual.valueOf() + 3600000) <= this.startDate || actual.valueOf() > this.endDate) {
- clsName += ' disabled';
- } else if (hours == i) {
- clsName += ' active';
- }
- if (this.showMeridian && dates[this.language].meridiem.length == 2) {
- meridian = (i < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]);
- if (meridian != meridianOld) {
- if (meridianOld != '') {
- html.push('');
- }
- html.push('');
- }
- } else {
- txt = i + ':00';
- html.push('' + txt + '');
- }
- }
- this.picker.find('.datetimepicker-hours td').html(html.join(''));
-
- html = [];
- txt = '', meridian = '', meridianOld = '';
- for (var i = 0; i < 60; i += this.minuteStep) {
- var actual = UTCDate(year, month, dayMonth, hours, i, 0);
- clsName = '';
- if (actual.valueOf() < this.startDate || actual.valueOf() > this.endDate) {
- clsName += ' disabled';
- } else if (Math.floor(minutes / this.minuteStep) == Math.floor(i / this.minuteStep)) {
- clsName += ' active';
- }
- if (this.showMeridian && dates[this.language].meridiem.length == 2) {
- meridian = (hours < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]);
- if (meridian != meridianOld) {
- if (meridianOld != '') {
- html.push('');
- }
- html.push('');
- }
- } else {
- txt = i + ':00';
- //html.push(''+txt+'');
- html.push('' + hours + ':' + (i < 10 ? '0' + i : i) + '');
- }
- }
- this.picker.find('.datetimepicker-minutes td').html(html.join(''));
-
- var currentYear = this.date.getUTCFullYear();
- var months = this.picker.find('.datetimepicker-months')
- .find('th:eq(1)')
- .text(year)
- .end()
- .find('span').removeClass('active');
- if (currentYear == year) {
- months.eq(this.date.getUTCMonth()).addClass('active');
- }
- if (year < startYear || year > endYear) {
- months.addClass('disabled');
- }
- if (year == startYear) {
- months.slice(0, startMonth).addClass('disabled');
- }
- if (year == endYear) {
- months.slice(endMonth + 1).addClass('disabled');
- }
-
- html = '';
- year = parseInt(year / 10, 10) * 10;
- var yearCont = this.picker.find('.datetimepicker-years')
- .find('th:eq(1)')
- .text(year + '-' + (year + 9))
- .end()
- .find('td');
- year -= 1;
- for (var i = -1; i < 11; i++) {
- html += '' + year + '';
- year += 1;
- }
- yearCont.html(html);
- this.place();
- },
-
- updateNavArrows: function () {
- var d = new Date(this.viewDate),
- year = d.getUTCFullYear(),
- month = d.getUTCMonth(),
- day = d.getUTCDate(),
- hour = d.getUTCHours();
- switch (this.viewMode) {
- case 0:
- if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
- && month <= this.startDate.getUTCMonth()
- && day <= this.startDate.getUTCDate()
- && hour <= this.startDate.getUTCHours()) {
- this.picker.find('.prev').css({visibility: 'hidden'});
- } else {
- this.picker.find('.prev').css({visibility: 'visible'});
- }
- if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
- && month >= this.endDate.getUTCMonth()
- && day >= this.endDate.getUTCDate()
- && hour >= this.endDate.getUTCHours()) {
- this.picker.find('.next').css({visibility: 'hidden'});
- } else {
- this.picker.find('.next').css({visibility: 'visible'});
- }
- break;
- case 1:
- if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
- && month <= this.startDate.getUTCMonth()
- && day <= this.startDate.getUTCDate()) {
- this.picker.find('.prev').css({visibility: 'hidden'});
- } else {
- this.picker.find('.prev').css({visibility: 'visible'});
- }
- if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
- && month >= this.endDate.getUTCMonth()
- && day >= this.endDate.getUTCDate()) {
- this.picker.find('.next').css({visibility: 'hidden'});
- } else {
- this.picker.find('.next').css({visibility: 'visible'});
- }
- break;
- case 2:
- if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
- && month <= this.startDate.getUTCMonth()) {
- this.picker.find('.prev').css({visibility: 'hidden'});
- } else {
- this.picker.find('.prev').css({visibility: 'visible'});
- }
- if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
- && month >= this.endDate.getUTCMonth()) {
- this.picker.find('.next').css({visibility: 'hidden'});
- } else {
- this.picker.find('.next').css({visibility: 'visible'});
- }
- break;
- case 3:
- case 4:
- if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()) {
- this.picker.find('.prev').css({visibility: 'hidden'});
- } else {
- this.picker.find('.prev').css({visibility: 'visible'});
- }
- if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()) {
- this.picker.find('.next').css({visibility: 'hidden'});
- } else {
- this.picker.find('.next').css({visibility: 'visible'});
- }
- break;
- }
- },
-
- mousewheel: function (e) {
-
- e.preventDefault();
- e.stopPropagation();
-
- if (this.wheelPause) {
- return;
- }
-
- this.wheelPause = true;
-
- var originalEvent = e.originalEvent;
-
- var delta = originalEvent.wheelDelta;
-
- var mode = delta > 0 ? 1 : (delta === 0) ? 0 : -1;
-
- if (this.wheelViewModeNavigationInverseDirection) {
- mode = -mode;
- }
-
- this.showMode(mode);
-
- setTimeout($.proxy(function () {
-
- this.wheelPause = false
-
- }, this), this.wheelViewModeNavigationDelay);
-
- },
-
- click: function (e) {
- e.stopPropagation();
- e.preventDefault();
- var target = $(e.target).closest('span, td, th, legend');
- if (target.is('.glyphicon')) {
- target = $(target).parent().closest('span, td, th, legend');
- }
- if (target.length == 1) {
- if (target.is('.disabled')) {
- this.element.trigger({
- type: 'outOfRange',
- date: this.viewDate,
- startDate: this.startDate,
- endDate: this.endDate
- });
- return;
- }
- switch (target[0].nodeName.toLowerCase()) {
- case 'th':
- switch (target[0].className) {
- case 'switch':
- this.showMode(1);
- break;
- case 'prev':
- case 'next':
- var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1);
- switch (this.viewMode) {
- case 0:
- this.viewDate = this.moveHour(this.viewDate, dir);
- break;
- case 1:
- this.viewDate = this.moveDate(this.viewDate, dir);
- break;
- case 2:
- this.viewDate = this.moveMonth(this.viewDate, dir);
- break;
- case 3:
- case 4:
- this.viewDate = this.moveYear(this.viewDate, dir);
- break;
- }
- this.fill();
- this.element.trigger({
- type: target[0].className + ':' + this.convertViewModeText(this.viewMode),
- date: this.viewDate,
- startDate: this.startDate,
- endDate: this.endDate
- });
- break;
- case 'today':
- var date = new Date();
- date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0);
-
- // Respect startDate and endDate.
- if (date < this.startDate) date = this.startDate;
- else if (date > this.endDate) date = this.endDate;
-
- this.viewMode = this.startViewMode;
- this.showMode(0);
- this._setDate(date);
- this.fill();
- if (this.autoclose) {
- this.hide();
- }
- break;
- }
- break;
- case 'span':
- if (!target.is('.disabled')) {
- var year = this.viewDate.getUTCFullYear(),
- month = this.viewDate.getUTCMonth(),
- day = this.viewDate.getUTCDate(),
- hours = this.viewDate.getUTCHours(),
- minutes = this.viewDate.getUTCMinutes(),
- seconds = this.viewDate.getUTCSeconds();
-
- if (target.is('.month')) {
- this.viewDate.setUTCDate(1);
- month = target.parent().find('span').index(target);
- day = this.viewDate.getUTCDate();
- this.viewDate.setUTCMonth(month);
- this.element.trigger({
- type: 'changeMonth',
- date: this.viewDate
- });
- if (this.viewSelect >= 3) {
- this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
- }
- } else if (target.is('.year')) {
- this.viewDate.setUTCDate(1);
- year = parseInt(target.text(), 10) || 0;
- this.viewDate.setUTCFullYear(year);
- this.element.trigger({
- type: 'changeYear',
- date: this.viewDate
- });
- if (this.viewSelect >= 4) {
- this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
- }
- } else if (target.is('.hour')) {
- hours = parseInt(target.text(), 10) || 0;
- if (target.hasClass('hour_am') || target.hasClass('hour_pm')) {
- if (hours == 12 && target.hasClass('hour_am')) {
- hours = 0;
- } else if (hours != 12 && target.hasClass('hour_pm')) {
- hours += 12;
- }
- }
- this.viewDate.setUTCHours(hours);
- this.element.trigger({
- type: 'changeHour',
- date: this.viewDate
- });
- if (this.viewSelect >= 1) {
- this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
- }
- } else if (target.is('.minute')) {
- minutes = parseInt(target.text().substr(target.text().indexOf(':') + 1), 10) || 0;
- this.viewDate.setUTCMinutes(minutes);
- this.element.trigger({
- type: 'changeMinute',
- date: this.viewDate
- });
- if (this.viewSelect >= 0) {
- this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
- }
- }
- if (this.viewMode != 0) {
- var oldViewMode = this.viewMode;
- this.showMode(-1);
- this.fill();
- if (oldViewMode == this.viewMode && this.autoclose) {
- this.hide();
- }
- } else {
- this.fill();
- if (this.autoclose) {
- this.hide();
- }
- }
- }
- break;
- case 'td':
- if (target.is('.day') && !target.is('.disabled')) {
- var day = parseInt(target.text(), 10) || 1;
- var year = this.viewDate.getUTCFullYear(),
- month = this.viewDate.getUTCMonth(),
- hours = this.viewDate.getUTCHours(),
- minutes = this.viewDate.getUTCMinutes(),
- seconds = this.viewDate.getUTCSeconds();
- if (target.is('.old')) {
- if (month === 0) {
- month = 11;
- year -= 1;
- } else {
- month -= 1;
- }
- } else if (target.is('.new')) {
- if (month == 11) {
- month = 0;
- year += 1;
- } else {
- month += 1;
- }
- }
- this.viewDate.setUTCFullYear(year);
- this.viewDate.setUTCMonth(month, day);
- this.element.trigger({
- type: 'changeDay',
- date: this.viewDate
- });
- if (this.viewSelect >= 2) {
- this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
- }
- }
- var oldViewMode = this.viewMode;
- this.showMode(-1);
- this.fill();
- if (oldViewMode == this.viewMode && this.autoclose) {
- this.hide();
- }
- break;
- }
- }
- },
-
- _setDate: function (date, which) {
- if (!which || which == 'date')
- this.date = date;
- if (!which || which == 'view')
- this.viewDate = date;
- this.fill();
- this.setValue();
- var element;
- if (this.isInput) {
- element = this.element;
- } else if (this.component) {
- element = this.element.find('input');
- }
- if (element) {
- element.change();
- if (this.autoclose && (!which || which == 'date')) {
- //this.hide();
- }
- }
- this.element.trigger({
- type: 'changeDate',
- date: this.date
- });
- },
-
- moveMinute: function (date, dir) {
- if (!dir) return date;
- var new_date = new Date(date.valueOf());
- //dir = dir > 0 ? 1 : -1;
- new_date.setUTCMinutes(new_date.getUTCMinutes() + (dir * this.minuteStep));
- return new_date;
- },
-
- moveHour: function (date, dir) {
- if (!dir) return date;
- var new_date = new Date(date.valueOf());
- //dir = dir > 0 ? 1 : -1;
- new_date.setUTCHours(new_date.getUTCHours() + dir);
- return new_date;
- },
-
- moveDate: function (date, dir) {
- if (!dir) return date;
- var new_date = new Date(date.valueOf());
- //dir = dir > 0 ? 1 : -1;
- new_date.setUTCDate(new_date.getUTCDate() + dir);
- return new_date;
- },
-
- moveMonth: function (date, dir) {
- if (!dir) return date;
- var new_date = new Date(date.valueOf()),
- day = new_date.getUTCDate(),
- month = new_date.getUTCMonth(),
- mag = Math.abs(dir),
- new_month, test;
- dir = dir > 0 ? 1 : -1;
- if (mag == 1) {
- test = dir == -1
- // If going back one month, make sure month is not current month
- // (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
- ? function () {
- return new_date.getUTCMonth() == month;
- }
- // If going forward one month, make sure month is as expected
- // (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
- : function () {
- return new_date.getUTCMonth() != new_month;
- };
- new_month = month + dir;
- new_date.setUTCMonth(new_month);
- // Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
- if (new_month < 0 || new_month > 11)
- new_month = (new_month + 12) % 12;
- } else {
- // For magnitudes >1, move one month at a time...
- for (var i = 0; i < mag; i++)
- // ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
- new_date = this.moveMonth(new_date, dir);
- // ...then reset the day, keeping it in the new month
- new_month = new_date.getUTCMonth();
- new_date.setUTCDate(day);
- test = function () {
- return new_month != new_date.getUTCMonth();
- };
- }
- // Common date-resetting loop -- if date is beyond end of month, make it
- // end of month
- while (test()) {
- new_date.setUTCDate(--day);
- new_date.setUTCMonth(new_month);
- }
- return new_date;
- },
-
- moveYear: function (date, dir) {
- return this.moveMonth(date, dir * 12);
- },
-
- dateWithinRange: function (date) {
- return date >= this.startDate && date <= this.endDate;
- },
-
- keydown: function (e) {
- if (this.picker.is(':not(:visible)')) {
- if (e.keyCode == 27) // allow escape to hide and re-show picker
- this.show();
- return;
- }
- var dateChanged = false,
- dir, day, month,
- newDate, newViewDate;
- switch (e.keyCode) {
- case 27: // escape
- this.hide();
- e.preventDefault();
- break;
- case 37: // left
- case 39: // right
- if (!this.keyboardNavigation) break;
- dir = e.keyCode == 37 ? -1 : 1;
- viewMode = this.viewMode;
- if (e.ctrlKey) {
- viewMode += 2;
- } else if (e.shiftKey) {
- viewMode += 1;
- }
- if (viewMode == 4) {
- newDate = this.moveYear(this.date, dir);
- newViewDate = this.moveYear(this.viewDate, dir);
- } else if (viewMode == 3) {
- newDate = this.moveMonth(this.date, dir);
- newViewDate = this.moveMonth(this.viewDate, dir);
- } else if (viewMode == 2) {
- newDate = this.moveDate(this.date, dir);
- newViewDate = this.moveDate(this.viewDate, dir);
- } else if (viewMode == 1) {
- newDate = this.moveHour(this.date, dir);
- newViewDate = this.moveHour(this.viewDate, dir);
- } else if (viewMode == 0) {
- newDate = this.moveMinute(this.date, dir);
- newViewDate = this.moveMinute(this.viewDate, dir);
- }
- if (this.dateWithinRange(newDate)) {
- this.date = newDate;
- this.viewDate = newViewDate;
- this.setValue();
- this.update();
- e.preventDefault();
- dateChanged = true;
- }
- break;
- case 38: // up
- case 40: // down
- if (!this.keyboardNavigation) break;
- dir = e.keyCode == 38 ? -1 : 1;
- viewMode = this.viewMode;
- if (e.ctrlKey) {
- viewMode += 2;
- } else if (e.shiftKey) {
- viewMode += 1;
- }
- if (viewMode == 4) {
- newDate = this.moveYear(this.date, dir);
- newViewDate = this.moveYear(this.viewDate, dir);
- } else if (viewMode == 3) {
- newDate = this.moveMonth(this.date, dir);
- newViewDate = this.moveMonth(this.viewDate, dir);
- } else if (viewMode == 2) {
- newDate = this.moveDate(this.date, dir * 7);
- newViewDate = this.moveDate(this.viewDate, dir * 7);
- } else if (viewMode == 1) {
- if (this.showMeridian) {
- newDate = this.moveHour(this.date, dir * 6);
- newViewDate = this.moveHour(this.viewDate, dir * 6);
- } else {
- newDate = this.moveHour(this.date, dir * 4);
- newViewDate = this.moveHour(this.viewDate, dir * 4);
- }
- } else if (viewMode == 0) {
- newDate = this.moveMinute(this.date, dir * 4);
- newViewDate = this.moveMinute(this.viewDate, dir * 4);
- }
- if (this.dateWithinRange(newDate)) {
- this.date = newDate;
- this.viewDate = newViewDate;
- this.setValue();
- this.update();
- e.preventDefault();
- dateChanged = true;
- }
- break;
- case 13: // enter
- if (this.viewMode != 0) {
- var oldViewMode = this.viewMode;
- this.showMode(-1);
- this.fill();
- if (oldViewMode == this.viewMode && this.autoclose) {
- this.hide();
- }
- } else {
- this.fill();
- if (this.autoclose) {
- this.hide();
- }
- }
- e.preventDefault();
- break;
- case 9: // tab
- this.hide();
- break;
- }
- if (dateChanged) {
- var element;
- if (this.isInput) {
- element = this.element;
- } else if (this.component) {
- element = this.element.find('input');
- }
- if (element) {
- element.change();
- }
- this.element.trigger({
- type: 'changeDate',
- date: this.date
- });
- }
- },
-
- showMode: function (dir) {
- if (dir) {
- var newViewMode = Math.max(0, Math.min(DPGlobal.modes.length - 1, this.viewMode + dir));
- if (newViewMode >= this.minView && newViewMode <= this.maxView) {
- this.element.trigger({
- type: 'changeMode',
- date: this.viewDate,
- oldViewMode: this.viewMode,
- newViewMode: newViewMode
- });
-
- this.viewMode = newViewMode;
- }
- }
- /*
- vitalets: fixing bug of very special conditions:
- jquery 1.7.1 + webkit + show inline datetimepicker in bootstrap popover.
- Method show() does not set display css correctly and datetimepicker is not shown.
- Changed to .css('display', 'block') solve the problem.
- See https://github.com/vitalets/x-editable/issues/37
-
- In jquery 1.7.2+ everything works fine.
- */
- //this.picker.find('>div').hide().filter('.datetimepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
- this.picker.find('>div').hide().filter('.datetimepicker-' + DPGlobal.modes[this.viewMode].clsName).css('display', 'block');
- this.updateNavArrows();
- },
-
- reset: function (e) {
- this._setDate(null, 'date');
- },
-
- convertViewModeText: function (viewMode) {
- switch (viewMode) {
- case 4:
- return 'decade';
- case 3:
- return 'year';
- case 2:
- return 'month';
- case 1:
- return 'day';
- case 0:
- return 'hour';
- }
- }
- };
-
- $.fn.datetimepicker = function (option) {
- var args = Array.apply(null, arguments);
- args.shift();
- var internal_return;
- this.each(function () {
- var $this = $(this),
- data = $this.data('datetimepicker'),
- options = typeof option == 'object' && option;
- if (!data) {
- $this.data('datetimepicker', (data = new Datetimepicker(this, $.extend({}, $.fn.datetimepicker.defaults, options))));
- }
- if (typeof option == 'string' && typeof data[option] == 'function') {
- internal_return = data[option].apply(data, args);
- if (internal_return !== undefined) {
- return false;
- }
- }
- });
- if (internal_return !== undefined)
- return internal_return;
- else
- return this;
- };
-
- $.fn.datetimepicker.defaults = {
- };
- $.fn.datetimepicker.Constructor = Datetimepicker;
- var dates = $.fn.datetimepicker.dates = {
- en: {
- days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
- daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
- daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
- months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
- monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
- meridiem: ["am", "pm"],
- suffix: ["st", "nd", "rd", "th"],
- today: "Today"
- }
- };
-
- var DPGlobal = {
- modes: [
- {
- clsName: 'minutes',
- navFnc: 'Hours',
- navStep: 1
- },
- {
- clsName: 'hours',
- navFnc: 'Date',
- navStep: 1
- },
- {
- clsName: 'days',
- navFnc: 'Month',
- navStep: 1
- },
- {
- clsName: 'months',
- navFnc: 'FullYear',
- navStep: 1
- },
- {
- clsName: 'years',
- navFnc: 'FullYear',
- navStep: 10
- }
- ],
- isLeapYear: function (year) {
- return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0))
- },
- getDaysInMonth: function (year, month) {
- return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
- },
- getDefaultFormat: function (type, field) {
- if (type == "standard") {
- if (field == 'input')
- return 'yyyy-mm-dd hh:ii';
- else
- return 'yyyy-mm-dd hh:ii:ss';
- } else if (type == "php") {
- if (field == 'input')
- return 'Y-m-d H:i';
- else
- return 'Y-m-d H:i:s';
- } else {
- throw new Error("Invalid format type.");
- }
- },
- validParts: function (type) {
- if (type == "standard") {
- return /hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g;
- } else if (type == "php") {
- return /[dDjlNwzFmMnStyYaABgGhHis]/g;
- } else {
- throw new Error("Invalid format type.");
- }
- },
- nonpunctuation: /[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,
- parseFormat: function (format, type) {
- // IE treats \0 as a string end in inputs (truncating the value),
- // so it's a bad format delimiter, anyway
- var separators = format.replace(this.validParts(type), '\0').split('\0'),
- parts = format.match(this.validParts(type));
- if (!separators || !separators.length || !parts || parts.length == 0) {
- throw new Error("Invalid date format.");
- }
- return {separators: separators, parts: parts};
- },
- parseDate: function (date, format, language, type) {
- if (date instanceof Date) {
- var dateUTC = new Date(date.valueOf() - date.getTimezoneOffset() * 60000);
- dateUTC.setMilliseconds(0);
- return dateUTC;
- }
- if (/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(date)) {
- format = this.parseFormat('yyyy-mm-dd', type);
- }
- if (/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(date)) {
- format = this.parseFormat('yyyy-mm-dd hh:ii', type);
- }
- if (/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(date)) {
- format = this.parseFormat('yyyy-mm-dd hh:ii:ss', type);
- }
- if (/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(date)) {
- var part_re = /([-+]\d+)([dmwy])/,
- parts = date.match(/([-+]\d+)([dmwy])/g),
- part, dir;
- date = new Date();
- for (var i = 0; i < parts.length; i++) {
- part = part_re.exec(parts[i]);
- dir = parseInt(part[1]);
- switch (part[2]) {
- case 'd':
- date.setUTCDate(date.getUTCDate() + dir);
- break;
- case 'm':
- date = Datetimepicker.prototype.moveMonth.call(Datetimepicker.prototype, date, dir);
- break;
- case 'w':
- date.setUTCDate(date.getUTCDate() + dir * 7);
- break;
- case 'y':
- date = Datetimepicker.prototype.moveYear.call(Datetimepicker.prototype, date, dir);
- break;
- }
- }
- return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(), 0);
- }
- var parts = date && date.match(this.nonpunctuation) || [],
- date = new Date(0, 0, 0, 0, 0, 0, 0),
- parsed = {},
- setters_order = ['hh', 'h', 'ii', 'i', 'ss', 's', 'yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'D', 'DD', 'd', 'dd', 'H', 'HH', 'p', 'P'],
- setters_map = {
- hh: function (d, v) {
- return d.setUTCHours(v);
- },
- h: function (d, v) {
- return d.setUTCHours(v);
- },
- HH: function (d, v) {
- return d.setUTCHours(v == 12 ? 0 : v);
- },
- H: function (d, v) {
- return d.setUTCHours(v == 12 ? 0 : v);
- },
- ii: function (d, v) {
- return d.setUTCMinutes(v);
- },
- i: function (d, v) {
- return d.setUTCMinutes(v);
- },
- ss: function (d, v) {
- return d.setUTCSeconds(v);
- },
- s: function (d, v) {
- return d.setUTCSeconds(v);
- },
- yyyy: function (d, v) {
- return d.setUTCFullYear(v);
- },
- yy: function (d, v) {
- return d.setUTCFullYear(2000 + v);
- },
- m: function (d, v) {
- v -= 1;
- while (v < 0) v += 12;
- v %= 12;
- d.setUTCMonth(v);
- while (d.getUTCMonth() != v)
- if (isNaN(d.getUTCMonth()))
- return d;
- else
- d.setUTCDate(d.getUTCDate() - 1);
- return d;
- },
- d: function (d, v) {
- return d.setUTCDate(v);
- },
- p: function (d, v) {
- return d.setUTCHours(v == 1 ? d.getUTCHours() + 12 : d.getUTCHours());
- }
- },
- val, filtered, part;
- setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
- setters_map['dd'] = setters_map['d'];
- setters_map['P'] = setters_map['p'];
- date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
- if (parts.length == format.parts.length) {
- for (var i = 0, cnt = format.parts.length; i < cnt; i++) {
- val = parseInt(parts[i], 10);
- part = format.parts[i];
- if (isNaN(val)) {
- switch (part) {
- case 'MM':
- filtered = $(dates[language].months).filter(function () {
- var m = this.slice(0, parts[i].length),
- p = parts[i].slice(0, m.length);
- return m == p;
- });
- val = $.inArray(filtered[0], dates[language].months) + 1;
- break;
- case 'M':
- filtered = $(dates[language].monthsShort).filter(function () {
- var m = this.slice(0, parts[i].length),
- p = parts[i].slice(0, m.length);
- return m.toLowerCase() == p.toLowerCase();
- });
- val = $.inArray(filtered[0], dates[language].monthsShort) + 1;
- break;
- case 'p':
- case 'P':
- val = $.inArray(parts[i].toLowerCase(), dates[language].meridiem);
- break;
- }
- }
- parsed[part] = val;
- }
- for (var i = 0, s; i < setters_order.length; i++) {
- s = setters_order[i];
- if (s in parsed && !isNaN(parsed[s]))
- setters_map[s](date, parsed[s])
- }
- }
- return date;
- },
- formatDate: function (date, format, language, type) {
- if (date == null) {
- return '';
- }
- var val;
- if (type == 'standard') {
- val = {
- // year
- yy: date.getUTCFullYear().toString().substring(2),
- yyyy: date.getUTCFullYear(),
- // month
- m: date.getUTCMonth() + 1,
- M: dates[language].monthsShort[date.getUTCMonth()],
- MM: dates[language].months[date.getUTCMonth()],
- // day
- d: date.getUTCDate(),
- D: dates[language].daysShort[date.getUTCDay()],
- DD: dates[language].days[date.getUTCDay()],
- p: (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''),
- // hour
- h: date.getUTCHours(),
- // minute
- i: date.getUTCMinutes(),
- // second
- s: date.getUTCSeconds()
- };
-
- if (dates[language].meridiem.length == 2) {
- val.H = (val.h % 12 == 0 ? 12 : val.h % 12);
- }
- else {
- val.H = val.h;
- }
- val.HH = (val.H < 10 ? '0' : '') + val.H;
- val.P = val.p.toUpperCase();
- val.hh = (val.h < 10 ? '0' : '') + val.h;
- val.ii = (val.i < 10 ? '0' : '') + val.i;
- val.ss = (val.s < 10 ? '0' : '') + val.s;
- val.dd = (val.d < 10 ? '0' : '') + val.d;
- val.mm = (val.m < 10 ? '0' : '') + val.m;
- } else if (type == 'php') {
- // php format
- val = {
- // year
- y: date.getUTCFullYear().toString().substring(2),
- Y: date.getUTCFullYear(),
- // month
- F: dates[language].months[date.getUTCMonth()],
- M: dates[language].monthsShort[date.getUTCMonth()],
- n: date.getUTCMonth() + 1,
- t: DPGlobal.getDaysInMonth(date.getUTCFullYear(), date.getUTCMonth()),
- // day
- j: date.getUTCDate(),
- l: dates[language].days[date.getUTCDay()],
- D: dates[language].daysShort[date.getUTCDay()],
- w: date.getUTCDay(), // 0 -> 6
- N: (date.getUTCDay() == 0 ? 7 : date.getUTCDay()), // 1 -> 7
- S: (date.getUTCDate() % 10 <= dates[language].suffix.length ? dates[language].suffix[date.getUTCDate() % 10 - 1] : ''),
- // hour
- a: (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''),
- g: (date.getUTCHours() % 12 == 0 ? 12 : date.getUTCHours() % 12),
- G: date.getUTCHours(),
- // minute
- i: date.getUTCMinutes(),
- // second
- s: date.getUTCSeconds()
- };
- val.m = (val.n < 10 ? '0' : '') + val.n;
- val.d = (val.j < 10 ? '0' : '') + val.j;
- val.A = val.a.toString().toUpperCase();
- val.h = (val.g < 10 ? '0' : '') + val.g;
- val.H = (val.G < 10 ? '0' : '') + val.G;
- val.i = (val.i < 10 ? '0' : '') + val.i;
- val.s = (val.s < 10 ? '0' : '') + val.s;
- } else {
- throw new Error("Invalid format type.");
- }
- var date = [],
- seps = $.extend([], format.separators);
- for (var i = 0, cnt = format.parts.length; i < cnt; i++) {
- if (seps.length) {
- date.push(seps.shift());
- }
- date.push(val[format.parts[i]]);
- }
- if (seps.length) {
- date.push(seps.shift());
- }
- return date.join('');
- },
- convertViewMode: function (viewMode) {
- switch (viewMode) {
- case 4:
- case 'decade':
- viewMode = 4;
- break;
- case 3:
- case 'year':
- viewMode = 3;
- break;
- case 2:
- case 'month':
- viewMode = 2;
- break;
- case 1:
- case 'day':
- viewMode = 1;
- break;
- case 0:
- case 'hour':
- viewMode = 0;
- break;
- }
-
- return viewMode;
- },
- headTemplate: '' +
- '' +
- ' | ' +
- ' | ' +
- ' | ' +
- '
' +
- '',
- headTemplateV3: '' +
- '' +
- ' | ' +
- ' | ' +
- ' | ' +
- '
' +
- '',
- contTemplate: ' |
',
- footTemplate: ' |
'
- };
- DPGlobal.template = '' +
- '
' +
- '
' +
- DPGlobal.headTemplate +
- DPGlobal.contTemplate +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
' +
- '
' +
- DPGlobal.headTemplate +
- DPGlobal.contTemplate +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
' +
- '
' +
- DPGlobal.headTemplate +
- '' +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
' +
- '
' +
- DPGlobal.headTemplate +
- DPGlobal.contTemplate +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
' +
- '
' +
- DPGlobal.headTemplate +
- DPGlobal.contTemplate +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
';
- DPGlobal.templateV3 = '' +
- '
' +
- '
' +
- DPGlobal.headTemplateV3 +
- DPGlobal.contTemplate +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
' +
- '
' +
- DPGlobal.headTemplateV3 +
- DPGlobal.contTemplate +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
' +
- '
' +
- DPGlobal.headTemplateV3 +
- '' +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
' +
- '
' +
- DPGlobal.headTemplateV3 +
- DPGlobal.contTemplate +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
' +
- '
' +
- DPGlobal.headTemplateV3 +
- DPGlobal.contTemplate +
- DPGlobal.footTemplate +
- '
' +
- '
' +
- '
';
- $.fn.datetimepicker.DPGlobal = DPGlobal;
-
- /* DATETIMEPICKER NO CONFLICT
- * =================== */
-
- $.fn.datetimepicker.noConflict = function () {
- $.fn.datetimepicker = old;
- return this;
- };
-
- /* DATETIMEPICKER DATA-API
- * ================== */
-
- $(document).on(
- 'focus.datetimepicker.data-api click.datetimepicker.data-api',
- '[data-provide="datetimepicker"]',
- function (e) {
- var $this = $(this);
- if ($this.data('datetimepicker')) return;
- e.preventDefault();
- // component click requires us to explicitly show it
- $this.datetimepicker('show');
- }
- );
- $(function () {
- $('[data-provide="datetimepicker-inline"]').datetimepicker();
- });
-
-}(window.jQuery);
diff --git a/chrono/manager/static/js/locales/bootstrap-datetimepicker.fr.js b/chrono/manager/static/js/locales/bootstrap-datetimepicker.fr.js
deleted file mode 100644
index 6a792aef..00000000
--- a/chrono/manager/static/js/locales/bootstrap-datetimepicker.fr.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * French translation for bootstrap-datetimepicker
- * Nico Mollet
- */
-;(function($){
- $.fn.datetimepicker.dates['fr'] = {
- days: ["Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche"],
- daysShort: ["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"],
- daysMin: ["D", "L", "Ma", "Me", "J", "V", "S", "D"],
- months: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
- monthsShort: ["Jan", "Fev", "Mar", "Avr", "Mai", "Jui", "Jul", "Aou", "Sep", "Oct", "Nov", "Dec"],
- today: "Aujourd'hui",
- suffix: [],
- meridiem: ["am", "pm"],
- weekStart: 1,
- format: "dd/mm/yyyy"
- };
-}(jQuery));
diff --git a/chrono/manager/templates/chrono/manager_base.html b/chrono/manager/templates/chrono/manager_base.html
index f255be4c..04981716 100644
--- a/chrono/manager/templates/chrono/manager_base.html
+++ b/chrono/manager/templates/chrono/manager_base.html
@@ -3,10 +3,7 @@
{% block extrascripts %}
{{ block.super }}
-
-
-
{% endblock %}
{% block page-title %}
diff --git a/chrono/manager/templates/chrono/widget_datetime.html b/chrono/manager/templates/chrono/widget_datetime.html
new file mode 100644
index 00000000..44c0118a
--- /dev/null
+++ b/chrono/manager/templates/chrono/widget_datetime.html
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/chrono/manager/widgets.py b/chrono/manager/widgets.py
index c12cf338..cd24ff5c 100644
--- a/chrono/manager/widgets.py
+++ b/chrono/manager/widgets.py
@@ -1,134 +1,49 @@
-# Bootstrap django-datetime-widget is a simple and clean widget for DateField,
-# Timefiled and DateTimeField in Django framework. It is based on Bootstrap
-# datetime picker, supports Bootstrap 2
+# chrono - agendas system
+# Copyright (C) 2016-2019 Entr'ouvert
#
-# https://github.com/asaglimbeni/django-datetime-widget
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
-# License: BSD
-# Initial Author: Alfredo Saglimbeni
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
-import json
-import re
-import uuid
+
+import datetime
from django.forms.widgets import DateTimeInput, TimeInput, SelectMultiple
-from django.utils.formats import get_language
+from django.utils import dateparse
from django.utils.safestring import mark_safe
-DATE_FORMAT_JS_PY_MAPPING = {
- 'P': '%p',
- 'ss': '%S',
- 'ii': '%M',
- 'hh': '%H',
- 'HH': '%I',
- 'dd': '%d',
- 'mm': '%m',
- 'yy': '%y',
- 'yyyy': '%Y',
-}
-DATE_FORMAT_TO_PYTHON_REGEX = re.compile(r'\b(' + '|'.join(DATE_FORMAT_JS_PY_MAPPING.keys()) + r')\b')
+class DateTimeWidget(DateTimeInput):
+ template_name = 'chrono/widget_datetime.html'
+ def format_value(self, value):
+ if value:
+ x = {
+ 'date': value.date().strftime('%Y-%m-%d'),
+ 'time': value.time().strftime('%H:%M'),
+ }
+ return x
+ return None
-DATE_FORMAT_PY_JS_MAPPING = {
- '%M': 'ii',
- '%m': 'mm',
- '%I': 'HH',
- '%H': 'hh',
- '%d': 'dd',
- '%Y': 'yyyy',
- '%y': 'yy',
- '%p': 'P',
- '%S': 'ss',
-}
-
-DATE_FORMAT_TO_JS_REGEX = re.compile(r'(?
- %(rendered_widget)s
- %(clear_button)s
-
-
-
- """
-
-CLEAR_BTN_TEMPLATE = """"""
-
-
-class PickerWidgetMixin(object):
-
- format_name = None
- glyphicon = None
-
- def __init__(self, attrs=None, options=None, usel10n=None):
-
- if attrs is None:
- attrs = {'readonly': ''}
-
- self.options = options
- if get_language():
- self.options['language'] = get_language().split('-')[0]
-
- # We're not doing localisation, get the Javascript date format provided by the user,
- # with a default, and convert it to a Python data format for later string parsing
- date_format = self.options['format']
- self.format = DATE_FORMAT_TO_PYTHON_REGEX.sub(
- lambda x: DATE_FORMAT_JS_PY_MAPPING[x.group()], date_format
- )
-
- super(PickerWidgetMixin, self).__init__(attrs, format=self.format)
-
- def render(self, name, value, attrs=None, renderer=None):
- final_attrs = self.build_attrs(attrs)
- rendered_widget = super(PickerWidgetMixin, self).render(name, value, final_attrs, renderer=renderer)
-
- # if not set, autoclose have to be true.
- self.options.setdefault('autoclose', True)
-
- # Build javascript options out of python dictionary
- options_list = []
- for key, value in iter(self.options.items()):
- options_list.append("%s: %s" % (key, json.dumps(value)))
-
- js_options = ",\n".join(options_list)
-
- # Use provided id or generate hex to avoid collisions in document
- id = final_attrs.get('id', uuid.uuid4().hex)
-
- return mark_safe(
- BOOTSTRAP_INPUT_TEMPLATE
- % dict(
- id=id,
- rendered_widget=rendered_widget,
- clear_button=CLEAR_BTN_TEMPLATE if self.options.get('clearBtn') else '',
- glyphicon=self.glyphicon,
- options=js_options,
- )
- )
-
-
-class DateTimeWidget(PickerWidgetMixin, DateTimeInput):
- """
- DateTimeWidget is the corresponding widget for Datetime field, it renders both the date and time
- sections of the datetime picker.
- """
-
- format_name = 'DATETIME_INPUT_FORMATS'
- glyphicon = 'glyphicon-th'
-
- def __init__(self, attrs=None, options=None, usel10n=None):
-
- if options is None:
- options = {}
-
- # Set the default options to show only the datepicker object
- options['format'] = options.get('format', 'dd/mm/yyyy hh:ii')
-
- super(DateTimeWidget, self).__init__(attrs, options, usel10n)
+ def value_from_datadict(self, data, files, name):
+ date_string = data.get(name + '$date')
+ time_string = data.get(name + '$time')
+ if not date_string or not time_string:
+ return None
+ date_value = dateparse.parse_date(date_string)
+ time_value = dateparse.parse_time(time_string)
+ if not date_value or not time_value:
+ return None
+ return datetime.datetime.combine(date_value, time_value)
class TimeWidget(TimeInput):
diff --git a/tests/test_manager.py b/tests/test_manager.py
index 04e135b6..11628e64 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -351,7 +351,8 @@ def test_add_event(app, admin_user):
assert "This agenda doesn't have any event yet." in resp.text
year = now().year + 1
resp = resp.click('New Event')
- resp.form['start_datetime'] = '%s-02-15 17:00' % year
+ resp.form['start_datetime$date'] = '%s-02-15' % year
+ resp.form['start_datetime$time'] = '17:00'
resp.form['places'] = 10
resp = resp.form.submit()
resp = resp.follow()
@@ -369,7 +370,8 @@ def test_add_event(app, admin_user):
# add with a description
resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
resp = resp.click('New Event')
- resp.form['start_datetime'] = '%s-02-15 18:00' % year
+ resp.form['start_datetime$date'] = '%s-02-15' % year
+ resp.form['start_datetime$time'] = '18:00'
resp.form['places'] = 11
resp.form['description'] = 'A description'
resp = resp.form.submit()
@@ -377,6 +379,22 @@ def test_add_event(app, admin_user):
event = Event.objects.get(places=11)
assert event.description == 'A description'
+ # add with errors in datetime parts
+ for parts in (
+ ('', ''),
+ ('invalid', ''),
+ ('', 'invalid'),
+ ('2019-02-24', 'invalid'),
+ ('invalid', '17:00'),
+ ):
+ resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
+ resp = resp.click('New Event')
+ resp.form['start_datetime$date'] = parts[0]
+ resp.form['start_datetime$time'] = parts[1]
+ resp.form['places'] = 10
+ resp = resp.form.submit()
+ assert resp.text.count('This field is required.') == 1
+
def test_add_event_on_missing_agenda(app, admin_user):
app = login(app)
@@ -398,7 +416,8 @@ def test_add_event_as_manager(app, manager_user):
resp = resp.click('Settings')
assert 'Settings' in resp.text
resp = resp.click('New Event')
- resp.form['start_datetime'] = '2016-02-15 17:00'
+ resp.form['start_datetime$date'] = '2016-02-15'
+ resp.form['start_datetime$time'] = '17:00'
resp.form['places'] = 10
resp = resp.form.submit()
resp = resp.follow()
@@ -417,8 +436,10 @@ def test_edit_event(app, admin_user):
app = login(app)
resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
resp = resp.click('Feb. 15, 2016, 5 p.m.')
- assert resp.form['start_datetime'].value == '15/02/2016 17:00'
- resp.form['start_datetime'] = '2016-02-16 17:00'
+ assert resp.form['start_datetime$date'].value == '2016-02-15'
+ assert resp.form['start_datetime$time'].value == '17:00'
+ resp.form['start_datetime$date'] = '2016-02-16'
+ resp.form['start_datetime$time'] = '17:00'
resp.form['places'] = 20
resp = resp.form.submit()
resp = resp.follow()
@@ -445,8 +466,10 @@ def test_edit_event_as_manager(app, manager_user):
agenda.save()
resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
resp = resp.click('Feb. 15, 2016, 5 p.m.')
- assert resp.form['start_datetime'].value == '15/02/2016 17:00'
- resp.form['start_datetime'] = '2016-02-16 17:00'
+ assert resp.form['start_datetime$date'].value == '2016-02-15'
+ assert resp.form['start_datetime$time'].value == '17:00'
+ resp.form['start_datetime$date'] = '2016-02-16'
+ resp.form['start_datetime$time'] = '17:00'
resp.form['places'] = 20
resp = resp.form.submit()
resp = resp.follow()
@@ -954,8 +977,10 @@ def test_meetings_agenda_add_time_period_exception(app, admin_user):
tomorrow = make_aware(today + datetime.timedelta(days=1))
dt_format = '%Y-%m-%d %H:%M'
resp.form['label'] = 'Exception 1'
- resp.form['start_datetime'] = tomorrow.replace(hour=8).strftime(dt_format)
- resp.form['end_datetime'] = tomorrow.replace(hour=16).strftime(dt_format)
+ resp.form['start_datetime$date'] = tomorrow.strftime('%Y-%m-%d')
+ resp.form['start_datetime$time'] = '08:00'
+ resp.form['end_datetime$date'] = tomorrow.strftime('%Y-%m-%d')
+ resp.form['end_datetime$time'] = '16:00'
resp = resp.form.submit().follow()
assert TimePeriodException.objects.count() == 1
time_period_exception = TimePeriodException.objects.first()
@@ -969,8 +994,10 @@ def test_meetings_agenda_add_time_period_exception(app, admin_user):
resp = resp.click('Add a time period exception', index=1)
future = tomorrow + datetime.timedelta(days=15)
resp.form['label'] = 'Exception 2'
- resp.form['start_datetime'] = future.replace(hour=0, minute=0).strftime(dt_format)
- resp.form['end_datetime'] = future.replace(hour=16).strftime(dt_format)
+ resp.form['start_datetime$date'] = future.strftime('%Y-%m-%d')
+ resp.form['start_datetime$time'] = '00:00'
+ resp.form['end_datetime$date'] = future.strftime('%Y-%m-%d')
+ resp.form['end_datetime$time'] = '16:00'
resp = resp.form.submit().follow()
assert TimePeriodException.objects.count() == 2
assert 'Exception 1' in resp.text
@@ -1001,8 +1028,10 @@ def test_meetings_agenda_add_time_period_exception_when_booking_exists(app, admi
# fields should be marked with errors
assert resp.text.count('This field is required.') == 2
# try again with data in fields
- resp.form['start_datetime'] = '2017-05-22 08:00'
- resp.form['end_datetime'] = '2017-05-26 17:30'
+ resp.form['start_datetime$date'] = '2017-05-22'
+ resp.form['start_datetime$time'] = '08:00'
+ resp.form['end_datetime$date'] = '2017-05-26'
+ resp.form['end_datetime$time'] = '17:30'
resp = resp.form.submit()
assert 'One or several bookings exists within this time slot.' in resp.text
assert TimePeriodException.objects.count() == 0
@@ -1015,8 +1044,10 @@ def test_meetings_agenda_add_time_period_exception_when_booking_exists(app, admi
resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
resp = resp.click('Settings')
resp = resp.click('Add a time period exception', href='desk/%s/' % desk.id)
- resp.form['start_datetime'] = '2017-05-22 08:00'
- resp.form['end_datetime'] = '2017-05-26 17:30'
+ resp.form['start_datetime$date'] = '2017-05-22'
+ resp.form['start_datetime$time'] = '08:00'
+ resp.form['end_datetime$date'] = '2017-05-26'
+ resp.form['end_datetime$time'] = '17:30'
resp = resp.form.submit()
assert TimePeriodException.objects.count() == 1
@@ -1038,8 +1069,10 @@ def test_meetings_agenda_add_time_period_exception_when_cancelled_booking_exists
resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
resp = resp.click('Settings')
resp = resp.click('Add a time period exception')
- resp.form['start_datetime'] = '2017-05-22 08:00'
- resp.form['end_datetime'] = '2017-05-26 17:30'
+ resp.form['start_datetime$date'] = '2017-05-22'
+ resp.form['start_datetime$time'] = '08:00'
+ resp.form['end_datetime$date'] = '2017-05-26'
+ resp.form['end_datetime$time'] = '17:30'
resp = resp.form.submit()
assert 'One or several bookings exists within this time slot.' not in resp.text
assert TimePeriodException.objects.count() == 1
@@ -1056,8 +1089,10 @@ def test_meetings_agenda_add_invalid_time_period_exception(app, admin_user):
resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
resp = resp.click('Settings')
resp = resp.click('Add a time period exception')
- resp.form['start_datetime'] = '2017-05-26 17:30'
- resp.form['end_datetime'] = '2017-05-22 08:00'
+ resp.form['start_datetime$date'] = '2017-05-26'
+ resp.form['start_datetime$time'] = '17:30'
+ resp.form['end_datetime$date'] = '2017-05-22'
+ resp.form['end_datetime$time'] = '08:00'
resp = resp.form.submit()
assert 'End datetime must be greater than start datetime.' in resp.text
@@ -1077,8 +1112,10 @@ def test_meetings_agenda_delete_time_period_exception(app, admin_user):
tomorrow = make_aware(today + datetime.timedelta(days=15))
dt_format = '%Y-%m-%d %H:%M'
resp.form['label'] = 'Exception 1'
- resp.form['start_datetime'] = tomorrow.replace(hour=8).strftime(dt_format)
- resp.form['end_datetime'] = tomorrow.replace(hour=16).strftime(dt_format)
+ resp.form['start_datetime$date'] = tomorrow.strftime('%Y-%m-%d')
+ resp.form['start_datetime$time'] = '08:00'
+ resp.form['end_datetime$date'] = tomorrow.strftime('%Y-%m-%d')
+ resp.form['end_datetime$time'] = '16:00'
resp = resp.form.submit().follow()
assert TimePeriodException.objects.count() == 1
time_period_exception = TimePeriodException.objects.first()
@@ -1946,7 +1983,8 @@ def test_agenda_view_edit_event(app, manager_user):
resp = app.get(event_url)
assert 'Options' in resp.text
resp = resp.click('Options')
- resp.form['start_datetime'] = agenda.event_set.first().start_datetime.strftime('%Y-%m-%d %H:%M')
+ resp.form['start_datetime$date'] = agenda.event_set.first().start_datetime.strftime('%Y-%m-%d')
+ resp.form['start_datetime$time'] = agenda.event_set.first().start_datetime.strftime('%H:%M')
resp = resp.form.submit(status=302).follow()
assert event_url == resp.request.url