Commit 76a1b0feca404177329d1a337e28897fd923af45

Authored by Yarik
1 parent 1c67655e

test

common/models/BlogSearch.php
... ... @@ -110,7 +110,7 @@
110 110 'between',
111 111 'date_add',
112 112 $this->date_add_from,
113   - $this->date_add_to,
  113 + (new \DateTime($this->date_add_to))->modify('+1 day')->format('Y-m-d')
114 114 ]);
115 115  
116 116 $query->andFilterWhere([
... ...
common/models/GallerySearch.php
... ... @@ -107,7 +107,7 @@
107 107 'between',
108 108 'date_add',
109 109 $this->date_add_from,
110   - $this->date_add_to,
  110 + (new \DateTime($this->date_add_to))->modify('+1 day')->format('Y-m-d')
111 111 ]);
112 112  
113 113 $query->andFilterWhere([
... ...
common/models/PortfolioSearch.php
... ... @@ -126,7 +126,7 @@
126 126 'between',
127 127 'date_add',
128 128 $this->date_add_from,
129   - $this->date_add_to,
  129 + (new \DateTime($this->date_add_to))->modify('+1 day')->format('Y-m-d')
130 130 ]);
131 131  
132 132 $query->andFilterWhere(
... ...
common/models/VacancySearch.php
... ... @@ -107,7 +107,7 @@
107 107 'between',
108 108 'date_add',
109 109 $this->date_add_from,
110   - $this->date_add_to,
  110 + (new \DateTime($this->date_add_to))->modify('+1 day')->format('Y-m-d'),
111 111 ]);
112 112  
113 113 $query->andFilterWhere([
... ...
common/widgets/views/courses_field.php
... ... @@ -25,7 +25,7 @@
25 25 <label for="cours-name-<?= $label ?>">Название</label>
26 26 </div>
27 27 <div class="input-blocks">
28   - <input id="cours-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][1][year]"/>
  28 + <input id="cours-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][1][year]" min="1950" max="<?=date('Y')?>" />
29 29 <label for="cours-year-<?= $label ?>">год</label>
30 30 </div>
31 31 <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
... ... @@ -56,7 +56,7 @@
56 56 '<label for="cours-name-' + start_label_<?=$this->context->id?> +'">Название</label>'+
57 57 '</div>'+
58 58 '<div class="input-blocks">'+
59   - '<input id="cours-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
  59 + '<input id="cours-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" min="1950" max="<?=date('Y')?>" />' +
60 60 '<label for="cours-year-' + start_label_<?=$this->context->id?> +'">год</label>'+
61 61 '</div>'+
62 62 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
... ...
common/widgets/views/development_field.php
... ... @@ -23,7 +23,7 @@
23 23 <label for="dev-name-<?= $label ?>">Название</label>
24 24 </div>
25 25 <div class="input-blocks">
26   - <input id="dev-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][1][year]"/>
  26 + <input id="dev-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][1][year]" min="1950" max="<?=date('Y')?>" />
27 27 <label for="dev-year-<?= $label ?>">год</label>
28 28 </div>
29 29 <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
... ... @@ -51,11 +51,11 @@
51 51 .parent ('fieldset');
52 52 var sub_block = '<div class="form-group" >' +
53 53 '<div class="input-blocks">'+
54   - '<input id="dev-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="Телефон" class="form-control custom-input-2" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
  54 + '<input id="dev-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
55 55 '<label for="dev-name-' + start_label_<?=$this->context->id?> +'">Название</label>'+
56 56 '</div>'+
57 57 '<div class="input-blocks">'+
58   - '<input id="dev-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
  58 + '<input id="dev-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" min="1950" max="<?=date('Y')?>" />' +
59 59 '<label for="dev-year-' + start_label_<?=$this->context->id?> +'">год</label>'+
60 60 '</div>'+
61 61 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
... ...
common/widgets/views/education_field.php
... ... @@ -26,11 +26,11 @@
26 26 <label for="edu-name-<?= $label ?>">Название ВУЗа</label>
27 27 </div>
28 28 <div class="input-blocks">
29   - <input id="edu-to-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][1][year_from]"/>
  29 + <input id="edu-to-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][1][year_from]" min="1950" max="<?=date('Y')?>" />
30 30 <label for="edu-to-<?= $label ?>">год начала</label>
31 31 </div>
32 32 <div class="input-blocks">
33   - <input id="edu-out-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]"/>
  33 + <input id="edu-out-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]" min="1950" />
34 34 <label for="edu-out-<?= $label ?>">год окончания</label>
35 35 </div>
36 36 <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
... ... @@ -59,15 +59,15 @@
59 59 .parent ('fieldset');
60 60 var sub_block = '<div class="form-group" >' +
61 61 '<div class="input-blocks">'+
62   - '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
  62 + '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="Название" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
63 63 '<label for="edu-name-' + start_label_<?=$this->context->id?> +'">Название ВУЗа</label>'+
64 64 '</div>'+
65 65 '<div class="input-blocks">'+
66   - '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" />' +
  66 + '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" min="1950" max="<?=date('Y')?>" />' +
67 67 '<label for="edu-to-' + start_label_<?=$this->context->id?> +'">год начала</label>'+
68 68 '</div>'+
69 69 '<div class="input-blocks">'+
70   - '<input id="edu-out-' + ++start_label_<?=$this->context->id?> +'"" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" />' +
  70 + '<input id="edu-out-' + ++start_label_<?=$this->context->id?> +'"" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" min="1950" />' +
71 71 '<label for="edu-out-' + start_label_<?=$this->context->id?> +'">год окончания</label>'+
72 72 '</div>'+
73 73 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
... ...