diff --git a/.bowerrc b/.bowerrc
old mode 100644
new mode 100755
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.htaccess b/.htaccess
old mode 100644
new mode 100755
diff --git a/LICENSE.md b/LICENSE.md
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/Vagrantfile b/Vagrantfile
old mode 100644
new mode 100755
diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php
old mode 100644
new mode 100755
diff --git a/backend/codeception.yml b/backend/codeception.yml
old mode 100644
new mode 100755
diff --git a/backend/config/.gitignore b/backend/config/.gitignore
old mode 100644
new mode 100755
diff --git a/backend/config/bootstrap.php b/backend/config/bootstrap.php
old mode 100644
new mode 100755
diff --git a/backend/config/main.php b/backend/config/main.php
old mode 100644
new mode 100755
index 454bbf5..1bc988e
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -29,6 +29,9 @@ return [
'hh' => [
'class' => 'backend\modules\hh\Hh',
],
+ 'balance' => [
+ 'class' => 'backend\modules\balance\Balance',
+ ],
],
'components' => [
'request' => [
diff --git a/backend/config/params.php b/backend/config/params.php
old mode 100644
new mode 100755
diff --git a/backend/config/test.php b/backend/config/test.php
old mode 100644
new mode 100755
diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php
old mode 100644
new mode 100755
diff --git a/backend/models/.gitkeep b/backend/models/.gitkeep
old mode 100644
new mode 100755
diff --git a/backend/modules/balance/Balance.php b/backend/modules/balance/Balance.php
new file mode 100644
index 0000000..9e9bc27
--- /dev/null
+++ b/backend/modules/balance/Balance.php
@@ -0,0 +1,24 @@
+search(Yii::$app->request->queryParams);
+
+ return $this->render('index',[
+ 'searchModel' => $searchModel,
+ 'dataProvider' => $dataProvider,
+ ]);
+ }
+
+ public function actionView($id)
+ {
+ $dataProviderF = new ActiveDataProvider([
+ 'query' => FieldsValueNew::find()
+ ->where(['item_id' => $id, 'item_type' => FieldsValueNew::TYPE_BALANCE])
+ ->orderBy('order'),
+ 'pagination' => [
+ 'pageSize' => 200,
+ ],
+ ]);
+
+ return $this->render('view',[
+ 'model' => $this->findModel($id),
+ 'dataProviderF' => $dataProviderF
+ ]);
+ }
+
+ public function actionCreate()
+ {
+ $model = new Balance();
+
+ if ($model->load(Yii::$app->request->post())) {
+ $model->dt_add = strtotime($model->dt_add);
+ $model->save();
+// Debug::dd($model);
+
+ Yii::$app->session->addFlash('success', 'Баланса добавлен');
+
+ return $this->redirect(['index']);
+ }
+
+ return $this->render('create', [
+ 'model' => $model,
+ ]);
+ }
+
+ public function actionUpdate($id)
+ {
+ $model = $this->findModel($id);
+
+ if ($model->load(Yii::$app->request->post())) {
+ $model->dt_add = strtotime($model->dt_add);
+ $model->save();
+ return $this->redirect(['view', 'id' => $model->id]);
+ }
+
+ return $this->render('update',[
+ 'model' => $model,
+ ]);
+ }
+
+ public function actionDelete($id)
+ {
+ $this->findModel($id)->delete();
+
+ return $this->redirect(['index']);
+ }
+
+ protected function findModel($id)
+ {
+ if (($model = Balance::findOne($id)) !== null) {
+ return $model;
+ }
+
+ throw new NotFoundHttpException('The requested page does not exist.');
+ }
+}
\ No newline at end of file
diff --git a/backend/modules/balance/models/Balance.php b/backend/modules/balance/models/Balance.php
new file mode 100644
index 0000000..9076748
--- /dev/null
+++ b/backend/modules/balance/models/Balance.php
@@ -0,0 +1,51 @@
+where(
+ [
+ //'balance_id' => \Yii::$app->request->get('id'),
+ 'item_id' => \Yii::$app->request->get('id'),
+ 'item_type' => FieldsValueNew::TYPE_BALANCE,
+ ])
+ ->all();
+ $array = [];
+ if (!empty($fieldValue)) {
+ foreach ($fieldValue as $item) {
+ array_push($array, ['field_id' => $item->field_id, 'value' => $item->value, 'order' => $item->order]);
+ }
+ $this->fields = $array;
+ } else {
+ $this->fields = [
+ [
+ 'field_id' => null,
+ 'value' => null,
+ 'order' => null,
+ ],
+ ];
+ }
+
+// $user = ArrayHelper::getColumn(ProjectUser::find()->where(['project_id' => \Yii::$app->request->get('id')])->all(),
+// 'card_id');
+//
+// if (!empty($user)) {
+// $this->user = $user;
+//
+// }
+ }
+}
\ No newline at end of file
diff --git a/backend/modules/balance/models/BalanceSearch.php b/backend/modules/balance/models/BalanceSearch.php
new file mode 100644
index 0000000..8623741
--- /dev/null
+++ b/backend/modules/balance/models/BalanceSearch.php
@@ -0,0 +1,89 @@
+ $query,
+ ]);
+
+ $this->load($params);
+
+ if (!$this->validate()) {
+ // uncomment the following line if you do not want to return any records when validation fails
+ // $query->where('0=1');
+ return $dataProvider;
+ }
+
+ // grid filtering conditions
+ $query->andFilterWhere([
+ 'id' => $this->id,
+ 'type' => $this->type,
+ //'summ' => $this->summ,
+ 'dt_add' => $this->dt_add,
+ ]);
+
+ //Debug::dd($this);
+
+ if($this->dt_from && $this->dt_to){
+ $query->where(['between', 'dt_add', strtotime($this->$this->dt_from), strtotime($this->$this->dt_to)]);
+ }
+ if($this->dt_from){
+ $query->where(['>', 'dt_add', strtotime($this->$this->dt_from)]);
+ }
+
+ $summ_from = $this->summ_from ?: 0;
+ $summ_to = $this->summ_to ?: 9999999999;
+
+ $query->andFilterWhere(['between', 'summ', $summ_from, $summ_to]);
+
+ return $dataProvider;
+ }
+}
diff --git a/backend/modules/balance/views/balance/_form.php b/backend/modules/balance/views/balance/_form.php
new file mode 100644
index 0000000..efa92da
--- /dev/null
+++ b/backend/modules/balance/views/balance/_form.php
@@ -0,0 +1,80 @@
+
+
+
diff --git a/backend/modules/balance/views/balance/_search.php b/backend/modules/balance/views/balance/_search.php
new file mode 100644
index 0000000..0df270b
--- /dev/null
+++ b/backend/modules/balance/views/balance/_search.php
@@ -0,0 +1,33 @@
+
+
+
+
+ ['index'],
+ 'method' => 'get',
+ ]); ?>
+
+ field($model, 'id') ?>
+
+ field($model, 'type') ?>
+
+ field($model, 'summ') ?>
+
+ field($model, 'dt_add') ?>
+
+
+ 'btn btn-primary']) ?>
+ 'btn btn-default']) ?>
+
+
+
+
+
+
+ render('_form', [
+ 'model' => $model,
+ ]) ?>
+
+
diff --git a/backend/modules/balance/views/balance/index.php b/backend/modules/balance/views/balance/index.php
new file mode 100644
index 0000000..170b1c5
--- /dev/null
+++ b/backend/modules/balance/views/balance/index.php
@@ -0,0 +1,56 @@
+title = 'Список балансов';
+$this->params['breadcrumps'][] = $this->title;
+?>
+
+
+ 'btn btn-success']) ?>
+
+ $dataProvider,
+ 'filterModel' => $searchModel,
+ 'columns' => [
+ ['class' => 'yii\grid\SerialColumn'],
+ [
+ 'attribute' => 'type',
+ 'value' => function ($model) {
+ return \common\models\Balance::getTypeName($model->type);
+ },
+ 'filter' => kartik\select2\Select2::widget([
+ 'model' => $searchModel,
+ 'attribute' => 'type',
+ 'data' => \common\models\Balance::getTypeList(),
+ 'options' => ['placeholder' => 'Начните вводить...','class' => 'form-control'],
+ 'pluginOptions' => [
+ 'allowClear' => true
+ ],
+ ]),
+ ],
+ [
+ 'attribute' => 'summ',
+ 'filter' => \backend\widgets\SummRangeWidget::widget([
+ 'model' => $searchModel,
+ ]),
+
+ ],
+ [
+ 'attribute' => 'dt_add',
+ 'value' => 'dt_add',
+ 'filter' => \yii\jui\DatePicker::widget(['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']),
+ 'format' => 'html',
+ ],
+ ['class' => 'yii\grid\ActionColumn'],
+ ],
+ ]); ?>
+
+
+ render('_form', [
+ 'model' => $model,
+ ]) ?>
+
+
diff --git a/backend/modules/balance/views/balance/view.php b/backend/modules/balance/views/balance/view.php
new file mode 100644
index 0000000..daf144a
--- /dev/null
+++ b/backend/modules/balance/views/balance/view.php
@@ -0,0 +1,57 @@
+title = 'Баланс №' . $model->id;
+$this->params['breadcrumbs'][] = ['label' => 'Список балансов', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+
+ 'btn btn-primary']) ?>
+ $model->id], ['class' => 'btn btn-primary']) ?>
+ $model->id], [
+ 'class' => 'btn btn-danger',
+ 'data' => [
+ 'confirm' => 'Are you sure you want to delete this item?',
+ 'method' => 'post',
+ ],
+ ]) ?>
+
+
+ $model,
+ 'attributes' => [
+ //'id',
+ [
+ 'attribute' => 'type',
+ 'value' => function($model){
+ return \common\models\Balance::getTypeName($model->type);
+ }
+ ],
+ 'summ',
+ 'dt_add',
+ ],
+ ]) ?>
+
+
Дополнительные сведения
+
+ $dataProviderF,
+ 'layout' => "{items}",
+ 'columns' => [
+ 'field.name:text:Поле',
+ [
+ 'attribute' => 'value',
+ 'label' => 'Значение'
+ ],
+ ],
+ ]); ?>
+
+