Sources moved to src directory

hiqdev · Jul 31, 2015 · 0d4e9de · 0d4e9de
1 parent bc3b774
commit 0d4e9de
Show file tree

Hide file tree

Showing 25 changed files with 131 additions and 46 deletions.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
     },
     "autoload": {
         "psr-4": {
-            "hipanel\\modules\\server\\": ""
+            "hipanel\\modules\\server\\": "src"
         }
     }
 }
diff --git a/Module.php → src/Module.php b/Module.php → src/Module.php
diff --git a/Plugin.php → src/Plugin.php b/Plugin.php → src/Plugin.php
diff --git a/SidebarMenu.php → src/SidebarMenu.php b/SidebarMenu.php → src/SidebarMenu.php
diff --git a/assets/OsSelectionAsset.php → src/assets/OsSelectionAsset.php b/assets/OsSelectionAsset.php → src/assets/OsSelectionAsset.php
@@ -8,7 +8,7 @@ class OsSelectionAsset extends AssetBundle
     /**
      * @var string
      */
-    public $sourcePath = '@hipanel/modules/server/assets';
+    public $sourcePath = '@hipanel/modules/server/src/assets';
 
     /**
      * @var array

diff --git a/assets/css/OsSelection.css → src/assets/css/OsSelection.css b/assets/css/OsSelection.css → src/assets/css/OsSelection.css
diff --git a/assets/js/OsSelection.js → src/assets/js/OsSelection.js b/assets/js/OsSelection.js → src/assets/js/OsSelection.js
diff --git a/controllers/ServerController.php → src/controllers/ServerController.php b/controllers/ServerController.php → src/controllers/ServerController.php
diff --git a/grid/ServerColumn.php → src/grid/ServerColumn.php b/grid/ServerColumn.php → src/grid/ServerColumn.php
diff --git a/grid/ServerGridView.php → src/grid/ServerGridView.php b/grid/ServerGridView.php → src/grid/ServerGridView.php
@@ -7,15 +7,15 @@
 
 namespace hipanel\modules\server\grid;
 
+use Yii;
+use yii\helpers\Html;
 use hipanel\grid\ActionColumn;
 use hipanel\grid\MainColumn;
 use hipanel\grid\RefColumn;
 use hipanel\modules\server\widgets\DiscountFormatter;
 use hipanel\modules\server\widgets\Expires;
 use hipanel\modules\server\widgets\OSFormatter;
 use hipanel\modules\server\widgets\State;
-use Yii;
-use yii\helpers\Html;
 
 class ServerGridView extends \hipanel\grid\BoxedGridView
 {
@@ -34,29 +34,33 @@ public static function defaultColumns()
         $osImages = self::$osImages;
 
         return [
-            'server'    => [
+            'server'   => [
                 'class'           => MainColumn::className(),
                 'attribute'       => 'name',
                 'filterAttribute' => 'name_like',
                 'note'            => true
             ],
-            'state'     => [
-                'class'  => RefColumn::className(),
-                'format' => 'raw',
-                'gtype'  => 'state,device',
-                'value'  => function ($model) {
-                    return State::widget(compact('model'));
-                }
+            'state'    => [
+                'class'         => RefColumn::className(),
+                'format'        => 'raw',
+                'gtype'         => 'state,device',
+                'value'         => function ($model) {
+                    $html = State::widget(compact('model'));
+                    if ($model->status_time) {
+                        $html .= ' ' . Yii::t('app', 'since') . ' ' . Yii::$app->formatter->asDate($model->status_time);
+                    }
+                    return $html;
+                },
             ],
-            'panel'     => [
+            'panel'    => [
                 'attribute'      => 'panel',
                 'format'         => 'text',
                 'contentOptions' => ['class' => 'text-uppercase'],
                 'value'          => function ($model) {
                     return $model->panel ?: '';
                 }
             ],
-            'os'        => [
+            'os'       => [
                 'attribute' => 'os',
                 'format'    => 'raw',
                 'value'     => function ($model) use ($osImages) {
@@ -66,17 +70,29 @@ public static function defaultColumns()
                     ]);
                 }
             ],
-            'discounts' => [
-                'attribute' => 'discounts',
-                'format'    => 'raw',
-                'value'     => function ($model) {
+            'os_and_panel' => [
+                'format' => 'raw',
+                'value' => function ($model) use ($osImages) {
+                    $html = OSFormatter::widget([
+                        'osimages'  => $osImages,
+                        'imageName' => $model->osimage
+                    ]);
+                    $html .= ' ' . $model->panel ?: '';
+                    return $html;
+                }
+            ],
+            'discount' => [
+                'attribute'     => 'discount',
+                'format'        => 'raw',
+                'headerOptions' => ['style' => 'width: 1em'],
+                'value'         => function ($model) {
                     return DiscountFormatter::widget([
                         'current' => $model->discounts['fee']['current'],
                         'next'    => $model->discounts['fee']['next'],
                     ]);
                 }
             ],
-            'actions'   => [
+            'actions'  => [
                 'class'    => ActionColumn::className(),
                 'template' => '{view} {block} {delete} {update}', // {state}
                 'header'   => Yii::t('app', 'Actions'),
@@ -86,7 +102,7 @@ public static function defaultColumns()
                     },
                 ],
             ],
-            'expires'   => [
+            'expires'  => [
                 'filter'        => false,
                 'format'        => 'raw',
                 'headerOptions' => ['style' => 'width: 1em'],

diff --git a/models/Osimage.php → src/models/Osimage.php b/models/Osimage.php → src/models/Osimage.php
diff --git a/models/OsimageSearch.php → src/models/OsimageSearch.php b/models/OsimageSearch.php → src/models/OsimageSearch.php
diff --git a/models/Server.php → src/models/Server.php b/models/Server.php → src/models/Server.php
@@ -18,7 +18,8 @@ class Server extends \hipanel\base\Model
     /**
      * @return array the list of attributes for this record
      */
-    public function attributes () {
+    public function attributes()
+    {
         return [
             'id',
             'name',
@@ -52,18 +53,24 @@ public function attributes () {
             'note',
         ];
     }
-    public function rules () {
+
+    public function rules()
+    {
         return [
-            [['state'], 'isOperable', 'on' => [
-                'reinstall',
-                'reboot',
-                'reset',
-                'shutdown',
-                'power-off',
-                'power-on',
-                'boot-live',
-                'regen-root-password'
-            ]],
+            [
+                ['state'],
+                'isOperable',
+                'on' => [
+                    'reinstall',
+                    'reboot',
+                    'reset',
+                    'shutdown',
+                    'power-off',
+                    'power-on',
+                    'boot-live',
+                    'regen-root-password'
+                ]
+            ],
             [['id', 'note'], 'required', 'on' => ['set-note']],
 
         ];
@@ -80,47 +87,60 @@ public function rules () {
 //            'regen-root-password' => ['id'],
 //        ];
 //    }
-    public function goodStates () {
+    public function goodStates()
+    {
         return ['ok', 'disabled'];
     }
+
     /**
      * @return bool
      */
-    public function isOperable () {
+    public function isOperable()
+    {
         /// TODO: all is operable for admin
         if ($this->running_task || !in_array($this->state, $this->goodStates())) {
             return false;
         }
         return true;
     }
+
     /**
      * Returns true, if server supports VNC
      *
      * @return bool
      */
-    public function isVNCSupported () {
+    public function isVNCSupported()
+    {
         return $this->type != 'ovds';
     }
-    public function isPwChangeSupported () {
+
+    public function isPwChangeSupported()
+    {
         return $this->type == 'ovds';
     }
-    public function isLiveCDSupported () {
+
+    public function isLiveCDSupported()
+    {
         return $this->type != 'ovds';
     }
 
     /**
      * @return bool
      * @throws NotSupportedException
      */
-    public function checkOperable () {
-        if (!$this->isOperable()) throw new NotSupportedException(\Yii::t('app', 'Server already has a running task. Can not start new.'));
+    public function checkOperable()
+    {
+        if (!$this->isOperable()) {
+            throw new NotSupportedException(\Yii::t('app', 'Server already has a running task. Can not start new.'));
+        }
         return true;
     }
 
     /**
      * @inheritdoc
      */
-    public function scenarioCommands () {
+    public function scenarioCommands()
+    {
         return [
             'reinstall' => 'resetup'
         ];
@@ -129,10 +149,11 @@ public function scenarioCommands () {
     /**
      * @inheritdoc
      */
-    public function attributeLabels ()
+    public function attributeLabels()
     {
         return $this->mergeAttributeLabels([
-            'remoteid'              => Yii::t('app', 'Remote ID'),
+            'remoteid'            => Yii::t('app', 'Remote ID'),
+            'name_like'           => Yii::t('app', 'Name'),
             'name'                => Yii::t('app', 'Name'),
             'panel'               => Yii::t('app', 'Panel'),
             'parent_tariff'       => Yii::t('app', 'Parent tariff'),

diff --git a/models/ServerSearch.php → src/models/ServerSearch.php b/models/ServerSearch.php → src/models/ServerSearch.php
diff --git a/src/views/server/_search.php b/src/views/server/_search.php
@@ -0,0 +1,38 @@
+<?php
+
+use hipanel\modules\client\widgets\combo\ClientCombo;
+use hipanel\widgets\AdvancedSearch;
+use hiqdev\combo\StaticCombo;
+use kartik\widgets\DatePicker;
+use yii\helpers\Html;
+
+?>
+
+<?php $form = AdvancedSearch::begin(compact('model')) ?>
+    <div class="col-md-4">
+        <?= $form->field('name_like') ?>
+        <?= $form->field('note') ?>
+    </div>
+
+    <div class="col-md-4">
+        <?= $form->field('client_id')->widget(ClientCombo::classname()) ?>
+        <?= $form->field('seller_id')->widget(ClientCombo::classname()) ?>
+    </div>
+
+    <div class="col-md-4">
+        <?= $form->field('state')->widget(StaticCombo::classname(), [
+            'data' => $state_data,
+            'hasId' => true,
+            'pluginOptions' => [
+                'select2Options' => [
+                    'multiple' => true,
+                ]
+            ],
+        ]) ?>
+    </div>
+
+    <div class="col-md-12">
+        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+<?php $form::end() ?>
diff --git a/views/server/_vnc.php → src/views/server/_vnc.php b/views/server/_vnc.php → src/views/server/_vnc.php
diff --git a/views/server/index.php → src/views/server/index.php b/views/server/index.php → src/views/server/index.php
@@ -14,6 +14,7 @@
 use hipanel\widgets\ActionBox;
 use hipanel\widgets\BulkButtons;
 use hipanel\widgets\GridActionButton;
+use hipanel\widgets\LinkSorter;
 use hipanel\widgets\Pjax;
 use hipanel\widgets\RequestState;
 use yii\bootstrap\ButtonDropdown;
@@ -39,6 +40,14 @@
 <?php $box = ActionBox::begin(['bulk' => true, 'options' => ['class' => 'box-info']]) ?>
 <?php $box->beginActions() ?>
 <?= Html::a(Yii::t('app', 'Advanced search'), '#', ['class' => 'btn btn-info search-button']) ?>
+<?= LinkSorter::widget([
+    'show'       => true,
+    'sort'       => $dataProvider->getSort(),
+    'attributes' => [
+        'name', 'id', 'client', 'tariff',
+        'panel', 'ip', 'state', 'expires'
+    ],
+]) ?>
 <?php $box->endActions() ?>
 
 <?php $box->beginBulkActions() ?>
@@ -76,21 +85,22 @@
 ]) ?>
 
 <?php $box->endBulkActions() ?>
-<?//= $this->render('_search', compact('model')) ?>
+<?= $this->render('_search', compact('model')) ?>
 <?php $box::end() ?>
 
 <?= ServerGridView::widget([
     'dataProvider' => $dataProvider,
     'filterModel'  => $model,
     'osImages'     => $osimages,
     'columns'      => [
+        'checkbox',
         'server',
         'client_id',
         'seller_id',
         'state',
         'expires',
+        'discount',
         'actions',
-        'checkbox',
     ]
 ]); ?>
 <?php

diff --git a/views/server/view.php → src/views/server/view.php b/views/server/view.php → src/views/server/view.php
diff --git a/widgets/DiscountFormatter.php → src/widgets/DiscountFormatter.php b/widgets/DiscountFormatter.php → src/widgets/DiscountFormatter.php
diff --git a/widgets/Expires.php → src/widgets/Expires.php b/widgets/Expires.php → src/widgets/Expires.php
diff --git a/widgets/OSFormatter.php → src/widgets/OSFormatter.php b/widgets/OSFormatter.php → src/widgets/OSFormatter.php
diff --git a/widgets/State.php → src/widgets/State.php b/widgets/State.php → src/widgets/State.php
@@ -14,8 +14,8 @@ class State extends \hipanel\widgets\Type
     public $values = [];
     public $defaultValues = [
         'info'      => ['ok'],
-        'danger'    => ['blocked','expired'],
-        'warning'   => [],
+        'danger'    => ['expired'],
+        'warning'   => ['blocked'],
     ];
     public $field = 'state';
 }
diff --git a/widgets/StateFormatter.php → src/widgets/StateFormatter.php b/widgets/StateFormatter.php → src/widgets/StateFormatter.php
diff --git a/widgets/VNCFormatter.php → src/widgets/VNCFormatter.php b/widgets/VNCFormatter.php → src/widgets/VNCFormatter.php
diff --git a/widgets/combo/ServerCombo.php → src/widgets/combo/ServerCombo.php b/widgets/combo/ServerCombo.php → src/widgets/combo/ServerCombo.php