finish with xml and add splashes for ManualInsert method

Mihail
2 parents 48b58a13 777ab8db
Showing 11 changed files with 54 additions and 49 deletions Show diff stats
.htaccess
backend/components/ImageSizer.php
backend/components/base/BaseController.php
backend/components/views/image_sizer.php
backend/controllers/ParserController.php
backend/models/Importers.php
backend/views/user/_form.php
common/components/PriceWriter.php
common/components/parsers/CustomConverter.php
storage/.htaccess
storage/index.php
@@ -12,6 +12,7 @@
  
     RewriteBase /
     # deal with admin first
+    RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT]
  
     RewriteCond %{REQUEST_URI} ^/(admin)
  
@@ -18,6 +18,7 @@ class ImageSizer extends Widget
     public $file;
     public $model;
     public $form;
+    public $multi = false;
  
     public function init(){
  
@@ -35,7 +36,8 @@ class ImageSizer extends Widget
                 'field' => $this->field,
                 'form' => $this->form,
                 'height' => $this->height,
-                'width' => $this->width
+                'width' => $this->width,
+                'multi'  => $this->multi
             ]);
  
     }
@@ -26,49 +26,46 @@ class BaseController extends Controller {
         $img = Image::getImagine()->open(Yii::getAlias($imageAlias));
  
         $size = $img->getSize();
-        $ratio = $size->getWidth()/$size->getHeight();
  
-        $height = $h;
-        $width = round($height * $ratio);
+        $width = $size->getWidth();
+        $height = $size->getHeight();
+
+        if($width > $height) {
+            $y = 0;
+            $x = ($width - $height) / 2;
+            $smallestSide = $height;
+        } else {
+            $x = 0;
+            $y = ($height - $width) / 2;
+            $smallestSide = $width;
+        }
+
+
+
+
+//        die('$width = '.$width.','.'$height = '.$height.','.'$y = '.$y.','.'$x = '.$x.','.'$smallestSide = '.$smallestSide.',' );
+//
+//        $ratio = $size->getWidth()/$size->getHeight();
+//
+//        $height = $h;
+//        $width = round($height * $ratio);
+
+        $image_p = imagecreatetruecolor($w, $h);
+
+        $image = imagecreatefromjpeg($imageAlias);
  
+        imagecopyresampled($image_p, $image, 0, 0, $x, $y,
+            $w, $h, $smallestSide, $smallestSide);
+
+        imagejpeg($image_p, $imageAliasSave);
  
-        $imagine = new Imagine();
  
-        $imagine->open($imageAlias)
-            ->resize(new Box($width, $h))
-            ->save($imageAlias, array('flatten' => false));
  
  
-        Image::crop($imageAlias, $w, $h,[($width/2)-($w/2),0])
-            ->save(Yii::getAlias($imageAliasSave), ['quality' =>
-                100]);
  
  
     }
-//
-//    private function resizeImg($w, $h, $filepath,$newfilepath){
-//        list($width, $height) = getimagesize($filepath);
-//        if($width > $height) {
-//            $y = 0;
-//            $x = ($width - $height) / 2;
-//            $smallestSide = $height;
-//        } else {
-//            $x = 0;
-//            $y = ($height - $width) / 2;
-//            $smallestSide = $width;
-//        }
-//
-//        $image_p = imagecreatetruecolor($w, $h);
-//
-//        $image = imagecreatefromjpeg($filepath);
-//
-//        imagecopyresampled($image_p, $image, 0, 0, $x, $y,
-//            $w, $h, $smallestSide, $smallestSide);
-//
-//        imagejpeg($image_p, $newfilepath);
-//
-//
-//    }
+
  
     public function actionDownloadPhoto()
     {
@@ -82,7 +79,7 @@ class BaseController extends Controller {
             $md5_file = md5_file($model->file->tempName);
             $imgDir = Yii::getAlias('@storage/'.$md5_file.'/');
             $imageAlias = Yii::getAlias($imgDir.$model->width.'x'.$model->height.'.'.$model->file->extension);
-            $imageLink = '/storage/'.$md5_file.$model->width.'x'.$model->height.'.'.$model->file->extension;
+            $imageLink = '/storage/'.$md5_file.'/'.$model->width.'x'.$model->height.'.'.$model->file->extension;
  
             if(!is_dir($imgDir)) {
                 mkdir($imgDir, 0755, true);
@@ -12,9 +12,11 @@ $this-&gt;registerJsFile(&#39;@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl
  
 ?>
  
-<?= $form->field( new \backend\models\ImageSizerForm(), 'file')->fileInput(['id'=>$field, 'data-url'=>"/admin/site/download-photo"]); ?>
+<?= $form->field( new \backend\models\ImageSizerForm(), 'file')->fileInput(['id'=>$field, 'data-url'=>"/admin/site/download-photo", 'multiple'=> $multi?'multiple':'' ]); ?>
  
 <?= $form->field($model,$field)->hiddenInput(['id' => "{$field}_picture_link"]) ?>
+<?= $form->field(new \backend\models\ImageSizerForm(),'height')->hiddenInput(['value' => $height])->label(false) ?>
+<?= $form->field(new \backend\models\ImageSizerForm(), 'width')->hiddenInput(['value' => $width])->label(false) ?>
  
 <div id="<?= $field?>_img_block">
     <?= $model->$field ? Html::img('/'.$model->$field): '' ?>
@@ -25,14 +27,8 @@ $this-&gt;registerJsFile(&#39;@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl
  
         $("#<?= $field?>").fileupload({
             dataType: 'json',
-            ImageSizerForm: {
-                height: <?=$height?>,
-                width: <?= $width?>
-            },
             done: function (e, data) {
                 var host = window.location.host.toString();
-                console.log(host);
-                console.log(data.result.link);
                 var img = '<img src="http://'+host+data.result.link+'">';
                 var block = $("#<?= $field?>_img_block");
                 block.find('img').remove();
@@ -175,6 +175,7 @@ class ParserController extends BaseController
             } else {
                 throw new \ErrorException('Ошибка кеша');
             }
+            CustomVarDamp::dumpAndDie($data);
  
             // соотнесем отпарсенные данные с соответсивем полученным от пользователя
             // для этого преобразуем массив отпарсенных данных - назначим ключи согласно соответствию
@@ -36,6 +36,10 @@ class Importers extends BaseActiveRecord
     /**
      * @inheritdoc
      */
+    public static function tableName()
+    {
+        return 'w_importers';
+    }
  
     public function rules()
     {
@@ -33,7 +33,7 @@ use yii\helpers\ArrayHelper;
     ], 'id', 'name')) ?>
  
  
-    <?= \backend\components\ImageSizer::widget(['form'=>$form, 'model'=> $model, 'field'=>'photo','width'=>200,'height'=>200]); ?>
+    <?= \backend\components\ImageSizer::widget(['form'=>$form, 'model'=> $model, 'field'=>'photo','width'=>200,'height'=>200,'multi'=>false]); ?>
  
     <?= $form->field($model, 'contacts')->textInput(['maxlength' => true]) ?>
  
@@ -38,6 +38,7 @@ class PriceWriter {
         if ($this->mode == 0) {
             // преобразуем числовые значения
             foreach ($this->data as &$row) {
+
                 $row['PRICE'] = \Yii::$app->multiparser->convertToFloat($row['PRICE']);
                 $row['BOX'] = \Yii::$app->multiparser->convertToInteger($row['BOX']);
                 // присвоим полный артикул
@@ -20,9 +20,6 @@ class CustomConverter extends Converter {
             $key_array = array_filter($key_array,  function ($value){ return $value !==''; });
         }
  
-        $key_array = array_flip($key_array);
-//        \common\components\CustomVarDamp::dump($value_arr);
-//        \common\components\CustomVarDamp::dumpAndDie($key_array);
  
         array_walk( $value_arr,
             function ( &$value, $key, $key_array) {
@@ -37,10 +34,8 @@ class CustomConverter extends Converter {
                     }
                     unset( $res[$sub_key] );
                     $value = $res;
-                    //\common\components\CustomVarDamp::dump($value);
                 }
  
-                //return $res;
             },
              $key_array);
  
+RewriteEngine on
+RewriteBase /
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+
+RewriteRule . index.php
+
+<?php