From 78ab74363363bfdf6d500458879cc3ea37b113b2 Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Fri, 25 Mar 2016 11:16:26 +0200
Subject: [PATCH] test

---
 common/models/UserInfo.php                            | 10 ++++++++--
 console/migrations/m160325_085819_user_info_radio.php | 30 ++++++++++++++++++++++++++++++
 frontend/views/accounts/employment.php                |  3 ---
 frontend/views/accounts/general.php                   |  2 +-
 frontend/views/accounts/service.php                   | 86 +++++++++++++++++++++++++-------------------------------------------------------------
 frontend/views/performer/common.php                   |  8 ++++----
 frontend/web/js/forms.js                              |  6 ++++++
 7 files changed, 74 insertions(+), 71 deletions(-)
 create mode 100644 console/migrations/m160325_085819_user_info_radio.php

diff --git a/common/models/UserInfo.php b/common/models/UserInfo.php
index b2314a5..520681f 100755
--- a/common/models/UserInfo.php
+++ b/common/models/UserInfo.php
@@ -142,12 +142,18 @@
                     [
                         'busy',
                         'member',
+                    ],
+                    'boolean',
+                ],
+                [
+                    [
                         'contract',
                         'estimate',
                         'purchase',
                         'delivery',
                     ],
-                    'boolean',
+                    'string',
+                    'max' => 50,
                 ],
                 [
                     [
@@ -230,7 +236,7 @@
                     ],
                     'filter',
                     'filter' => function($value) {
-                        if(empty($value)) {
+                        if(empty( $value )) {
                             return $value;
                         }
                         if(!preg_match('/^https?:\/{2}.*$/', $value)) {
diff --git a/console/migrations/m160325_085819_user_info_radio.php b/console/migrations/m160325_085819_user_info_radio.php
new file mode 100644
index 0000000..5b3c6a0
--- /dev/null
+++ b/console/migrations/m160325_085819_user_info_radio.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Migration;
+
+class m160325_085819_user_info_radio extends Migration
+{
+    public function up()
+    {
+        $this->dropColumn('{{%user_info}}', 'contract');
+        $this->dropColumn('{{%user_info}}', 'estimate');
+        $this->dropColumn('{{%user_info}}', 'purchase');
+        $this->dropColumn('{{%user_info}}', 'delivery');
+        $this->addColumn('{{%user_info}}', 'contract', $this->string(50));
+        $this->addColumn('{{%user_info}}', 'estimate', $this->string(50));
+        $this->addColumn('{{%user_info}}', 'purchase', $this->string(50));
+        $this->addColumn('{{%user_info}}', 'delivery', $this->string(50));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('{{%user_info}}', 'contract');
+        $this->dropColumn('{{%user_info}}', 'estimate');
+        $this->dropColumn('{{%user_info}}', 'purchase');
+        $this->dropColumn('{{%user_info}}', 'delivery');
+        $this->addColumn('{{%user_info}}', 'contract', $this->smallInteger());
+        $this->addColumn('{{%user_info}}', 'estimate', $this->smallInteger());
+        $this->addColumn('{{%user_info}}', 'purchase', $this->smallInteger());
+        $this->addColumn('{{%user_info}}', 'delivery', $this->smallInteger());
+    }
+}
diff --git a/frontend/views/accounts/employment.php b/frontend/views/accounts/employment.php
index 9c8c776..a9af519 100755
--- a/frontend/views/accounts/employment.php
+++ b/frontend/views/accounts/employment.php
@@ -208,9 +208,6 @@
     $(
         function()
         {
-            $(document).on('change', '.no-client-validation', function() {
-                $(this).parent().find('.help-block').hide();
-            });
             var regexp = /^[\w]+\[(\d+)\].*$/;
             var prevEmploy = $('.prev_job_inputs').length
             if(prevEmploy < 1)
diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php
index 7c7b0dc..210183f 100755
--- a/frontend/views/accounts/general.php
+++ b/frontend/views/accounts/general.php
@@ -98,7 +98,7 @@
             <div class="input-blocks-wrapper">
                 <div class="input-blocks">
                     <?= $form->field($company_info, 'name', [ 'options' => [ 'class' => 'form-group company_info' ], 'enableClientValidation' => false ])
-                             ->textInput([ 'class' => 'custom-input-2' ]); ?>
+                             ->textInput([ 'class' => 'custom-input-2 no-client-validation' ]); ?>
                 </div>
             </div>
             <div class="input-blocks-wrapper">
diff --git a/frontend/views/accounts/service.php b/frontend/views/accounts/service.php
index 56959da..aa51405 100755
--- a/frontend/views/accounts/service.php
+++ b/frontend/views/accounts/service.php
@@ -149,83 +149,47 @@
 
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
-            <?= $form->field($user_info, 'contract', [ 'options' => [ 'class' => 'form-inline' ] ])
-                     ->label('Работа по договору')
-                     ->radioList([
-                         1 => 'Да',
-                         0 => 'Нет',
-                     ], [
-                             'item' => function($index, $label, $name, $checked, $value) {
-                                 $return = '<div class="admin-who-check">';
-                                 $return .= '<input class="custom-radio" id="select_admin_doc' . $value . '" type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
-                                 $return .= '<label for="select_admin_doc' . $value . '" >';
-                                 $return .= '<span></span>' . ucwords($label);
-                                 $return .= '</label>';
-                                 $return .= '</div>';
-                                 return $return;
-                             },
-                         ]) ?>
+            <?= $form->field($user_info, 'contract', [
+                'template' => "{label}<br />{input}\n{hint}\n{error}",
+                'options'  => [ 'class' => 'form-inline' ],
+            ])
+                     ->textInput([
+                         'class' => 'custom-input-2 custom-input-2-margin-r',
+                     ]) ?>
         </div>
     </div>
 
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
-            <?= $form->field($user_info, 'estimate', [ 'options' => [ 'class' => 'form-inline' ] ])
-                     ->label('Предоставляете смету')
-                     ->radioList([
-                         1 => 'Да',
-                         0 => 'Нет',
-                     ], [
-                         'item' => function($index, $label, $name, $checked, $value) {
-                             $return = '<div class="admin-who-check">';
-                             $return .= '<input class="custom-radio" id="select_admin_estimate' . $value . '" type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
-                             $return .= '<label for="select_admin_estimate' . $value . '" >';
-                             $return .= '<span></span>' . ucwords($label);
-                             $return .= '</label>';
-                             $return .= '</div>';
-                             return $return;
-                         },
+            <?= $form->field($user_info, 'estimate', [
+                'template' => "{label}<br />{input}\n{hint}\n{error}",
+                'options'  => [ 'class' => 'form-inline' ],
+            ])
+                     ->textInput([
+                         'class' => 'custom-input-2 custom-input-2-margin-r',
                      ]) ?>
         </div>
     </div>
 
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
-            <?= $form->field($user_info, 'purchase', [ 'options' => [ 'class' => 'form-inline' ] ])
-                     ->label('Делаете сами закупку материалов')
-                     ->radioList([
-                         1 => 'Да',
-                         0 => 'Нет',
-                     ], [
-                         'item' => function($index, $label, $name, $checked, $value) {
-                             $return = '<div class="admin-who-check">';
-                             $return .= '<input class="custom-radio" id="select_admin_purchase' . $value . '" type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
-                             $return .= '<label for="select_admin_purchase' . $value . '" >';
-                             $return .= '<span></span>' . ucwords($label);
-                             $return .= '</label>';
-                             $return .= '</div>';
-                             return $return;
-                         },
+            <?= $form->field($user_info, 'purchase', [
+                'template' => "{label}<br />{input}\n{hint}\n{error}",
+                'options'  => [ 'class' => 'form-inline' ],
+            ])
+                     ->textInput([
+                         'class' => 'custom-input-2 custom-input-2-margin-r',
                      ]) ?>
         </div>
     </div>
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
-            <?= $form->field($user_info, 'delivery', [ 'options' => [ 'class' => 'form-inline' ] ])
-                     ->label('Занимаетесь сами доставкой материалов')
-                     ->radioList([
-                         1 => 'Да',
-                         0 => 'Нет',
-                     ], [
-                         'item' => function($index, $label, $name, $checked, $value) {
-                             $return = '<div class="admin-who-check">';
-                             $return .= '<input class="custom-radio" id="select_admin_delivery' . $value . '" type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
-                             $return .= '<label for="select_admin_delivery' . $value . '" >';
-                             $return .= '<span></span>' . ucwords($label);
-                             $return .= '</label>';
-                             $return .= '</div>';
-                             return $return;
-                         },
+            <?= $form->field($user_info, 'delivery', [
+                'template' => "{label}<br />{input}\n{hint}\n{error}",
+                'options'  => [ 'class' => 'form-inline' ],
+            ])
+                     ->textInput([
+                         'class' => 'custom-input-2 custom-input-2-margin-r',
                      ]) ?>
         </div>
     </div>
diff --git a/frontend/views/performer/common.php b/frontend/views/performer/common.php
index 30337ab..e44b4a4 100755
--- a/frontend/views/performer/common.php
+++ b/frontend/views/performer/common.php
@@ -182,7 +182,7 @@
                     if(!empty( $user->userInfo->contract )) {
                         ?>
                         <li>
-                            <span>Договор: </span><?= \Yii::$app->formatter->asBoolean($user->userInfo->contract) ?>
+                            <span>Договор: </span><?= $user->userInfo->contract ?>
                         </li>
                         <?php
                     }
@@ -191,7 +191,7 @@
                     if(!empty( $user->userInfo->estimate )) {
                         ?>
                         <li>
-                            <span>Смета: </span><?= \Yii::$app->formatter->asBoolean($user->userInfo->estimate) ?>
+                            <span>Смета: </span><?= $user->userInfo->estimate ?>
                         </li>
                         <?php
                     }
@@ -200,7 +200,7 @@
                     if(!empty( $user->userInfo->purchase )) {
                         ?>
                         <li>
-                            <span>Закупка стройматериалов: </span><?= \Yii::$app->formatter->asBoolean($user->userInfo->purchase) ?>
+                            <span>Закупка стройматериалов: </span><?= $user->userInfo->purchase ?>
                         </li>
                         <?php
                     }
@@ -209,7 +209,7 @@
                     if(!empty( $user->userInfo->delivery )) {
                         ?>
                         <li>
-                            <span>Доставка стройматериалов: </span><?= \Yii::$app->formatter->asBoolean($user->userInfo->delivery) ?>
+                            <span>Доставка стройматериалов: </span><?= $user->userInfo->delivery ?>
                         </li>
                         <?php
                     }
diff --git a/frontend/web/js/forms.js b/frontend/web/js/forms.js
index b59089e..ef035c4 100755
--- a/frontend/web/js/forms.js
+++ b/frontend/web/js/forms.js
@@ -533,5 +533,11 @@ $(document).ready(
             );
         }
 
+        // Remove error for no client validation fields
+        $(document).on('change', '.no-client-validation', function() {
+            console.log('debug');
+            $(this).parent().find('.help-block').hide();
+        });
+
     }
 )
\ No newline at end of file
--
libgit2 0.21.4