* добавил минуты
* исправил баг в календаре с 12 месяцем ('yyyy-00-dd' => 'yyyy-12-dd')
This commit is contained in:
@ -18,7 +18,7 @@ echo GridView::widget([
|
||||
if ($model->task) {
|
||||
$i = 1;
|
||||
foreach ($model->task as $task) {
|
||||
$text .= "<p>$i. ($task->hours_spent ч.) $task->task</p>";
|
||||
$text .= "<p>$i. ($task->hours_spent ч., $task->minutes_spent мин.) $task->task</p>";
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ echo GridView::widget([
|
||||
if ($model->task) {
|
||||
$i = 1;
|
||||
foreach ($model->task as $task) {
|
||||
$text .= "<p>$i. ($task->hours_spent ч.) $task->task</p>";
|
||||
$text .= "<p>$i. ($task->hours_spent ч., $task->minutes_spent мин.) $task->task</p>";
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
@ -10,6 +10,8 @@ use yii\widgets\ActiveForm;
|
||||
/* @var $this yii\web\View */
|
||||
/* @var $model common\models\Reports */
|
||||
/* @var $form yii\widgets\ActiveForm */
|
||||
|
||||
$this->registerCss('.list-cell__task{width:73%}')
|
||||
?>
|
||||
|
||||
<div class="reports-form">
|
||||
@ -52,6 +54,13 @@ use yii\widgets\ActiveForm;
|
||||
'style' => 'width:100px'
|
||||
],
|
||||
],
|
||||
[
|
||||
'name' => 'minutes_spent',
|
||||
'title' => 'Кол-во минут',
|
||||
'options' => [
|
||||
'type' => 'number',
|
||||
],
|
||||
],
|
||||
],
|
||||
])->label('Какие задачаи были выполнены:'); ?>
|
||||
|
||||
|
@ -37,7 +37,7 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||
if ($model->task) {
|
||||
$i = 1;
|
||||
foreach ($model->task as $task) {
|
||||
$text .= "<p>$i. ($task->hours_spent ч.) $task->task</p>";
|
||||
$text .= "<p>$i. ($task->hours_spent ч., $task->minutes_spent мин.) $task->task</p>";
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
@ -68,7 +68,7 @@ class DateHelper {
|
||||
static dateToString(date) {
|
||||
let year = date.getFullYear()
|
||||
let day = this.intToDate(date.getDate())
|
||||
let month = this.intToDate(this.isDecember(date) ? 0 : date.getMonth() + 1)
|
||||
let month = this.intToDate(date.getMonth() + 1)
|
||||
return year + '-' + month + '-' + day
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user