Skip to content

T
taskonsite-архив-перенесен
Commit cd19e627 authored by Олег Гиммельшпах's avatar Олег Гиммельшпах
Browse files
Options

#1044 - Натянуть верстку

parent e1734e20
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 591 additions and 644 deletions
backend/config/main.php
View file @ cd19e627
...@@ -28,6 +28,7 @@ return [ ...@@ -28,6 +28,7 @@ return [
'triggers' => ['class' => 'common\modules\triggers\Module'], 'triggers' => ['class' => 'common\modules\triggers\Module'],
'message-template' => ['class' => 'common\modules\messageTemplate\Module'], 'message-template' => ['class' => 'common\modules\messageTemplate\Module'],
'school' => ['class' => 'common\modules\school\Module'], 'school' => ['class' => 'common\modules\school\Module'],
'support' => ['class' => 'common\modules\support\Module'],
'rbac' => ['class' => 'common\modules\rbac\rbac'], 'rbac' => ['class' => 'common\modules\rbac\rbac'],
], ],
'components' => [ 'components' => [
......
common/modules/support/controllers/SupportController.php
View file @ cd19e627
...@@ -5,6 +5,7 @@ namespace common\modules\support\controllers; ...@@ -5,6 +5,7 @@ namespace common\modules\support\controllers;
use Yii; use Yii;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\web\Controller; use yii\web\Controller;
use yii\web\NotFoundHttpException;
use common\modules\support\models\redmine\Issue; use common\modules\support\models\redmine\Issue;
use common\modules\support\models\redmine\IssueSearch; use common\modules\support\models\redmine\IssueSearch;
...@@ -45,12 +46,20 @@ class SupportController extends Controller ...@@ -45,12 +46,20 @@ class SupportController extends Controller
public function actionIndex() public function actionIndex()
{ {
$searchModel = new IssueSearch(); $s = Yii::$app->request->get('s');
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
$works = Issue::find()->me()->search($s)->work()->all();
$ratings = Issue::find()->me()->search($s)->rating()->all();
$tests = Issue::find()->me()->search($s)->test()->all();
$approves = Issue::find()->me()->search($s)->approve()->all();
$accepteds = Issue::find()->me()->search($s)->accepted()->all();
return $this->render('index', [ return $this->render('index', [
'searchModel' => $searchModel, 'works' => $works,
'dataProvider' => $dataProvider, 'ratings' => $ratings,
'tests' => $tests,
'approves' => $approves,
'accepteds' => $accepteds,
]); ]);
} }
...@@ -66,4 +75,37 @@ class SupportController extends Controller ...@@ -66,4 +75,37 @@ class SupportController extends Controller
]); ]);
} }
} }
public function actionView($id)
{
$model = $this->findModel($id);
if($model->author_id != Yii::$app->support->identity->support_id)
{
throw new NotFoundHttpException('Доступ запрещен!');
}
return $this->render('view', [
'model' => $model,
]);
}
/**
* Finds the Post model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown.
* @param integer $id
* @return Post the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
protected function findModel($id)
{
if (($model = Issue::findOne($id)) !== null)
{
return $model;
}
else
{
throw new NotFoundHttpException('The requested page does not exist.');
}
}
} }
common/modules/support/models/redmine/Issue.php
View file @ cd19e627
...@@ -119,4 +119,13 @@ class Issue extends \common\components\ActiveRecordModel ...@@ -119,4 +119,13 @@ class Issue extends \common\components\ActiveRecordModel
'paid' => 'Paid', 'paid' => 'Paid',
]; ];
} }
}
/**
* @inheritdoc
* @return IssueQuery the active query used by this AR class.
*/
public static function find()
{
return new IssueQuery(get_called_class());
}
}
\ No newline at end of file
common/modules/support/models/redmine/IssueQuery.php 0 → 100644
View file @ cd19e627
<?php
namespace common\modules\support\models\redmine;
use Yii;
use common\models\Settings;
/**
* This is the ActiveQuery class for [[Issue]].
*
* @see Issue
*/
class IssueQuery extends \yii\db\ActiveQuery
{
public $orderBy = ['created_on' => SORT_DESC];
public function search($s)
{
if($s && trim($s) != '')
{
return $this->andWhere(['like', 'subject', $s]);
}
return $this;
}
public function me()
{
return $this->andWhere(['author_id' => Yii::$app->support->identity->support_id]);
}
public function work()
{
$status = Settings::getValue('support-status-work');
return $this->andWhere(['status_id' => $status]);
}
public function rating()
{
$status = Settings::getValue('support-status-new');
return $this->andWhere(['status_id' => $status]);
}
public function test()
{
$status = Settings::getValue('support-status-test');
return $this->andWhere(['status_id' => $status]);
}
public function approve()
{
$status = Settings::getValue('support-status-approve');
return $this->andWhere(['status_id' => $status]);
}
public function accepted()
{
$status = Settings::getValue('support-status-accepted');
return $this->andWhere(['status_id' => $status]);
}
/**
* @inheritdoc
* @return Issue[]|array
*/
public function all($db = null)
{
return parent::all($db);
}
/**
* @inheritdoc
* @return Issue|array|null
*/
public function one($db = null)
{
return parent::one($db);
}
}
common/modules/support/models/redmine/IssueSearch.php deleted 100644 → 0
View file @ e1734e20
<?php
namespace common\modules\support\models\redmine;
use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\modules\support\models\redmine\Issue;
/**
* IssueSearch represents the model behind the search form about `common\modules\support\models\redmine\Issue`.
*/
class IssueSearch extends Issue
{
/**
* @inheritdoc
*/
public function rules()
{
return [
[['id', 'tracker_id', 'project_id', 'category_id', 'status_id', 'assigned_to_id', 'priority_id', 'fixed_version_id', 'author_id', 'lock_version', 'done_ratio', 'parent_id', 'root_id', 'lft', 'rgt', 'is_private', 'assigned_to_manager_id', 'assigned_to_customer_id', 'paid'], 'integer'],
[['subject', 'description', 'due_date', 'created_on', 'updated_on', 'start_date', 'closed_on', 'type_price'], 'safe'],
[['estimated_hours', 'price_for_customer', 'max_price_for_developer', 'price_developer'], 'number'],
];
}
/**
* @inheritdoc
*/
public function scenarios()
{
// bypass scenarios() implementation in the parent class
return Model::scenarios();
}
/**
* Creates data provider instance with search query applied
*
* @param array $params
*
* @return ActiveDataProvider
*/
public function search($params)
{
$query = Issue::find();
// add conditions that should always apply here
$dataProvider = new ActiveDataProvider([
'query' => $query,
]);
$this->load($params);
if (!$this->validate()) {
// uncomment the following line if you do not want to return any records when validation fails
// $query->where('0=1');
return $dataProvider;
}
$query->andWhere(['author_id' => Yii::$app->support->identity->support_id]);
// grid filtering conditions
$query->andFilterWhere([
'id' => $this->id,
'tracker_id' => $this->tracker_id,
'project_id' => $this->project_id,
'due_date' => $this->due_date,
'category_id' => $this->category_id,
'status_id' => $this->status_id,
'assigned_to_id' => $this->assigned_to_id,
'priority_id' => $this->priority_id,
'fixed_version_id' => $this->fixed_version_id,
'author_id' => $this->author_id,
'lock_version' => $this->lock_version,
'created_on' => $this->created_on,
'updated_on' => $this->updated_on,
'start_date' => $this->start_date,
'done_ratio' => $this->done_ratio,
'estimated_hours' => $this->estimated_hours,
'parent_id' => $this->parent_id,
'root_id' => $this->root_id,
'lft' => $this->lft,
'rgt' => $this->rgt,
'is_private' => $this->is_private,
'closed_on' => $this->closed_on,
'assigned_to_manager_id' => $this->assigned_to_manager_id,
'assigned_to_customer_id' => $this->assigned_to_customer_id,
'price_for_customer' => $this->price_for_customer,
'max_price_for_developer' => $this->max_price_for_developer,
'price_developer' => $this->price_developer,
'paid' => $this->paid,
]);
$query->andFilterWhere(['like', 'subject', $this->subject])
->andFilterWhere(['like', 'description', $this->description])
->andFilterWhere(['like', 'type_price', $this->type_price]);
return $dataProvider;
}
}
common/modules/support/models/redmine/IssueStatus.php deleted 100644 → 0
View file @ e1734e20
<?php
namespace common\modules\support\models\redmine;
use Yii;
/**
* This is the model class for table "issue_statuses".
*
* @property integer $id
* @property string $name
* @property integer $is_closed
* @property integer $position
* @property integer $default_done_ratio
* @property string $status_custumer_name
* @property integer $status_custumer_edit
* @property integer $send_mesage_to_customer
* @property integer $send_mesage_to_manager
* @property integer $send_mesage_to_developer
* @property integer $closed_manager
* @property integer $closed_developer
* @property string $status_developer_name
* @property integer $watch_by_developer
* @property integer $watch_by_manager
* @property integer $watch_by_customer
* @property integer $status
*/
class IssueStatus extends \common\components\ActiveRecordModel
{
/**
* @inheritdoc
*/
public function name()
{
return 'Статус задач Redmine';
}
/**
* @inheritdoc
*/
public static function tableName()
{
return 'issue_statuses';
}
/**
* @return \yii\db\Connection the database connection used by this AR class.
*/
public static function getDb()
{
return Yii::$app->get('dbSupport');
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['is_closed', 'position', 'default_done_ratio', 'status_custumer_edit', 'send_mesage_to_customer', 'send_mesage_to_manager', 'send_mesage_to_developer', 'closed_manager', 'closed_developer', 'watch_by_developer', 'watch_by_manager', 'watch_by_customer', 'status'], 'integer'],
[['name'], 'string', 'max' => 30],
[['status_custumer_name', 'status_developer_name'], 'string', 'max' => 255],
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id' => 'ID',
'name' => 'Name',
'is_closed' => 'Is Closed',
'position' => 'Position',
'default_done_ratio' => 'Default Done Ratio',
'status_custumer_name' => 'Status Custumer Name',
'status_custumer_edit' => 'Status Custumer Edit',
'send_mesage_to_customer' => 'Send Mesage To Customer',
'send_mesage_to_manager' => 'Send Mesage To Manager',
'send_mesage_to_developer' => 'Send Mesage To Developer',
'closed_manager' => 'Closed Manager',
'closed_developer' => 'Closed Developer',
'status_developer_name' => 'Status Developer Name',
'watch_by_developer' => 'Watch By Developer',
'watch_by_manager' => 'Watch By Manager',
'watch_by_customer' => 'Watch By Customer',
'status' => 'Status',
];
}
}
common/modules/support/views/issue/_form.php deleted 100644 → 0
View file @ e1734e20
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/* @var $this yii\web\View */
/* @var $model common\modules\support\models\redmine\Issue */
/* @var $form yii\widgets\ActiveForm */
?>
<div class="issue-form">
<?php $form = ActiveForm::begin(); ?>
<?= $form->field($model, 'tracker_id')->textInput() ?>
<?= $form->field($model, 'project_id')->textInput() ?>
<?= $form->field($model, 'subject')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'description')->textarea(['rows' => 6]) ?>
<?= $form->field($model, 'due_date')->textInput() ?>
<?= $form->field($model, 'category_id')->textInput() ?>
<?= $form->field($model, 'status_id')->textInput() ?>
<?= $form->field($model, 'assigned_to_id')->textInput() ?>
<?= $form->field($model, 'priority_id')->textInput() ?>
<?= $form->field($model, 'fixed_version_id')->textInput() ?>
<?= $form->field($model, 'author_id')->textInput() ?>
<?= $form->field($model, 'lock_version')->textInput() ?>
<?= $form->field($model, 'created_on')->textInput() ?>
<?= $form->field($model, 'updated_on')->textInput() ?>
<?= $form->field($model, 'start_date')->textInput() ?>
<?= $form->field($model, 'done_ratio')->textInput() ?>
<?= $form->field($model, 'estimated_hours')->textInput() ?>
<?= $form->field($model, 'parent_id')->textInput() ?>
<?= $form->field($model, 'root_id')->textInput() ?>
<?= $form->field($model, 'lft')->textInput() ?>
<?= $form->field($model, 'rgt')->textInput() ?>
<?= $form->field($model, 'is_private')->textInput() ?>
<?= $form->field($model, 'closed_on')->textInput() ?>
<?= $form->field($model, 'assigned_to_manager_id')->textInput() ?>
<?= $form->field($model, 'assigned_to_customer_id')->textInput() ?>
<?= $form->field($model, 'price_for_customer')->textInput() ?>
<?= $form->field($model, 'max_price_for_developer')->textInput() ?>
<?= $form->field($model, 'price_developer')->textInput() ?>
<?= $form->field($model, 'type_price')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'paid')->textInput() ?>
<div class="form-group">
<?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>
common/modules/support/views/issue/_search.php deleted 100644 → 0
View file @ e1734e20
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/* @var $this yii\web\View */
/* @var $model common\modules\support\models\redmine\IssueSearch */
/* @var $form yii\widgets\ActiveForm */
?>
<div class="issue-search">
<?php $form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
<?= $form->field($model, 'id') ?>
<?= $form->field($model, 'tracker_id') ?>
<?= $form->field($model, 'project_id') ?>
<?= $form->field($model, 'subject') ?>
<?= $form->field($model, 'description') ?>
<?php // echo $form->field($model, 'due_date') ?>
<?php // echo $form->field($model, 'category_id') ?>
<?php // echo $form->field($model, 'status_id') ?>
<?php // echo $form->field($model, 'assigned_to_id') ?>
<?php // echo $form->field($model, 'priority_id') ?>
<?php // echo $form->field($model, 'fixed_version_id') ?>
<?php // echo $form->field($model, 'author_id') ?>
<?php // echo $form->field($model, 'lock_version') ?>
<?php // echo $form->field($model, 'created_on') ?>
<?php // echo $form->field($model, 'updated_on') ?>
<?php // echo $form->field($model, 'start_date') ?>
<?php // echo $form->field($model, 'done_ratio') ?>
<?php // echo $form->field($model, 'estimated_hours') ?>
<?php // echo $form->field($model, 'parent_id') ?>
<?php // echo $form->field($model, 'root_id') ?>
<?php // echo $form->field($model, 'lft') ?>
<?php // echo $form->field($model, 'rgt') ?>
<?php // echo $form->field($model, 'is_private') ?>
<?php // echo $form->field($model, 'closed_on') ?>
<?php // echo $form->field($model, 'assigned_to_manager_id') ?>
<?php // echo $form->field($model, 'assigned_to_customer_id') ?>
<?php // echo $form->field($model, 'price_for_customer') ?>
<?php // echo $form->field($model, 'max_price_for_developer') ?>
<?php // echo $form->field($model, 'price_developer') ?>
<?php // echo $form->field($model, 'type_price') ?>
<?php // echo $form->field($model, 'paid') ?>
<div class="form-group">
<?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>
common/modules/support/views/issue/create.php deleted 100644 → 0
View file @ e1734e20
<?php
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\modules\support\models\redmine\Issue */
$this->title = 'Create Issue';
$this->params['breadcrumbs'][] = ['label' => 'Issues', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="issue-create">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
</div>
common/modules/support/views/issue/index.php deleted 100644 → 0
View file @ e1734e20
<?php
use yii\helpers\Html;
use yii\grid\GridView;
/* @var $this yii\web\View */
/* @var $searchModel common\modules\support\models\redmine\IssueSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
$this->title = 'Issues';
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="issue-index">
<h1><?= Html::encode($this->title) ?></h1>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?= Html::a('Create Issue', ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'columns' => [
['class' => 'yii\grid\SerialColumn'],
'id',
'tracker_id',
'project_id',
'subject',
'description:ntext',
// 'due_date',
// 'category_id',
// 'status_id',
// 'assigned_to_id',
// 'priority_id',
// 'fixed_version_id',
// 'author_id',
// 'lock_version',
// 'created_on',
// 'updated_on',
// 'start_date',
// 'done_ratio',
// 'estimated_hours',
// 'parent_id',
// 'root_id',
// 'lft',
// 'rgt',
// 'is_private',
// 'closed_on',
// 'assigned_to_manager_id',
// 'assigned_to_customer_id',
// 'price_for_customer',
// 'max_price_for_developer',
// 'price_developer',
// 'type_price',
// 'paid',
['class' => 'yii\grid\ActionColumn'],
],
]); ?>
</div>
common/modules/support/views/issue/update.php deleted 100644 → 0
View file @ e1734e20
<?php
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\modules\support\models\redmine\Issue */
$this->title = 'Update Issue: ' . ' ' . $model->id;
$this->params['breadcrumbs'][] = ['label' => 'Issues', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
$this->params['breadcrumbs'][] = 'Update';
?>
<div class="issue-update">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
</div>
common/modules/support/views/issue/view.php deleted 100644 → 0
View file @ e1734e20
<?php
use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model common\modules\support\models\redmine\Issue */
$this->title = $model->id;
$this->params['breadcrumbs'][] = ['label' => 'Issues', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="issue-view">
<h1><?= Html::encode($this->title) ?></h1>
<p>
<?= Html::a('Update', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?= Html::a('Delete', ['delete', 'id' => $model->id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Are you sure you want to delete this item?',
'method' => 'post',
],
]) ?>
</p>
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id',
'tracker_id',
'project_id',
'subject',
'description:ntext',
'due_date',
'category_id',
'status_id',
'assigned_to_id',
'priority_id',
'fixed_version_id',
'author_id',
'lock_version',
'created_on',
'updated_on',
'start_date',
'done_ratio',
'estimated_hours',
'parent_id',
'root_id',
'lft',
'rgt',
'is_private',
'closed_on',
'assigned_to_manager_id',
'assigned_to_customer_id',
'price_for_customer',
'max_price_for_developer',
'price_developer',
'type_price',
'paid',
],
]) ?>
</div>
common/modules/support/views/support/_loop.php 0 → 100644
View file @ cd19e627
<?php
use yii\helpers\Html;
?>
<?php if($models) : ?>
<div class="panel-group panel-group-2" id="accordion_2">
<div class="panel panel-default">
<div class="panel-heading table-responsive">
<table class="w100pr table_header">
<tbody>
<tr>
<td>
<p class="panel-title2 pull-left">
<!-- <a href=""><span class="glyphicon glyphicon-align-justify"></span></a>&nbsp;&nbsp; -->
<a href=""><strong><?=$title?></strong></a>&nbsp;&nbsp;
</p>
</td>
<td class="box_td">
<p><strong>Дата <br> поступления</strong></p>
</td>
<td class="box_td">
<p><strong>Срок <br> исполнения</strong></p>
</td>
<td class="box_td">
<p><strong>Стоимость <br> руб.</strong></p>
</td>
</tr>
</tbody>
</table>
</div>
<div id="collapse_1" class="panel-collapse collapse in">
<?php foreach ($models as $model) : ?>
<div class="panel-body panel-body-ex-1 color_on_cursor gray_box_2">
<table class="w100pr">
<tbody>
<tr>
<td class="box_td_fir">
<!-- <div class="arrov_poz pull-left">
<a href=""><span class="caret caret_top"></span></a>
<a href=""><span class="caret"></span></a>
</div> -->
<span><?=$model->id?></span>
</td>
<td class="box_td_cont">
<p><strong><?=Html::a($model->subject, ['/support/view/'.$model->id])?></strong></p>
</td>
<td class="box_td">
<span><?=date('d.m.Y', strtotime($model->created_on))?></span>
</td>
<td class="box_td">
<span><?=($model->due_date?date('d.m.Y', strtotime($model->due_date)):'')?></span>
</td>
<td class="box_td">
<p class="pull-left"><strong><?=Yii::$app->formatter->asCurrency($model->price_for_customer, 'RUR', [], [\NumberFormatter::CURRENCY_SYMBOL => '₽'])?></strong></p>
<?php if($model->paid) : ?>
<div class="tooltip_wr pull-right">
<div class="tooltip_box">Счет был выставлен</div>
<span class="tooltip_cont"><img src="/images/score_icon.jpg" height="24" width="19" alt=""></span>
</div>
<?php endif; ?>
</td>
</tr>
</tbody>
</table>
</div>
<?php endforeach; ?>
</div>
</div>
</div>
<?php endif; ?>
\ No newline at end of file
common/modules/support/views/support/create.php 0 → 100644
View file @ cd19e627
<div class="container_white">
<div class="container">
<div class="right_box_top row">
<div class="col-md-6 col-xs-6 col-sm-12">
<h2>Создание задачи</h2>
</div>
<div class="col-md-6 col-xs-6 col-sm-12">
<div class="logo_taskon">
<span>Разработанно в: </span>
<a href=""><img src="/images/logo_taskon.png" height="44" width="135" alt=""></a>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<p class="label_p"><strong>Заголовок задачи</strong></p>
<input type="text" class="form-control" placeholder="Дизайн оформления витринных окон для ресторана Subway">
</div>
<div class="col-md-3 col-xs-6 col-sm-12">
<p class="label_p"><strong>Тип задачи</strong></p>
<select class="form-control">
<option>Выберите тип задачи</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
</select>
</div>
<div class="col-md-3 col-xs-6 col-sm-12">
<p class="label_p">Важность</p>
<div class="important_box important_button_text">
<p class="important_button_text_1">Важная</p>
<p class="important_button_text_2">Обычная</p>
<div class="important_button"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<p class="label_p"><strong>Текст задачи</strong></p>
<div class="text_box_form">
<div class="text_box_form_top"><img src="/images/text_box_img.jpg" width="100%" alt=""></div>
<textarea>Повторный контакт консолидирует стратегический маркетинг, не считаясь с затратами. Лидерство в продажах нейтрализует институциональный инструмент маркетинга, невзирая на действия конкурентов. Интересно отметить, что взаимодействие корпорации и клиента недостижимо. Рекламный макет трансформирует рыночный рекламный клаттер, используя опыт предыдущих кампаний.</textarea>
<button class="gray_button">Прикрепить файл<i class="glyphicon glyphicon-paperclip"></i></button>
<br>
<button class="btn btn-success-2">Создать задачу</button>
</div>
</div>
</div>
<br>
<br>
</div>
</div>
\ No newline at end of file
common/modules/support/views/support/index.php
View file @ cd19e627
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\grid\GridView; use yii\grid\GridView;
use yii\widgets\ActiveForm;
?> ?>
...@@ -25,18 +26,29 @@ use yii\grid\GridView; ...@@ -25,18 +26,29 @@ use yii\grid\GridView;
<div class="col-md-3 col-xs-3 col-sm-12 dropdown-menu-my"> <div class="col-md-3 col-xs-3 col-sm-12 dropdown-menu-my">
<button type="button" class="btn btn-success-2 dropdown-menu-my-button"><span class="glyphicon glyphicon-plus"></span> Добавить задачу</button> <?=Html::a('<span class="glyphicon glyphicon-plus"></span> Добавить задачу', ['/support/create'], ['class' => 'btn btn-success-2 dropdown-menu-my-button'])?>
</div> </div>
<!-- <div class="col-md-9 col-xs-9 col-sm-12"> <div class="col-md-9 col-xs-9 col-sm-12">
<div class="input-group">
<input type="text" class="form-control"> <?php $form = ActiveForm::begin([
<span class="input-group-btn"> 'method' => 'GET',
<button class="btn btn-default-2 btn-size-2" type="button"><span class="glyphicon glyphicon-search"></span></button> 'action' => '/support',
</span> 'options' => [
</div> 'class' => 'search-form'
</div> --> ]
]); ?>
<div class="input-group">
<?=Html::textInput('s', Yii::$app->request->get('s'), ['class' => 'form-control']); ?>
<span class="input-group-btn">
<?= Html::submitButton('<span class="glyphicon glyphicon-search"></span>', ['class' => 'btn btn-default-2 btn-size-2']) ?>
</span>
</div>
<?php ActiveForm::end(); ?>
</div>
</div> </div>
...@@ -48,72 +60,15 @@ use yii\grid\GridView; ...@@ -48,72 +60,15 @@ use yii\grid\GridView;
<table class="table"> <table class="table">
<tr> <tr>
<td class="no_pad"> <td class="no_pad">
<?=$this->render('_loop', ['models' => $ratings, 'title' => 'Задачи на оценке']);?>
<div class="panel-group panel-group-2" id="accordion_2"> <?=$this->render('_loop', ['models' => $works, 'title' => 'Задачи в работе']);?>
<div class="panel panel-default">
<div class="panel-heading table-responsive"> <?=$this->render('_loop', ['models' => $tests, 'title' => 'Задачи на тестировании']);?>
<table class="w100pr table_header"> <?=$this->render('_loop', ['models' => $approves, 'title' => 'Задачи ожидающие проверки']);?>
<tbody>
<tr>
<td>
<p class="panel-title2 pull-left">
<a href=""><span class="glyphicon glyphicon-align-justify"></span></a>&nbsp;&nbsp;
<a href=""><strong>Задачи в работе</strong></a>&nbsp;&nbsp;
</p>
</td>
<td class="box_td">
<p><strong>Дата <br> поступления</strong></p>
</td>
<td class="box_td">
<p><strong>Срок <br> исполнения</strong></p>
</td>
<td class="box_td">
<p><strong>Стоимость <br> руб.</strong></p>
</td>
</tr>
</tbody>
</table>
</div>
<div id="collapse_1" class="panel-collapse collapse in">
<div class="panel-body panel-body-ex-1 color_on_cursor gray_box_2">
<table class="w100pr">
<tbody>
<tr>
<td class="box_td_fir">
<div class="arrov_poz pull-left">
<a href=""><span class="caret caret_top"></span></a>
<a href=""><span class="caret"></span></a>
</div>
<span>1777</span>
</td>
<td class="box_td_cont">
<p><strong>Ошибка при добавлении точки. Ошибка при добавлении запятой, ошибка при создании отправлений</strong></p>
</td>
<td class="box_td">
<span>23.09.2015</span>
</td>
<td class="box_td">
<span>24.08.2015</span>
</td>
<td class="box_td">
<p class="pull-left"><strong>17 000,17</strong></p>
<div class="tooltip_wr pull-right">
<div class="tooltip_box">Счет был выставлен</div>
<span class="tooltip_cont"><img src="/images/score_icon.jpg" height="24" width="19" alt=""></span>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -121,45 +76,27 @@ use yii\grid\GridView; ...@@ -121,45 +76,27 @@ use yii\grid\GridView;
<br> <br>
<?php if($accepteds) : ?>
<a href="#" class="separator_close">Закрытые задачи</a>
<a href="" class="separator_close">Закрытые задачи</a> <?php foreach ($accepteds as $model) : ?>
<div class="panel-body panel-body-ex-1 panel-body-ex-2"> <div class="panel-body panel-body-ex-1 panel-body-ex-2">
<div data-toggle="buttons"> <div data-toggle="buttons">
<label class="btn pull-left active"> <label class="btn pull-left active">
<input type="checkbox"> <input type="checkbox">
</label> </label>
<div class="text-mes"> <div class="text-mes">
<p>Партлювация перемещает грунт как при нагреве</p> <p><?=$model->subject?></p>
</div> </div>
</div> </div>
</div> </div>
<div class="panel-body panel-body-ex-1 panel-body-ex-2"> <?php endforeach; ?>
<div data-toggle="buttons"> <?php endif; ?>
<label class="btn pull-left active">
<input type="checkbox">
</label>
<div class="text-mes">
<p>Массоперенос, вследствие пространственной неоднородности почвенного покрова</p>
</div>
</div>
</div>
<div class="panel-body panel-body-ex-1 panel-body-ex-2"> <br>
<div data-toggle="buttons">
<label class="btn pull-left active">
<input type="checkbox">
</label>
<div class="text-mes">
<p>Аллювий аналитически дает тензиометр только в отсутствие</p>
</div>
</div>
</div>
<br>
<br> <br>
</div> </div>
......
common/modules/support/views/support/view.php 0 → 100644
View file @ cd19e627
This diff is collapsed.
console/migrations/m160304_035059_add_setting.php 0 → 100644
View file @ cd19e627
<?php
use yii\db\Migration;
class m160304_035059_add_setting extends Migration
{
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
$this->insert('settings', [
'module_id' => 'support',
'code' => 'support-status-new',
'name' => 'Статус на оценке',
'value' => '7,9',
'element' => 'text',
'hidden' => 0,
'description' => 'Введите ID статусов через запятую',
]);
$this->insert('settings', [
'module_id' => 'support',
'code' => 'support-status-work',
'name' => 'Статус в работе',
'value' => '1,8,13,15,17,18',
'element' => 'text',
'hidden' => 0,
'description' => 'Введите ID статусов через запятую',
]);
$this->insert('settings', [
'module_id' => 'support',
'code' => 'support-status-test',
'name' => 'Статус на тестирование',
'value' => '10',
'element' => 'text',
'hidden' => 0,
'description' => 'Введите ID статусов через запятую',
]);
$this->insert('settings', [
'module_id' => 'support',
'code' => 'support-status-approve',
'name' => 'Статус ожидает проверки',
'value' => '16',
'element' => 'text',
'hidden' => 0,
'description' => 'Введите ID статусов через запятую',
]);
$this->insert('settings', [
'module_id' => 'support',
'code' => 'support-status-accepted',
'name' => 'Статус принято',
'value' => '14',
'element' => 'text',
'hidden' => 0,
'description' => 'Введите ID статусов через запятую',
]);
}
public function safeDown()
{
$this->delete('settings', ['code' => 'support-status-new']);
$this->delete('settings', ['code' => 'support-status-work']);
$this->delete('settings', ['code' => 'support-status-test']);
$this->delete('settings', ['code' => 'support-status-approve']);
$this->delete('settings', ['code' => 'support-status-accepted']);
}
}
frontend/config/main.php
View file @ cd19e627
...@@ -177,6 +177,7 @@ return [ ...@@ -177,6 +177,7 @@ return [
'support/login' => 'support/default/login', 'support/login' => 'support/default/login',
'support/logout' => 'support/default/logout', 'support/logout' => 'support/default/logout',
'support' => 'support/support/index', 'support' => 'support/support/index',
'support/<_a>/<id:\d+>' => 'support/support/<_a>',
'support/<_a>' => 'support/support/<_a>', 'support/<_a>' => 'support/support/<_a>',
'school' => 'school/course/index', 'school' => 'school/course/index',
'school/course/<id>' => 'school/course/view', 'school/course/<id>' => 'school/course/view',
......
frontend/web/js/custom.js
View file @ cd19e627
$(document).ready(function() { $(document).ready(function() {
$(".important_button").click(function () {
$(this).toggleClass("important_button_active");
});
$(".important_button").click(function () {
$(".important_button_text").toggleClass("important_button_text_active");
});
$(window).scroll(function(){ $(window).scroll(function(){
if($(window).scrollTop() > 700) if($(window).scrollTop() > 700)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

task-on.com - ООО "Арт Проект"