Skip to content

T
taskonsite-архив-перенесен
Commit b32508a1 authored by Шакарим Сапа's avatar Шакарим Сапа
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b06f1b2e 2d5f1eca
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 944 additions and 37 deletions
common/modules/support/controllers/SupportController.php
View file @ b32508a1
...@@ -4,6 +4,7 @@ namespace common\modules\support\controllers; ...@@ -4,6 +4,7 @@ namespace common\modules\support\controllers;
use Yii; use Yii;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\ArrayHelper;
use yii\web\Controller; use yii\web\Controller;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;
...@@ -47,18 +48,16 @@ class SupportController extends Controller ...@@ -47,18 +48,16 @@ class SupportController extends Controller
public function actionIndex() public function actionIndex()
{ {
$client = new \Redmine\Client('http://help-russia.ru', Yii::$app->support->identity->redmine_key); $client = $this->getClient();
$works = $client->issue->all([ $user = $client->user->getCurrentUser();
'author_id' => 23
$models = $client->issue->all([
'author_id' => $user['user']['id'],
]); ]);
return $this->render('index', [ return $this->render('index', [
'works' => $works, 'models' => $models,
// 'ratings' => $ratings,
// 'tests' => $tests,
// 'approves' => $approves,
// 'accepteds' => $accepteds,
]); ]);
} }
...@@ -77,9 +76,13 @@ class SupportController extends Controller ...@@ -77,9 +76,13 @@ class SupportController extends Controller
public function actionView($id) public function actionView($id)
{ {
$model = $this->findModel($id); $client = $this->getClient();
$user = $client->user->getCurrentUser();
$model = $client->issue->show($id);
if($model->author_id != Yii::$app->support->identity->support_id) if(empty($model['issue']) || $model['issue']['author']['id'] != $user['user']['id'])
{ {
throw new NotFoundHttpException('Доступ запрещен!'); throw new NotFoundHttpException('Доступ запрещен!');
} }
...@@ -89,22 +92,8 @@ class SupportController extends Controller ...@@ -89,22 +92,8 @@ class SupportController extends Controller
]); ]);
} }
/** protected function getClient()
* 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 $client = new \Redmine\Client(Settings::getValue('redmine-url'), Yii::$app->support->identity->redmine_key);
{
return $model;
}
else
{
throw new NotFoundHttpException('The requested page does not exist.');
}
} }
} }
common/modules/support/models/redmine/IssueHelper.php 0 → 100644
View file @ b32508a1
<?php
namespace common\modules\support\models\redmine;
use common\models\Settings;
class IssueHelper
{
public static function sort($issues)
{
$settings = [
[
'statuses' => explode(',', Settings::getValue('support-status-work')),
'title' => 'Задачи в работе',
],
[
'statuses' => explode(',', Settings::getValue('support-status-new')),
'title' => 'Задачи на оценке',
],
[
'statuses' => explode(',', Settings::getValue('support-status-test')),
'title' => 'Задачи на тестировании',
],
[
'statuses' => explode(',', Settings::getValue('support-status-approve')),
'title' => 'Задачи ожидающие проверки',
],
[
'statuses' => explode(',', Settings::getValue('support-status-accepted')),
'title' => 'Закрытые задачи',
'close' => true
],
];
foreach ($issues as $issue)
{
foreach ($settings as &$setting)
{
if(in_array($issue['status']['id'], $setting['statuses']))
{
$setting['models'][] = $issue;
}
}
}
unset($setting);
return $settings;
}
}
\ No newline at end of file
common/modules/support/views/support/_loop.php
View file @ b32508a1
...@@ -4,7 +4,7 @@ use yii\helpers\Html; ...@@ -4,7 +4,7 @@ use yii\helpers\Html;
?> ?>
<?php if($output['issues']) : ?> <?php if($output) : ?>
<div class="panel-group panel-group-2" id="accordion_2"> <div class="panel-group panel-group-2" id="accordion_2">
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -35,7 +35,7 @@ use yii\helpers\Html; ...@@ -35,7 +35,7 @@ use yii\helpers\Html;
</div> </div>
<div id="collapse_1" class="panel-collapse collapse in"> <div id="collapse_1" class="panel-collapse collapse in">
<?php foreach ($output['issues'] as $model) : ?> <?php foreach ($output as $model) : ?>
<div class="panel-body panel-body-ex-1 color_on_cursor gray_box_2"> <div class="panel-body panel-body-ex-1 color_on_cursor gray_box_2">
<table class="w100pr"> <table class="w100pr">
<tbody> <tbody>
......
common/modules/support/views/support/index.php
View file @ b32508a1
...@@ -4,6 +4,8 @@ use yii\helpers\Html; ...@@ -4,6 +4,8 @@ use yii\helpers\Html;
use yii\grid\GridView; use yii\grid\GridView;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use common\modules\support\models\redmine\IssueHelper;
?> ?>
<div class="client_interface"> <div class="client_interface">
...@@ -60,14 +62,22 @@ use yii\widgets\ActiveForm; ...@@ -60,14 +62,22 @@ use yii\widgets\ActiveForm;
<table class="table"> <table class="table">
<tr> <tr>
<td class="no_pad"> <td class="no_pad">
<?=$this->render('_loop', ['output' => $ratings, 'title' => 'Задачи на оценке']);?>
<?=$this->render('_loop', ['output' => $works, 'title' => 'Задачи в работе']);?>
<?=$this->render('_loop', ['output' => $tests, 'title' => 'Задачи на тестировании']);?>
<?=$this->render('_loop', ['output' => $approves, 'title' => 'Задачи ожидающие проверки']);?> <?php
$issues = IssueHelper::sort($models['issues']);
foreach ($issues as $issue)
{
if(!isset($issue['close']))
{
echo $this->render('_loop', ['output' => $issue['models'], 'title' => $issue['title']]);
}
else
{
$accepteds = $issue['models'];
}
}
?>
</td> </td>
</tr> </tr>
...@@ -87,7 +97,7 @@ use yii\widgets\ActiveForm; ...@@ -87,7 +97,7 @@ use yii\widgets\ActiveForm;
<input type="checkbox"> <input type="checkbox">
</label> </label>
<div class="text-mes"> <div class="text-mes">
<p><?=$model->subject?></p> <p><?=$model['subject']?></p>
</div> </div>
</div> </div>
......
console/migrations/m160304_091243_fix_user_table.php
View file @ b32508a1
...@@ -14,7 +14,7 @@ class m160304_091243_fix_user_table extends Migration ...@@ -14,7 +14,7 @@ class m160304_091243_fix_user_table extends Migration
public function safeDown() public function safeDown()
{ {
$this->renameTable('users', 'redmine_key', 'support_id'); $this->renameColumn('users', 'redmine_key', 'support_id');
$this->renameColumn('users', 'support_id', Schema::TYPE_INTEGER . '(11) DEFAULT NULL'); $this->renameColumn('users', 'support_id', Schema::TYPE_INTEGER . '(11) DEFAULT NULL');
} }
} }
console/migrations/m160310_063328_fix_support.php 0 → 100644
View file @ b32508a1
<?php
use yii\db\Schema;
use yii\db\Migration;
class m160310_063328_fix_support extends Migration
{
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
$this->insert('settings', [
'module_id' => 'support',
'code' => 'redmine-key',
'name' => 'Redmine Api Key',
'value' => 'bac5a4f334595be4ce4962e6428035041f47f569',
'element' => 'text',
'hidden' => 0,
'description' => 'Redmine Api Key',
]);
$this->insert('settings', [
'module_id' => 'support',
'code' => 'redmine-url',
'name' => 'Redmine Url',
'value' => 'http://help-russia.ru',
'element' => 'text',
'hidden' => 0,
'description' => 'Redmine Url',
]);
}
public function safeDown()
{
$this->delete('settings', ['code' => 'redmine-key']);
$this->delete('settings', ['code' => 'redmine-url']);
}
}
frontend/web/css/custom.css
View file @ b32508a1
This diff is collapsed.
frontend/web/css/new_responsive.css 0 → 100644
View file @ b32508a1
/*==================================RESPONSIVE LAYOUTS===============================================*/
.puls_point_on {
opacity: 1;
top: 307px;
}
@media only screen and (max-width: 970px) {
.mackup_text {
display: none;
}
.section4 .section_h2 {
font-size: 26px;
line-height: 28px;
text-align: left;
}
.puls {
height: 360px;
}
a.toggle_bottom {
float: none;
margin: 0;
margin-top: 35px;
display: none;
}
.cif_last {
overflow: hidden;
}
.section5 {
padding-bottom: 70px;
}
.section6 {
background-position: center 105px;
}
}
@media only screen and (max-width: 768px) {
.section1 {
min-height: 260px;
}
.section1__title {
font-size: 20px;
line-height: 28px;
margin-top: 30px;
font-weight: bold;
text-align: left;
}
.slogan {
text-align: left;
font-size: 16px;
}
.section2 h2 {
display: none;
}
.app_block {
height: auto;
}
.section3 {
margin-top: 50px;
}
.desctop_line span {
text-align: left;
width: 100px;
position: static;
display: block;
}
.desctop_line {
background: url(../images/desctop_line.png) no-repeat 100% 0;
width: 185px;
height: 65px;
float: none;
margin-top: 35px;
margin-bottom: 15px;
margin-right: 0px;
position: relative;
}
.mac_win {
margin-top: 0;
}
.mobile_line {
background: url(../images/mobile_line.png) no-repeat 120px 0;
width: 185px;
height: 65px;
margin-top: 35px;
margin-left: 0px;
margin-bottom: 0px;
float: none;
position: relative;
}
.mobile_line span {
width: 100px;
position: static;
}
.app_block {
margin-top: 0;
}
.section_h2 {
font-size: 20px;
line-height: 28px;
text-align: left;
}
.puls {
margin: 0;
height: 175px;
width: auto;
margin-top: 15px;
margin: 35px;
display: block;
background: url(../images_new/puls_resp.png) 0 0 no-repeat;
}
.section4 {
padding-bottom: 60px;
background: none;
}
ul.ul_check:last-child {
margin-top: 29px;
}
.section5 {
margin-top: -125px;
}
.green_title {
margin-top: 70px;
}
.cif_50 {
width: 50%;
float: left;
}
.if_info1, .if_info2, .if_info3, .if_info4, .if_info5 {
display: none;
}
.inteface_1 {
margin-top: 40px;
height: 620px;
}
.inteface_2 {
margin-top: -210px;
}
.inteface_4 {
margin: 0;
margin-top: -200px;
}
.section6 {
background-position: center -130px;
}
.project_tit {
text-align: center;
}
.sup_block__item1 {
margin-bottom: 20px;
}
.sup_block__item2 {
padding-bottom: 140px;
}
.sup_block__info4 {
text-align: left;
left: 80px;
}
.sup_block__info4:after {
float: left;
margin-right: auto;
margin-left: -38px;
margin-top: -40px;
transform: rotate(260deg);
-webkit-transform: rotate(260deg); /* Chrome y Safari */
-moz-transform: rotate(260deg); /* Firefox */
filter: progid:DXImageTransform.
-o-transform: rotate(260deg); /* Opera */
}
.sup_block__info5 {
top: 50px;
}
.sup_block__info5:after {
margin-right: 0;
margin-left: -20px;
margin-top: 30px;
transform: rotate(60deg);
-webkit-transform: rotate(60deg); /* Chrome y Safari */
-moz-transform: rotate(60deg); /* Firefox */
filter: progid:DXImageTransform.
-o-transform: rotate(60deg); /* Opera */
}
.section8_down {
background-size: cover;
}
.table_people_bg {
margin: 30px auto;
}
.calk_form__title {
font-size: 20px;
text-align: center;
display: block;
}
.calk_form_subtitle {
font-size: 15px;
text-align: center;
}
.file-upload_block {
display: none;
}
}
@media only screen and (max-width: 480px) {
.inteface_1 {
height: 480px;
}
.project_tit {
margin-top: 60px;
}
.section6 {
padding-bottom: 80px;
}
.bx-wrapper .bx-pager, .bx-wrapper .bx-controls-auto {
bottom: -50px;
}
.bx-wrapper {
margin-top: 10px;
}
.code_block__txt {
text-align: center;
background-color: transparent;
}
.sup_block__item2 {
padding-bottom: 40px;
}
.sup_block__info5:after {
margin-left: -60px;
margin-right: 15px;
}
.section5 {
margin-top: -10px;
}
.section6 {
background-position: center -28px;
}
}
@media only screen and (max-width: 368px) {
}
\ No newline at end of file
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 - ООО "Арт Проект"