Kae credits percentages

yii2/modules/finance/components/FinanceInitialChecks.php

@@ -17,10 +17,9 @@ public function beforeAction($action)
 
         if(!($workingYear = Integrity::uniqueCurrentYear()))
         {   
+            Yii::$app->session->setFlash('info', "Σφάλμα στον ορισμό του οικονομικού έτους στο οποίο εργάζεστε. Ελέγξτε αν έχετε ορίσει έτος στο οποίο εργάζεστε ή επικοινωνήστε με το διαχειριστή.");
             if(!(Yii::$app->controller->id == 'finance-year'))
-                Yii::$app->response->redirect(['/finance/finance-year']);
-
-            Yii::$app->session->setFlash('info', "Σφάλμα στον ορισμό του οικονομικού έτους στο οποίο εργάζεστε. Παρακαλώ επικοινωνήστε με το διαχειριστή.");
+                return Yii::$app->response->redirect(['/finance/finance-year']);
         }
         else
             Yii::$app->session["working_year"] = $workingYear;

yii2/modules/finance/controllers/FinanceKaecreditpercentageController.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace app\modules\finance\controllers;
+
+use Yii;
+use app\modules\finance\models\FinanceKaecreditpercentage;
+use app\modules\finance\models\FinanceKaecreditpercentageSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * FinanceKaecreditpercentageController implements the CRUD actions for FinanceKaecreditpercentage model.
+ */
+class FinanceKaecreditpercentageController extends Controller
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all FinanceKaecreditpercentage models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new FinanceKaecreditpercentageSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single FinanceKaecreditpercentage model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new FinanceKaecreditpercentage model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new FinanceKaecreditpercentage();
+
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->kaeperc_id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing FinanceKaecreditpercentage model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->kaeperc_id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing FinanceKaecreditpercentage model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the FinanceKaecreditpercentage model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return FinanceKaecreditpercentage the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = FinanceKaecreditpercentage::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}

yii2/modules/finance/migrations/m171115_101126_finance_init.php

@@ -111,7 +111,7 @@ public function safeUp()
         /* CREATE TABLE admapp_finance_kaecreditpercentage */
         $create_command = "CREATE TABLE IF NOT EXISTS " . $dbFinTables['table_kaecreditpercentage'] .
                           "(`kaeperc_id` INTEGER NOT NULL AUTO_INCREMENT,
-                            `kaeperc_percentage` TINYINT UNSIGNED NOT NULL CHECK (kaeperc_percentage >= 0.00 AND kaeperc_percentage <= 100.00),
+                            `kaeperc_percentage` SMALLINT UNSIGNED NOT NULL CHECK (kaeperc_percentage >= 0 AND kaeperc_percentage <= 10000),
                             `kaeperc_date` DATETIME NOT NULL,
                             `kaeperc_decision` VARCHAR(255),
                             `kaecredit_id` INTEGER NOT NULL,
@@ -213,7 +213,7 @@ public function safeUp()
         $create_command = "CREATE TABLE IF NOT EXISTS " . $dbFinTables['table_deduction'] .
                           "(`deduct_id` INTEGER NOT NULL AUTO_INCREMENT,
                             `deduct_name` VARCHAR(100) NOT NULL,
-                            `deduct_percentage` DECIMAL(3, 2) NOT NULL CHECK (deduct_percentage >= 0.00 AND deduct_percentage <= 100.00),
+                            `deduct_percentage` SMALLINT UNSIGNED NOT NULL CHECK (deduct_percentage >= 0 AND deduct_percentage <= 10000),
                             `deduct_description` VARCHAR(1000),
                             `deduct_date` DATETIME NOT NULL,
                             `detuct_obsolete` BOOLEAN NOT NULL DEFAULT 0,

yii2/modules/finance/models/FinanceKaecreditSearch.php

@@ -43,7 +43,7 @@ public function scenarios()
     public function search($params)
     {
         $query = FinanceKaecredit::find();
-
+                   
         // add conditions that should always apply here
 
         $dataProvider = new ActiveDataProvider([

yii2/modules/finance/models/FinanceKaecreditpercentage.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace app\modules\finance\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "{{%finance_kaecreditpercentage}}".
+ *
+ * @property integer $kaeperc_id
+ * @property string $kaeperc_percentage
+ * @property string $kaeperc_date
+ * @property string $kaeperc_decision
+ * @property integer $kaecredit_id
+ *
+ * @property FinanceKaecredit $kaecredit
+ */
+class FinanceKaecreditpercentage extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%finance_kaecreditpercentage}}';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['kaeperc_percentage', 'kaeperc_date', 'kaecredit_id'], 'required'],
+            [['kaeperc_percentage'], 'number'],
+            [['kaeperc_date'], 'safe'],
+            [['kaecredit_id'], 'integer'],
+            [['kaeperc_decision'], 'string', 'max' => 255],
+            [['kaecredit_id'], 'exist', 'skipOnError' => true, 'targetClass' => FinanceKaecredit::className(), 'targetAttribute' => ['kaecredit_id' => 'kaecredit_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'kaeperc_id' => Yii::t('app', 'Kaeperc ID'),
+            'kaeperc_percentage' => Yii::t('app', 'Kaeperc Percentage'),
+            'kaeperc_date' => Yii::t('app', 'Kaeperc Date'),
+            'kaeperc_decision' => Yii::t('app', 'Kaeperc Decision'),
+            'kaecredit_id' => Yii::t('app', 'Kaecredit ID'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getKaecredit()
+    {
+        return $this->hasOne(FinanceKaecredit::className(), ['kaecredit_id' => 'kaecredit_id']);
+    }
+
+    public function getKae()
+    {
+        return $this->hasOne(FinanceKae::className(),
+            ['kae_id' => 'kae_id'])->viaTable(Yii::$app->db->tablePrefix . 'finance_kaecredit', ['kaecredit_id' => 'kaecredit_id']);
+    }
+
+    /**
+     * @inheritdoc
+     * @return FinanceKaecreditpercentageQuery the active query used by this AR class.
+     */
+    public static function find()
+    {
+        return new FinanceKaecreditpercentageQuery(get_called_class());
+    }
+}

yii2/modules/finance/models/FinanceKaecreditpercentageQuery.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\modules\finance\models;
+
+/**
+ * This is the ActiveQuery class for [[FinanceKaecreditpercentage]].
+ *
+ * @see FinanceKaecreditpercentage
+ */
+class FinanceKaecreditpercentageQuery extends \yii\db\ActiveQuery
+{
+    /*public function active()
+    {
+        return $this->andWhere('[[status]]=1');
+    }*/
+
+    /**
+     * @inheritdoc
+     * @return FinanceKaecreditpercentage[]|array
+     */
+    public function all($db = null)
+    {
+        return parent::all($db);
+    }
+
+    /**
+     * @inheritdoc
+     * @return FinanceKaecreditpercentage|array|null
+     */
+    public function one($db = null)
+    {
+        return parent::one($db);
+    }
+}

yii2/modules/finance/models/FinanceKaecreditpercentageSearch.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace app\modules\finance\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use app\modules\finance\models\FinanceKaecreditpercentage;
+
+/**
+ * FinanceKaecreditpercentageSearch represents the model behind the search form about `app\modules\finance\models\FinanceKaecreditpercentage`.
+ */
+class FinanceKaecreditpercentageSearch extends FinanceKaecreditpercentage
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['kaeperc_id', 'kaecredit_id'], 'integer'],
+            [['kaeperc_percentage'], 'number'],
+            [['kaeperc_date', 'kaeperc_decision'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $prefix = Yii::$app->db->tablePrefix;
+
+        /*$query = FinanceKaecreditpercentage::findBySql("SELECT kcp.* , kc.kaecredit_amount, kc.kaecredit_date, 
+                                                        kc.kaecredit_updated, kc.year, k.* 
+                                                        FROM " . $prefix . "finance_kaecreditpercentage AS kcp,  
+                                                        " . $prefix . "finance_kaecredit AS kc,  
+                                                        " . $prefix . "finance_kae AS k 
+                                                        WHERE kcp.kaecredit_id=kc.kaecredit_id 
+                                                        AND kc.kae_id=k.kae_id")->all();*/
+        //$query = FinanceKaecreditpercentage::find()->innerJoinWith(['admapp_finance_kaecredit'])->all();
+        $prc = $prefix . "finance_kaecreditpercentage";
+        $cred = $prefix . "finance_kaecredit";
+        $kae = $prefix . "finance_kae";
+
+        $query = (new \yii\db\Query())
+                    ->select([  $prc . ".*", $cred . ".kaecredit_amount", 
+                                $cred . ".kaecredit_date", $cred . ".kaecredit_updated", 
+                                $cred . ".year", $kae . ".*"])
+                    ->from([$prc, $cred, $kae])
+                    ->where($prc . '.kaecredit_id=' . $cred . '.kaecredit_id AND ' . $cred . '.kae_id=' . $kae . '.kae_id');
+
+        //echo "<pre>"; var_dump($query->all()); echo "</pre>"; die();
+        //$query = FinanceKaecreditpercentage::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $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([
+            'kaeperc_id' => $this->kaeperc_id,
+            'kaeperc_percentage' => $this->kaeperc_percentage,
+            'kaeperc_date' => $this->kaeperc_date,
+            'kaecredit_id' => $this->kaecredit_id,
+        ]);
+
+        $query->andFilterWhere(['like', 'kaeperc_decision', $this->kaeperc_decision]);
+        return $dataProvider;
+    }
+}

yii2/modules/finance/views/default/administeryear.php

@@ -28,7 +28,7 @@
 		<div class="col-lg-4">
             <h3>Ποσοστά διάθεσης πιστώσεων ΚΑΕ</h3>
             <p>Καθορισμός ποσοστών διάθεσης των πιστώσεων των ΚΑΕ του τρέχοντος έτους.</p>
-            <p><?= Html::a('Ρυθμίσεις KAE', Url::to(['/finance/finance-kae']), ['class' => 'btn btn-primary', 'data-method' => 'post']) ?></p>            
+            <p><?= Html::a('Ρυθμίσεις KAE', Url::to(['/finance/finance-kaecreditpercentage']), ['class' => 'btn btn-primary', 'data-method' => 'post']) ?></p>            
         </div>
     </div>
 	<div class="row">