first publishing2

Author: lsl-soft

Poll.php

@@ -74,31 +74,6 @@ private function createResult() {
         return $modelsaved;
     }
 
-//    private function createResult($model) {
-//        $modelsaved = false;
-//        $answers = $model->id_answer;
-//        foreach ($answers as $id_answer) {
-//            $modelMulti = new PollsResult();
-//            $modelMulti->id_user = $model->id_user;
-//            $modelMulti->id_poll = $model->id_poll;
-//            $modelMulti->num = $model->num;
-//            $modelMulti->create_at = $model->create_at;
-//            $modelMulti->ip = $model->ip;
-//            $modelMulti->host = $model->host;
-//            $modelMulti->id_answer = $id_answer;
-//
-//            if (!$modelMulti->save()) {
-//                $modelsaved = false;
-//                print_r($modelMulti->errors);
-//                return false;
-//            } else {
-//
-//                $modelsaved = true;
-//            }
-//        }
-//        return $modelsaved;
-//    }
-
     /**
      * set $model properties
      * @param type $model
@@ -123,26 +98,8 @@ private function setModel() {
                 $this->model->id_user = Yii::$app->user->getId();
             }
         }
-        //return $this->model;
     }
 
-//    private function setModel($model) {
-//        $model->id_poll = $this->pollsProvider->id;
-//        $model->num = 1;
-//        $model->create_at = date("Y-m-d H:i:s");
-//        $model->ip = Yii::$app->request->getUserIP();
-//        $model->host = Yii::$app->request->getUserHost();
-//        if ($this->pollsProvider->anonymous) {
-//            $model->scenario = PollsResult::SCENARIO_ANONYMOUS;
-//            $model->id_user = 0;
-//        } else {
-//            if (!Yii::$app->user->isGuest) {
-//                $model->id_user = Yii::$app->user->getId();
-//            }
-//        }
-//        return $model;
-//    }
-
     /**
      * Return poll for voting
      * @return type Polls 
@@ -153,7 +110,7 @@ public function getProvider() {
         } else {
             $pollVote = Polls::getPollToday();
             if (isset($pollVote)) {
-                $this->idPoll = $pollVote->id_poll;
+                $this->idPoll = $pollVote->id;
             }
             return $pollVote;
         }
@@ -168,7 +125,7 @@ public function run() {
         PollAsset::register($this->getView());
 
         $this->model = new PollsResult();
-        $this->pollsProvider = $this->getProvider();
+        $this->pollsProvider = $this->getProvider();//barbaric of course
         if (!isset($this->pollsProvider)) {
             return;
         }
@@ -194,16 +151,13 @@ public function run() {
             return; //if show result wasn't allowed nothing would happen
         }
         $searchModel = new PollsResultSearch();
-
-        // $dataProvider = PollsResult::getResults($this->idPoll);//
-        $dataProvider = $searchModel->search(['id_poll' => $this->idPoll]); //$searchModel->search(Yii::$app->request->queryParams);
+        $dataProvider = $searchModel->search(['id_poll' => $this->idPoll]);
         if (!isset($this->resultView)) {
             return \Yii::$app->controller->renderPartial('@vendor/lslsoft/yii2-poll/views/chart', ['dataProvider' => $dataProvider,
                         'searchModel' => $searchModel,
                         'question' => $this->pollsProvider->question,
                         'sumRes' => $this->model->num]);
         }
-
         return \Yii::$app->controller->renderPartial('@vendor/lslsoft/yii2-poll/views/table', ['dataProvider' => $dataProvider,
                     'searchModel' => $searchModel,
                     'question' => $this->pollsProvider->question,

README.md

@@ -3,6 +3,8 @@
 This is simple poll widget for yii2 framework.
 You can use both single and multiple answer.
 
+([More information lslsoft.com](http://lslsoft.com/2017/01/22/simple-poll-widget-for-yii2/)
+
 ### Installing
 
 Yii2-poll can be installed using composer. Run following command to download and install yii2-poll:
@@ -30,7 +32,7 @@ to apply migrations add in your config file
 ```php
 'migrate-lslsoft-create' => [
             'class' => 'yii\console\controllers\MigrateController',
-            'migrationPath' => 'vendor/lslsoft/yii2-poll/migrations',
+            'migrationPath' => 'vendor/lslsoft/yii2-poll/migrations/create',
             'migrationTable' => 'migration_lslsoft_create',
         ],
 ```
@@ -47,7 +49,7 @@ and for inserting some sample data:
 ```php
 'migrate-lslsoft-insert' => [
             'class' => 'yii\console\controllers\MigrateController',
-            'migrationPath' => 'vendor/lslsoft/yii2-poll/migrations',
+            'migrationPath' => 'vendor/lslsoft/yii2-poll/migrations/insert',
             'migrationTable' => 'migration_lslsoft_insert',
         ],
 
@@ -151,7 +153,7 @@ CREATE TABLE `polls_result` (
 ```
 
 
-<<<<<<< HEAD
+
 ### Author
 
 * **Leonid Lyalin** 
@@ -160,33 +162,14 @@ CREATE TABLE `polls_result` (
 
 This project is licensed under the BSD-3-Clause
 
-### Acknowledgments
-=======
-
-## Built With
-
-* [Dropwizard](http://www.dropwizard.io/1.0.2/docs/) - The web framework used
-* [Maven](https://maven.apache.org/) - Dependency Management
-* [ROME](https://rometools.github.io/rome/) - Used to generate RSS Feeds
-
-## Contributing
 
-Please read [CONTRIBUTING.md](https://gist.github.com/PurpleBooth/b24679402957c63ec426) for details on our code of conduct, and the process for submitting pull requests to us.
-
-## Versioning
-
-We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/your/project/tags). 
-
-## Authors
+### Authors
 
 * **Leonid Lyalin** 
 
-## License
 
-This project is licensed under the BSD-3-Clause
+### Acknowledgments
 
-## Acknowledgments
->>>>>>> origin/master
 
 * Thanks to all Yii framework team for inspiration and special thanks to Alexander Makarov (@samdark)
 * Thanks to @Insolita for magic yii2-migrik

models/Polls.php

@@ -98,7 +98,7 @@ public static function getPollToday() {
 
     /**
      * Return poll according to id
-     * @param type $id - id of poll
+     * @param type $id_poll - id of poll
      * @return type poll 
      */
     public static function getIdPoll($id_poll) {

models/PollsResult.php

@@ -35,14 +35,6 @@ class PollsResult extends \yii\db\ActiveRecord {
      */
     const SCENARIO_ANONYMOUS = 'anonymous';
 
-    /**
-     *
-     * @property array for checkboxlist checked items
-     * 
-     * @todo make this property to work in form checkBoxList instead of 'id_poll'
-     */
-    //public $result;
-
     public static function tableName() {
         return 'polls_result';
     }
@@ -63,18 +55,6 @@ public function rules() {
         ];
     }
 
-    /**
-     * 
-     * @return scenario for 
-     */
-//    public function scenarios()
-//    {
-//        return [
-//            'default' =>['num', 'id_poll', 'id_answer', 'id_user'],
-//            self::SCENARIO_SINGLE => ['num', 'id_poll', 'id_answer', 'id_user'],
-//            self::SCENARIO_MULTIPLE => ['num', 'id_poll', 'id_user'],
-//        ];
-//    }
     /**
      * @inheritdoc
      * @todo change 'app'/'polls'
@@ -144,11 +124,12 @@ public static function getMaxNum($id_poll) {
                         ->where('id_poll=:id_poll', ['id_poll' => $id_poll])
                         ->max('num');
     }
-/**
- * Return joined number of records
- * @param integer $id_poll
- * @return PollsResult set of records
- */
+
+    /**
+     * Return joined number of records
+     * @param integer $id_poll
+     * @return PollsResult set of records
+     */
     public static function getResults($id_poll) {
         return self::find()
                         ->select('id_answer, count(`id_answer`) as `res`')

models/PollsResultSearch.php

@@ -46,25 +46,10 @@ public function search($params) {
                 ->groupBy(['id_answer'])
                 ->where(['polls_result.id_poll'=>$params['id_poll']]);
 
-        // add conditions that should always apply here
-
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
 
-//        if (!($this->load($params) && $this->validate())) {
-//            // uncomment the following line if you do not want to return any records when validation fails
-//            // $query->where('0=1');
-//            $query->where(['polls_result.id_poll'=>$params['id_poll']]);
-//            $query->joinWith(['idAnswer']);
-//            return $dataProvider;
-//        }
-
-//        $query->joinWith('idAnswer');
-//
-//        $query->groupBy(['id_answer']);
-
-
         return $dataProvider;
     }