diff --git a/.docs/assets.md b/.docs/assets.md index 541d991d..dcc9c8b1 100644 --- a/.docs/assets.md +++ b/.docs/assets.md @@ -11,7 +11,6 @@ DataGrid needs for its precise functionality some third party scripts and styles **CSS (external)** - bootstrap -- bootstrap datepicker - bootstrap select **CSS** @@ -25,7 +24,6 @@ DataGrid needs for its precise functionality some third party scripts and styles - nette forms - nette ajax / naja - bootstrap -- bootstrap datepicker - bootstrap select **JS** @@ -59,7 +57,6 @@ package.json: ```json { "dependencies": { - "bootstrap-datepicker": "^1.9", "bootstrap-select": "^1.13", "bootstrap": "^4.4.1", "happy-inputs": "^2.0", @@ -81,7 +78,6 @@ package.json: - @@ -102,7 +98,6 @@ package.json: - diff --git a/.docs/filters.md b/.docs/filters.md index 5cb530f4..3006e0d1 100644 --- a/.docs/filters.md +++ b/.docs/filters.md @@ -189,17 +189,6 @@ Keep in mind that `FilterMultiSelect` uses `bootstrap-select` JS library. Read m $grid->addFilterDate('created', 'User registerd on'); ``` -This filter also has some special features. First, it shows datepicker. Second, You can set date format. Sadly, JavaScript has different date formatting modifiers, so you have to set them both at once: - -```php -/** - * This is default formatting - * $php_format, $js_format - */ -$grid->addFilterDate('created', 'User registerd on') - ->setFormat('j. n. Y', 'd. m. yyyy'); -``` - ## FilterRange This filter renders two inputs: From and To. If you want to set inputs placeholders, you have to set both in an array. diff --git a/src/Filter/FilterDate.php b/src/Filter/FilterDate.php index d000d4f0..14c3de3a 100644 --- a/src/Filter/FilterDate.php +++ b/src/Filter/FilterDate.php @@ -12,12 +12,7 @@ class FilterDate extends OneColumnFilter implements IFilterDate /** * @var string */ - protected $template = 'datagrid_filter_date.latte'; - - /** - * @var array - */ - protected $format = ['j. n. Y', 'd. m. yyyy']; + protected $template = 'datagrid_filter_text.latte'; /** * @var string @@ -28,11 +23,7 @@ public function addToFormContainer(Container $container): void { $control = $container->addText($this->key, $this->name); - $control->setAttribute('data-provide', 'datepicker') - ->setAttribute('data-date-orientation', 'bottom') - ->setAttribute('data-date-format', $this->getJsFormat()) - ->setAttribute('data-date-today-highlight', 'true') - ->setAttribute('data-date-autoclose', 'true'); + $control->setType('date'); $this->addAttributes($control); @@ -46,32 +37,12 @@ public function addToFormContainer(Container $container): void } - /** - * Set format for datepicker etc - */ - public function setFormat(string $phpFormat, string $jsFormat): IFilterDate - { - $this->format = [$phpFormat, $jsFormat]; - - return $this; - } - - /** * Get php format for datapicker */ public function getPhpFormat(): string { - return $this->format[0]; - } - - - /** - * Get js format for datepicker - */ - public function getJsFormat(): string - { - return $this->format[1]; + return 'Y-m-d'; } } diff --git a/src/Filter/FilterDateRange.php b/src/Filter/FilterDateRange.php index 83ef3518..72858b7e 100644 --- a/src/Filter/FilterDateRange.php +++ b/src/Filter/FilterDateRange.php @@ -12,12 +12,7 @@ class FilterDateRange extends FilterRange implements IFilterDate /** * @var string */ - protected $template = 'datagrid_filter_daterange.latte'; - - /** - * @var array - */ - protected $format = ['j. n. Y', 'd. m. yyyy']; + protected $template = 'datagrid_filter_range.latte'; /** * @var string @@ -33,19 +28,11 @@ public function addToFormContainer(Container $container): void $from = $container->addText('from', $this->name); - $from->setAttribute('data-provide', 'datepicker') - ->setAttribute('data-date-orientation', 'bottom') - ->setAttribute('data-date-format', $this->getJsFormat()) - ->setAttribute('data-date-today-highlight', 'true') - ->setAttribute('data-date-autoclose', 'true'); + $from->setType('date'); $to = $container->addText('to', $this->nameSecond); - $to->setAttribute('data-provide', 'datepicker') - ->setAttribute('data-date-orientation', 'bottom') - ->setAttribute('data-date-format', $this->getJsFormat()) - ->setAttribute('data-date-today-highlight', 'true') - ->setAttribute('data-date-autoclose', 'true'); + $to->setType('date'); $this->addAttributes($from); $this->addAttributes($to); @@ -73,32 +60,12 @@ public function addToFormContainer(Container $container): void } - /** - * Set format for datepicker etc - */ - public function setFormat(string $phpFormat, string $jsFormat): IFilterDate - { - $this->format = [$phpFormat, $jsFormat]; - - return $this; - } - - /** * Get php format for datapicker */ public function getPhpFormat(): string { - return $this->format[0]; - } - - - /** - * Get js format for datepicker - */ - public function getJsFormat(): string - { - return $this->format[1]; + return 'Y-m-d'; } } diff --git a/src/Filter/IFilterDate.php b/src/Filter/IFilterDate.php index cfe8b9f1..fc950f65 100644 --- a/src/Filter/IFilterDate.php +++ b/src/Filter/IFilterDate.php @@ -7,20 +7,9 @@ interface IFilterDate { - /** - * Set format for datepicker etc - */ - public function setFormat(string $phpFormat, string $jsFormat): IFilterDate; - - /** * Get php format for datapicker */ public function getPhpFormat(): string; - - /** - * Get js format for datepicker - */ - public function getJsFormat(): string; } diff --git a/src/templates/datagrid_filter_date.latte b/src/templates/datagrid_filter_date.latte deleted file mode 100644 index e8efde7c..00000000 --- a/src/templates/datagrid_filter_date.latte +++ /dev/null @@ -1,32 +0,0 @@ -{** - * @param Filter $filter - * @param Nette\Forms\Controls\TextInput $input - * @param string $iconPrefix Icon prefix (fa fa-) - *} - -{if $outer} -
- {label $input class => 'col-sm-3 control-label' /} -
-
- {input $input} -
- -
-
-
-
-{else} -
-
- {input $input} -
- -
-
-
-{/if} diff --git a/src/templates/datagrid_filter_daterange.latte b/src/templates/datagrid_filter_daterange.latte deleted file mode 100644 index a50936d8..00000000 --- a/src/templates/datagrid_filter_daterange.latte +++ /dev/null @@ -1,56 +0,0 @@ -{** - * @param Filter $filter - * @param Nette\Forms\Container $input - * @param string $iconPrefix Icon prefix (fa fa-) - *} - -{var $container = $input} - -{if $outer} -
- {label $container['from'], class => 'col-sm-3 control-label' /} -
-
- {input $container['from']} -
- -
-
-
- {label $container['to'], class => 'filter-range-delimiter col-sm-1 control-label' /} -
-
- {input $container['to']} -
- -
-
-
-
-{else} -
-
- {input $container['from']} -
- -
-
- -
-
- -
- {input $container['to']} -
- -
-
-
-{/if}