apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/add_task' into add_task

Browse Source
This commit is contained in:
iIronside
2021-12-21 17:39:44 +03:00
parent 1fa8fa5009 da9334dcf6
commit ce25dc44ea
24 changed files with 308 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/modules/reports/views/ajax/_gridViewOneUser.php
View File

@ -19,7 +19,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++;
}
}

2
backend/modules/reports/views/reports/_expand-row-details.php
View File

@ -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
backend/modules/reports/views/reports/_form.php
View File

@ -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">
@ -27,6 +29,7 @@ use yii\widgets\ActiveForm;
echo '<b>Дата заполнения отчета:</b>';
echo DatePicker::widget([
'model' => $model,
'language' => 'ru',
'attribute' => 'created_at',
'options' => [],
'pluginOptions' => [
@ -52,6 +55,13 @@ use yii\widgets\ActiveForm;
'style' => 'width:100px'
],
],
[
'name' => 'minutes_spent',
'title' => 'Кол-во минут',
'options' => [
'type' => 'number',
],
],
],
])->label('Какие задачаи были выполнены:'); ?>

2
backend/modules/reports/views/reports/view.php
View File

@ -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++;
}
}