Administrator / test_3

Commit 816e328e9fe894cd7a1e99178afd169eb6b6b4b4

Authored by Yarik
1 parent 1fbd7ee8

test

Showing 10 changed files with 120 additions and 87 deletions   Show diff stats
Inline Side-by-side
common/models/Team.php
  Show/Hide comments   View file @816e328
... ... @@ -34,11 +34,6 @@
34 34 return 'team';
35 35 }
36 36  
37   -
38   -
39   -
40   -
41   -
42 37 /**
43 38 * @inheritdoc
44 39 */
... ...
common/models/TeamSearch.php
  Show/Hide comments   View file @816e328
... ... @@ -170,7 +170,7 @@
170 170 0,
171 171 ]);
172 172 }
173   -
  173 +
174 174 $query->andFilterWhere([
175 175 'like',
176 176 'firstname',
... ... @@ -188,8 +188,8 @@
188 188 ])
189 189 ->andFilterWhere([
190 190 'like',
191   - 'position',
192   - $this->position,
  191 + 'LOWER(position)',
  192 + mb_strtolower($this->position),
193 193 ])
194 194 ->andFilterWhere([
195 195 'like',
... ...
common/widgets/ImageUploader.php
  Show/Hide comments   View file @816e328
... ... @@ -21,6 +21,7 @@ class ImageUploader extends Widget
21 21 public $gallery;
22 22 public $size;
23 23 public $name = 'Add file...';
  24 + public $remover = false;
24 25  
25 26 public function init(){
26 27  
... ... @@ -40,7 +41,8 @@ class ImageUploader extends Widget
40 41 'height' => $this->height,
41 42 'width' => $this->width,
42 43 'multi' => $this->multi,
43   - 'name' => $this->name
  44 + 'name' => $this->name,
  45 + 'remover' => $this->remover
44 46 ]);
45 47  
46 48 }
... ...
common/widgets/views/image_sizer.php
  Show/Hide comments   View file @816e328
... ... @@ -21,6 +21,13 @@ $id = $model::tableName().'_id';
21 21 <div class="tst">
22 22 <div id="<?= $field?>_img_block" class="admin-avatar-pattern-wr">
23 23 <div class="admin-avatar-pattern">
  24 + <?php
  25 + if($remover && $model->$field) {
  26 + ?>
  27 + <span id="<?=$field?>_remove_img" class="remover_image" style="left:<?=$size[0]['width']?>px"><img src="/images/delete-ico.png" alt=""></span>
  28 + <?php
  29 + }
  30 + ?>
24 31 <?= $model->$field ? Html::img($model->$field): '' ?>
25 32 </div>
26 33 </div>
... ... @@ -34,67 +41,93 @@ $id = $model::tableName().&#39;_id&#39;;
34 41 </span>
35 42  
36 43 <script>
37   - $(function(){
38   -
39   - $("#<?= $field?>").fileupload({
40   - dataType: 'json',
41   - formData: {size:'<?= json_encode($size)?>'},
42   - done: function (e, data) {
43   - if($("#<?=$field?>_buttons_block").length){
44   - $("#<?=$field?>_buttons_block").remove()
  44 + $(function()
  45 + {
  46 +
  47 + $("#<?= $field?>").fileupload(
  48 + {
  49 + dataType : 'json', formData : {size : '<?= json_encode($size)?>'},
  50 + done : function(e, data)
  51 + {
  52 + if($("#<?=$field?>_buttons_block").length)
  53 + {
  54 + $("#<?=$field?>_buttons_block").remove()
  55 + }
  56 +
  57 + $("#<?= $field?>").parent().prev().find('.admin-ava-wr').remove()
  58 +
  59 + var host = window.location.host.toString();
  60 + var img = '<div class="admin-ava-wr">' +
  61 + <?php
  62 + if($remover) {
  63 + echo "'<span id=\"" . $field . "_remove_img\" class=\"remover_image\" style=\"left:{$size[0]['width']}px\"><img src=\"/images/delete-ico.png\" alt=\"\"></span>'+";
  64 + }
  65 + ?>
  66 + '<img style="vertical-align: middle; width: <?=$width?>px; height: <?=$height?>px;" src="http://' + host + data.result.link + '"></div>' + '<div id="<?=$field?>_buttons_block">' + '<button type="button" id="<?=$field?>_save_img" class="btn btn-success img-action-buttons" >Сохранить</button>' + '<button type="button" id="<?=$field?>_remove_img" class="btn btn-danger img-action-buttons" >Отмена</button>' + '</div>';
  67 + var block = $("#<?= $field?>_img_block .admin-avatar-pattern");
  68 + block.find('img').remove();
  69 + block.append(img);
  70 + block.parents('.file-uploader-block').parent().addClass('success_download');
  71 + $("#<?=$field?>_picture_link").val(data.result.link);
  72 + $("#<?=$field?>_new_img").val(data.result.link);
45 73 }
46   -
47   - $("#<?= $field?>").parent().prev().find('.admin-ava-wr').remove()
48   -
49   - var host = window.location.host.toString();
50   - var img = '<div class="admin-ava-wr"><img style="vertical-align: middle; width: <?=$width?>px; height: <?=$height?>px;" src="http://'+host+data.result.link+'"></div>'+
51   - '<div id="<?=$field?>_buttons_block">'+
52   - '<button type="button" id="<?=$field?>_save_img" class="btn btn-success img-action-buttons" >Сохранить</button>'+
53   - '<button type="button" id="<?=$field?>_remove_img" class="btn btn-danger img-action-buttons" >Отмена</button>'+
54   - '</div>';
55   - var block = $("#<?= $field?>_img_block .admin-avatar-pattern");
56   - block.find('img').remove();
57   - block.append(img);
58   - block.parents('.file-uploader-block').parent().addClass('success_download');
59   - $("#<?=$field?>_picture_link").val(data.result.link);
60   - $("#<?=$field?>_new_img").val(data.result.link);
61 74 }
62   - });
63   -
64   -
65   - $('body').on('click', '#<?=$field?>_save_img',function(){
66   - $("#<?= $field?>_img_block").parent().parent().parent().removeClass('success_download')
67   -
68   - $("#<?=$field?>_buttons_block").remove();
69   - var old_url = $('#<?=$field?>_old_img').val();
70   - var new_url = $('#<?=$field?>_new_img').val();
71   - var model = '<?=str_replace('\\', '-',$model::className());?>';
72   - $.post( "/file/uploader/delete-image",{new_url:new_url,old_img: old_url,model:model,field:"<?= $field?>", id:"<?=$model->$id?>",action:'save'}, function() {
73   - });
74   - $("#<?=$field?>_picture_link").val(new_url);
75   - });
76   -
77   - $('body').on('click', '#<?=$field?>_remove_img',function(){
78   - $("#<?= $field?>_img_block").parent().parent().parent().removeClass('success_download')
79   - $("#<?= $field?>_img_block").parent().parent().find('.admin-ava-wr').remove()
80   -
81   - $("#<?=$field?>_buttons_block").remove();
82   - var old_url = $('#<?=$field?>_old_img').val();
83   - var new_url = $('#<?=$field?>_new_img').val();
84   - $.post( "/file/uploader/delete-image",{old_img: new_url}, function() {
85   - });
86   - $("#<?=$field?>_picture_link").val(old_url);
87   - if(old_url.length<=1){
88   - $('#<?= $field?>_img_block').find('img').remove()
  75 + );
  76 +
  77 + $('body').on(
  78 + 'click', '#<?=$field?>_save_img', function()
  79 + {
  80 + $("#<?= $field?>_img_block").parent().parent().parent()
  81 + .removeClass('success_download')
  82 +
  83 + $("#<?=$field?>_buttons_block").remove();
  84 + var old_url = $('#<?=$field?>_old_img').val();
  85 + var new_url = $('#<?=$field?>_new_img').val();
  86 + var model = '<?=str_replace('\\', '-', $model::className());?>';
  87 + $.post(
  88 + "/file/uploader/delete-image", {
  89 + new_url : new_url, old_img : old_url, model : model, field : "<?= $field?>",
  90 + id : "<?=$model->$id?>", action : 'save'
  91 + }, function()
  92 + {
  93 + }
  94 + );
  95 + $("#<?=$field?>_picture_link").val(new_url);
89 96 }
90   - else {
91   - $('#<?= $field?>_img_block').find('img').attr('src',old_url);
  97 + );
  98 +
  99 + $('body').on(
  100 + 'click', '#<?=$field?>_remove_img', function()
  101 + {
  102 + $("#<?= $field?>_img_block").parent().parent().parent()
  103 + .removeClass('success_download');
  104 + $("#<?= $field?>_img_block").parent().parent().find('.admin-ava-wr').remove();
  105 +
  106 + $("#<?=$field?>_buttons_block").remove();
  107 + var old_url = $('#<?=$field?>_old_img').val();
  108 + var new_url = $('#<?=$field?>_new_img').val();
  109 + $.post(
  110 + "/file/uploader/delete-image", {old_img : new_url}, function()
  111 + {
  112 + }
  113 + );
  114 + <?php
  115 + if($remover) {
  116 + echo "$(\"#{$field}_picture_link\").val('');
  117 + $('#{$field}_img_block').find('img').remove();";
  118 + } else {
  119 + echo "$(\"#{$field}_picture_link\").val(old_url);
  120 + if(old_url.length<=1){
  121 + $('#{$field}_img_block').find('img').remove()
  122 + }
  123 + else {
  124 + $('#{$field}_img_block').find('img').attr('src',old_url);
  125 + }";
  126 + };
  127 + ?>
92 128 }
93   -
94   - });
95   -
96   -
97   - })
  129 + );
  130 + });
98 131 </script>
99 132  
100 133 <?php else:?>
... ...
console/migrations/m160208_101449_team.php
  Show/Hide comments   View file @816e328
... ... @@ -16,7 +16,7 @@ class m160208_101449_team extends Migration
16 16 'middlename' => $this->string(255),
17 17 'link' => $this->string(255),
18 18 'position' => $this->string(255)->notNull(),
19   - 'department_id' => $this->integer()->notNull(),
  19 + 'department_id' => $this->integer(),
20 20 'experience_from' => $this->integer(),
21 21 'date_add' => $this->timestamp()->notNull(),
22 22 'user_add_id' => $this->integer(),
... ...
frontend/controllers/AccountsController.php
  Show/Hide comments   View file @816e328
... ... @@ -952,9 +952,14 @@
952 952 ->column();
953 953 $post = \Yii::$app->request->post();
954 954 if($team->load($post) && $team->save()) {
955   - return $this->redirect([
956   - 'team',
  955 + return $this->render('_team_form', [
  956 + 'team' => $team,
  957 + 'department' => $department,
  958 + 'country' => $country,
957 959 ]);
  960 +// return $this->redirect([
  961 +// 'team',
  962 +// ]);
958 963 } else {
959 964 return $this->render('_team_form', [
960 965 'team' => $team,
... ...
frontend/views/accounts/_team_form.php
  Show/Hide comments   View file @816e328
... ... @@ -8,9 +8,7 @@
8 8 use common\models\Team;
9 9 use common\widgets\ImageUploader;
10 10 use kartik\select2\Select2;
11   - use mihaildev\ckeditor\CKEditor;
12 11 use yii\helpers\Html;
13   - use yii\jui\DatePicker;
14 12 use yii\web\JsExpression;
15 13 use yii\widgets\ActiveForm;
16 14  
... ... @@ -20,13 +18,9 @@
20 18 <div class="login-left-column-title"><?= $this->title ?></div>
21 19 <div class="login-left-column-title-two style">Редактирование:</div>
22 20  
23   -<div class="input-blocks-wrapper">
24   - <div class="input-blocks">
25   - <?php
26   - $form = ActiveForm::begin();
27   - ?>
28   - </div>
29   -</div>
  21 +<?php
  22 + $form = ActiveForm::begin();
  23 +?>
30 24  
31 25 <div class="input-blocks-wrapper">
32 26 <div class="input-blocks">
... ... @@ -60,7 +54,7 @@
60 54 <div class="input-blocks-wrapper admn-select-company">
61 55 <div class="input-blocks">
62 56 <?= $form->field($team, 'department_id')
63   - ->dropDownList($department) ?>
  57 + ->dropDownList($department, [ 'prompt' => 'Выберите отдел' ]) ?>
64 58 </div>
65 59 </div>
66 60  
... ... @@ -99,13 +93,14 @@
99 93  
100 94 <div class="input-blocks-wrapper admin-avatar amin-team-foto">
101 95 <?= ImageUploader::widget([
  96 + 'remover' => true,
102 97 'model' => $team,
103 98 'field' => 'photo',
104   - 'size' => [
  99 + 'size' => [
105 100 [
106   - 'width' => 100,
107   - 'height' => 100,
108   - ]
  101 + 'width' => 100,
  102 + 'height' => 100,
  103 + ],
109 104 ],
110 105 'multi' => false,
111 106 'gallery' => $team->photo,
... ... @@ -115,7 +110,7 @@
115 110  
116 111 <div class="input-blocks-wrapper">
117 112 <div class="admin-save-btn skills-save-btn admin-add-remove-wr style">
118   - <?= Html::submitButton($team->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
  113 + <?= Html::submitButton($team->isNewRecord ? 'Добавить' : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
119 114 <div class="admin-remove-note">
120 115 <?php
121 116 if(!$team->isNewRecord) {
... ... @@ -133,7 +128,7 @@
133 128 ?>
134 129 </div>
135 130 <div class="admin-back-note">
136   - <?= Html::a('вернуться', Request::getIsLocal(\Yii::$app->request->referrer)?\Yii::$app->request->referrer:['accounts/team' ]) ?>
  131 + <?= Html::a('вернуться', Request::getIsLocal(\Yii::$app->request->referrer) ? \Yii::$app->request->referrer : [ 'accounts/team' ]) ?>
137 132 </div>
138 133 </div>
139 134 </div>
... ...
frontend/web/css/art_box.css
  Show/Hide comments   View file @816e328
... ... @@ -5,3 +5,7 @@
5 5 .form_for_company .company_info {
6 6 display: none;
7 7 }
  8 +.remover_image {
  9 + position: absolute;
  10 + cursor: pointer;
  11 +}
8 12 \ No newline at end of file
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @816e328
... ... @@ -6595,4 +6595,4 @@ input[disabled], select[disabled] {
6595 6595 width: 24px;
6596 6596 height: 24px;
6597 6597 background: transparent url('/images/loading-plugin-new.gif') center left no-repeat;
6598   -}
6599 6598 \ No newline at end of file
  6599 +}
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @816e328
... ... @@ -559,7 +559,6 @@ $(document).ready(function(){
559 559 alert('fdg')
560 560 }
561 561 var txtMulti = $('.MultiFile-title').text()
562   - console.log(txtMulti)
563 562 $('.tender-file-wr a').click(function(e){
564 563 e.preventDefault()
565 564 })
... ...