From 9f115bdf2a5fcb45d53ce8af3abc33ea02cee6c9 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Mon, 7 Mar 2016 01:56:05 +0200
Subject: [PATCH] ашкые

---
 css/style.css                                               | 16 ++++++++++++++++
 protected/controllers/AjaxStoFilterController.php           | 15 ++++++++++-----
 protected/modules/admin/controllers/StoFilterController.php | 11 +++++++++--
 protected/views/stoFilter/index.php                         | 38 +++++++++++++++++++++++++-------------
 4 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/css/style.css b/css/style.css
index 4c484f6..9a745a1 100644
--- a/css/style.css
+++ b/css/style.css
@@ -2564,4 +2564,20 @@ hr.inline{
 .send_sto_form .error{
     color: red;
     font-weight: normal;
+}
+
+
+#select-filter-form .col3{
+    position: relative;
+}
+.active-select{
+    font-size: 15px;
+    font-weight: bold;
+    color: #b2adb2;
+    height: 15px;
+    width: 15px;
+    position: absolute;
+    top: 5px;
+    right: 17px;
+    cursor: pointer;
 }
\ No newline at end of file
diff --git a/protected/controllers/AjaxStoFilterController.php b/protected/controllers/AjaxStoFilterController.php
index 866d5fa..62b3770 100644
--- a/protected/controllers/AjaxStoFilterController.php
+++ b/protected/controllers/AjaxStoFilterController.php
@@ -14,7 +14,9 @@ class AjaxStoFilterController extends Controller
 
     public function actionFilter(){
 
-        if(!empty(Yii::app()->request->getParam('StoFilter'))){
+        $post = Yii::app()->request->getParam('StoFilter');
+
+        if(!empty($post)){
 
 
             $form = new StoFilter();
@@ -25,7 +27,10 @@ class AjaxStoFilterController extends Controller
             $filter['transmission'] = $form->searchFilter('transmission');
             $filter['fuel_type'] = $form->searchFilter('fuel_type');
 
-            if(!empty( Yii::app()->request->getParam('StoFilter')['model']) && !empty( Yii::app()->request->getParam('StoFilter')['engine']) && !empty( Yii::app()->request->getParam('StoFilter')['drive_unit']) && !empty( Yii::app()->request->getParam('StoFilter')['transmission'])&& !empty( Yii::app()->request->getParam('StoFilter')['fuel_type'])){
+
+
+
+            if(!empty( $post['model']) && !empty( $post['engine']) && !empty( $post['drive_unit']) && !empty( $post['transmission'])&& !empty( $post['fuel_type'])){
 
                 foreach($form->searchFilter('id') as $key => $val){
 
@@ -47,11 +52,11 @@ class AjaxStoFilterController extends Controller
 
 
     public function actionRenderPriceList(){
-        if(!empty(Yii::app()->request->getParam('id')) && !empty(Yii::app()->request->getParam('dist'))){
+        $id = Yii::app()->request->getParam('id');
+        $dist = Yii::app()->request->getParam('dist');
 
+        if(!empty($id) && !empty($dist)){
 
-            $id = Yii::app()->request->getParam('id');
-            $dist = Yii::app()->request->getParam('dist');
 
 
             $names = new StoRequireName();
diff --git a/protected/modules/admin/controllers/StoFilterController.php b/protected/modules/admin/controllers/StoFilterController.php
index 8f2f7f0..668d7c5 100644
--- a/protected/modules/admin/controllers/StoFilterController.php
+++ b/protected/modules/admin/controllers/StoFilterController.php
@@ -38,7 +38,7 @@ class StoFilterController extends AdminController
 
         $count = $objPHPExcel->getSheetCount();
 
-        $fullArray = [];
+        $fullArray = array();
         for($i =0; $i<$count; $i++){
 
             $objPHPExcel->setActiveSheetIndex($i);
@@ -94,7 +94,7 @@ class StoFilterController extends AdminController
         $mask_pause = 'НЕОБХІДНІ';
         $mask_optional_start = 'НАЗВА';
 
-        $dist = [];
+        $dist = array();
 
         $requireParamsArea = false;
 
@@ -208,9 +208,16 @@ class StoFilterController extends AdminController
 
     public function saveFile(){
         $path  = dirname(Yii::app()->basePath).'/uploads/parser';
+        $path2  = dirname(Yii::app()->basePath).'/images/action';
 
         $uploadfile = $path .'/'.basename($_FILES['files']['name']);
+        if(!is_dir($path)) {
+            mkdir($path, 0777, true);
+        }
 
+        if(!is_dir($path2)) {
+            mkdir($path2, 0777, true);
+        }
         if (move_uploaded_file($_FILES['files']['tmp_name'], $uploadfile)) {
            return $uploadfile;
         } else {
diff --git a/protected/views/stoFilter/index.php b/protected/views/stoFilter/index.php
index 886ee2a..bfd2cd9 100644
--- a/protected/views/stoFilter/index.php
+++ b/protected/views/stoFilter/index.php
@@ -27,7 +27,7 @@ $cs->registerScriptFile('/css/bootstrap/js/bootstrap.min.js');
                 <div class="row">
                     <div class="col3">
                         <select id="brand" name="StoFilter[brand]">
-                            <option disabled selected>Марка</option>
+                            <option class="default" disabled selected>Марка</option>
                             <?php foreach($brands as $brand):?>
                                 <option value="<?= $brand->brand ?>"><?= $brand->brand ?></option>
                             <?php endforeach;?>
@@ -35,17 +35,12 @@ $cs->registerScriptFile('/css/bootstrap/js/bootstrap.min.js');
                     </div>
                     <div class="col3">
                         <select id="model" disabled name="StoFilter[model]">
-                            <option disabled selected>Модель</option>
+                            <option  class="default" disabled selected>Модель</option>
                         </select>
                     </div>
                     <div class="col3">
                         <select id="engine" disabled name="StoFilter[engine]">
-                            <option disabled selected>Двигатель</option>
-                            <option >Двигатель</option>
-                            <option >Двигатель</option>
-                            <option >Двигатель</option>
-                            <option >Двигатель</option>
-                            <option >Двигатель</option>
+                            <option  class="default" disabled selected>Двигатель</option>
                         </select>
                     </div>
 
@@ -53,17 +48,17 @@ $cs->registerScriptFile('/css/bootstrap/js/bootstrap.min.js');
                 <div class="row">
                     <div class="col3">
                         <select id="drive_unit" disabled name="StoFilter[drive_unit]">
-                            <option disabled selected>Привод</option>
+                            <option  class="default" disabled selected>Привод</option>
                         </select>
                     </div>
                     <div class="col3">
                         <select id="transmission" disabled name="StoFilter[transmission]">
-                            <option disabled selected>Коробка</option>
+                            <option  class="default" disabled selected>Коробка</option>
                         </select>
                     </div>
                     <div class="col3">
                         <select id="fuel_type" disabled name="StoFilter[fuel_type]">
-                            <option disabled selected>Тип топлива</option>
+                            <option  class="default" disabled selected>Тип топлива</option>
                         </select>
                     </div>
 
@@ -71,7 +66,7 @@ $cs->registerScriptFile('/css/bootstrap/js/bootstrap.min.js');
                 <div class="row">
                     <div class="col3">
                         <select id="mileage" disabled name="mileage">
-                            <option disabled selected>Пробег</option>
+                            <option  class="default" disabled selected>Пробег</option>
                         </select>
                     </div>
                 </div>
@@ -142,10 +137,20 @@ $cs->registerScriptFile('/css/bootstrap/js/bootstrap.min.js');
 
 
 
+    $('body').on('click', '.active-select', function(){
+
+
+
+        $(this).siblings('select').find('.default').attr('selected','selected').trigger('change');
+
+    });
+
     var insertOptions = function(result, id){
 
         var select =  $("#"+id);
 
+
+
         select.prop("disabled", false);
 
         var data_select = select.val();
@@ -157,13 +162,19 @@ $cs->registerScriptFile('/css/bootstrap/js/bootstrap.min.js');
         select.append(options);
 
         for(property in result[id]){
-            if(data_select ==property ){
+
+
+            if(data_select ==property.trim() ){
+
+                select.parent('.col3').append('<div class="active-select">X</div>');
+
                 select.append($('<option>', {
                     value: property,
                     text : property,
                     selected: true
                 }));
             } else {
+
                 select.append($('<option>', {
                     value: property,
                     text : property
@@ -247,6 +258,7 @@ $cs->registerScriptFile('/css/bootstrap/js/bootstrap.min.js');
 
                 var result = JSON.parse(data);
 
+                $('body').find('.active-select').remove();
 
                 if(Object.keys(result.model).length){
                     insertOptions(result, 'model');
--
libgit2 0.21.4