Commit 98648e80e6f68f3f09ac496c390f6d5c6b436c68

Authored by Alexey Boroda
1 parent fbd691b3

-Time stamp need to test fix

Showing 2 changed files with 49 additions and 34 deletions   Show diff stats
@@ -221,7 +221,7 @@ @@ -221,7 +221,7 @@
221 ], 221 ],
222 [ 222 [
223 [ 223 [
224 - 'deadline', 224 + 'deadTime',
225 'name', 225 'name',
226 'numbercard', 226 'numbercard',
227 'declaration', 227 'declaration',
@@ -252,44 +252,62 @@ @@ -252,44 +252,62 @@
252 parent::afterSave($insert, $changedAttributes); 252 parent::afterSave($insert, $changedAttributes);
253 } 253 }
254 254
  255 + public function getDeadTime()
  256 + {
  257 + if (empty($this->deadline)) {
  258 + return null;
  259 + } else {
  260 + return date('d.m.Y', $this->deadline);
  261 + }
  262 + }
  263 +
  264 + public function setDeadTime($value)
  265 + {
  266 + if (empty($value)) {
  267 + $this->deadline = null;
  268 + } else {
  269 + $this->deadline = strtotime($value);
  270 + }
  271 + }
  272 +
255 /** 273 /**
256 * @inheritdoc 274 * @inheritdoc
257 */ 275 */
258 - public function afterFind()  
259 - {  
260 - parent::afterFind();  
261 - $this->deadline = !empty($this->deadline) ? date('d.m.Y', $this->deadline) : '';  
262 -  
263 - } 276 +// public function afterFind()
  277 +// {
  278 +// parent::afterFind();
  279 +// $this->deadline = !empty($this->deadline) ? date('d.m.Y', $this->deadline) : '';
  280 +//
  281 +// }
264 282
265 /** 283 /**
266 * @inheritdoc 284 * @inheritdoc
267 */ 285 */
268 - public function beforeSave($insert)  
269 - {  
270 - if (parent::beforeSave($insert)) {  
271 -  
272 - $this->convertDate();  
273 - return true;  
274 - }  
275 - return false;  
276 -  
277 - } 286 +// public function beforeSave($insert)
  287 +// {
  288 +// if (parent::beforeSave($insert)) {
  289 +//
  290 +// $this->convertDate();
  291 +// return true;
  292 +// }
  293 +// return false;
  294 +//
  295 +// }
278 296
279 /** 297 /**
280 * Convert some date 298 * Convert some date
281 */ 299 */
282 - protected function convertDate()  
283 - {  
284 - if (!empty($this->deadline)) {  
285 - $date = new \DateTime();  
286 - $date->setTimestamp(strtotime($this->deadline));  
287 - $date->format("d.m.Y");  
288 - $this->deadline = $date->getTimestamp();  
289 -  
290 - }  
291 -  
292 - } 300 +// protected function convertDate()
  301 +// {
  302 +// if (!empty($this->deadline)) {
  303 +// $date = new \DateTime();
  304 +// $date->setTimestamp(strtotime($this->deadline));
  305 +// $date->format("d.m.Y");
  306 +// $this->deadline = $date->getTimestamp();
  307 +//
  308 +// }
  309 +//
  310 +// }
293 311
294 /** 312 /**
295 * @inheritdoc 313 * @inheritdoc
views/order/_form.php
@@ -173,15 +173,12 @@ JS; @@ -173,15 +173,12 @@ JS;
173 <div class="col-sm-6"> 173 <div class="col-sm-6">
174 174
175 <?php 175 <?php
176 - $model->deadline = date('d.m.Y', (int) $model->deadline);  
177 - echo $form->field($model, 'deadline') 176 +// $model->deadline = date('d.m.Y', (int) $model->deadline);
  177 + echo $form->field($model, 'deadTime')
178 ->widget( 178 ->widget(
179 DatePicker::className(), 179 DatePicker::className(),
180 [ 180 [
181 - 'disabled' => !$permissions->checkAttr('deadline'),  
182 - 'pluginOptions' => [  
183 - 'format' => 'dd.mm.yyyy',  
184 - ], 181 +// 'disabled' => !$permissions->checkAttr('deadline'),
185 ] 182 ]
186 ) ?> 183 ) ?>
187 184