Merge pull request #29 from lukaskavouras/master

New admin functionality for changing pages dynamically

controllers/AdministrationController.php

@@ -24,6 +24,7 @@
 namespace app\controllers;
 
 use Yii;
+use yii\helpers\Url;
 use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\web\Response;
@@ -33,6 +34,7 @@
 use app\models\ImageRequest;
 use app\models\User;
 use yii\data\Pagination;
+use app\models\Page;
 use app\models\Notification;
 use app\models\UploadDatasetDefaults;
 use app\models\SystemConfiguration;
@@ -155,6 +157,7 @@ public function actionSystemConfiguration()
     {
 
         $configuration=SystemConfiguration::find()->one();
+        $pages=Page::getPagesDropdown();
         $no_configuration=false;
         if (empty($configuration))
         {
@@ -177,9 +180,95 @@ public function actionSystemConfiguration()
         }
 
 
-        return $this->render('system_configuration', ['configuration'=>$configuration]);
+        return $this->render('system_configuration', ['configuration'=>$configuration, 'pages'=>$pages]);
 
     }
+
+
+    public function actionManagePages()
+    {
+        $pages=Page::find()->all();
+
+        return $this->render('manage-pages',['pages'=>$pages]);
+
+    }
+
+    public function actionAddPage()
+    {
+        $model=new Page;
+        $form_params =
+        [
+            'action' => URL::to(['administration/add-page']),
+            'options' => 
+            [
+                'class' => 'add_page_form',
+                'id'=> "add_page_form"
+            ],
+            'method' => 'POST'
+        ];
+
+        if ($model->load(Yii::$app->request->post()) && $model->validate())
+        {
+            $model->save();
+            $this->redirect(['administration/manage-pages']);
+        }
+
+        return $this->render('add-page',['model'=>$model,'form_params'=>$form_params]);
+
+    }
+    public function actionEditPage($id)
+    {
+        $page=Page::find()->where(['id'=>$id])->one();
+
+        if (empty($page))
+        {
+            return $this->render('error_page_exist');
+        }
+
+        $form_params =
+        [
+            'action' => URL::to(['administration/edit-page', 'id'=>$id]),
+            'options' => 
+            [
+                'class' => 'edit_page_form',
+                'id'=> "edit_page_form"
+            ],
+            'method' => 'POST'
+        ];
+
+        if ($page->load(Yii::$app->request->post()) && $page->validate())
+        {
+            $page->save();
+            $this->redirect(['administration/manage-pages']);
+        }
+
+        return $this->render('edit-page',['page'=>$page,'form_params'=>$form_params]);
+    }
+    public function actionDeletePage($id)
+    {
+        $page=Page::find()->where(['id'=>$id])->one();
+
+        if (empty($page))
+        {
+            return $this->render('error_page_exist');
+        }
+
+        $page->delete();
+        $this->redirect(['administration/manage-pages']);
+
+
+    }
+    public function actionViewPage($id)
+    {
+        $page=Page::find()->where(['id'=>$id])->one();
+
+        if (empty($page))
+        {
+            return $this->render('error_page_exist');
+        }
+
+        return $this->render('view-page',['page'=>$page]);
+    }
 
 
 

controllers/SiteController.php

@@ -39,6 +39,8 @@
 use app\models\SoftwareRemove;
 use app\models\ImageRequest;
 use yii\helpers\Url;
+use app\models\Page;
+use app\models\SystemConfiguration;
 use webvimark\modules\UserManagement\models\User as Userw;
 use app\models\RunHistory;
 use app\models\SoftwareInput;
@@ -99,7 +101,11 @@ public function actions()
      */
     public function actionIndex()
     {
-        return $this->render('index');
+        $config=SystemConfiguration::find()->one();
+        $id=$config->home_page;
+        $page=Page::find()->where(['id'=>$id])->one();
+
+        return $this->render('index',['page'=>$page]);
     }
 
     /**

controllers/SoftwareController.php

@@ -1744,12 +1744,6 @@ public function actionDownloadRocrate($jobid)
 
     public function actionRoCrateHistory()
     {
-        // $query=RunHistory::find()->where(['username'=>$user])->orderBy(['start'=>SORT_DESC]);
-        // $count = $query->count();
-        // $pagination = new Pagination(['totalCount' => $count]);
-        // $results = $query->offset($pagination->offset)
-        //         ->limit($pagination->limit)
-        //         ->all();
         $username=User::getCurrentUser()['username'];
         $query=RoCrate::find()->orderBy(['date'=>SORT_DESC]);
         $count = $query->count();
@@ -1777,8 +1771,7 @@ public function actionRoCrateHistory()
                 'date'=>$ro_crate->date, 'experiment_description'=>$ro_crate->experiment_description, 'public'=>$ro_crate->public, 'link'=>['software/download-rocrate', 'jobid'=>$ro_crate->jobid]];
             }  
         }
-        // print_r($results_public);
-        // exit(0);
+
         return $this->render('ro_crate_history', ['results_user'=>$results_user, 'results_public'=>$results_public, 'pagination'=>$pagination]);
     }
 

database_schema/migration_2.sql

@@ -0,0 +1,4 @@
+
+ALTER TABLE system_configuration add column home_page integer, add column help_page integer;
+INSERT INTO system_configuration (admin_email,home_page,help_page) values (null,null,null);
+CREATE TABLE pages (id serial primary key, title text, content text);

models/Page.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace app\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "pages".
+ *
+ * @property int $id
+ * @property string $title
+ * @property string $body
+ */
+class Page extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'pages';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['title', 'content'], 'string'],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'title' => 'Title',
+            'content' => 'Content',
+        ];
+    }
+
+    public static function getPagesDropdown()
+    {
+        $pages=self::find()->all();
+
+        $result=[];
+        foreach ($pages as $page)
+        {
+            $result[$page->id]=$page->title;
+        }
+
+        return $result;
+    }
+}

models/SystemConfiguration.php

@@ -49,6 +49,7 @@ public function rules()
         return [
             [['admin_email'], 'string'],
             [['admin_email'], 'email'],
+            [['home_page', 'privacy_page','help_page'], 'integer'],
         ];
     }
 
@@ -60,6 +61,24 @@ public function attributeLabels()
         return [
             'id' => 'ID',
             'admin_email' => 'Admin Email',
+            'home_page' => 'Home page',
+            'help_page' => 'Help page',
         ];
     }
+
+
+    /**
+     * {@inheritdoc}
+     */
+
+
+    public function updateDB()
+    {
+        Yii::$app->db->createCommand()->update('system_configuration',[
+            'admin_email'=>$this->admin_email, 
+            'help_page'=>$this->help_page, 
+            'home_page'=>$this->home_page, 
+        ], "TRUE")->execute();
+    }
+
 }

views/administration/add-page.php

@@ -0,0 +1,39 @@
+<?php
+
+use yii\helpers\Html;
+use webvimark\modules\UserManagement\models\User;
+use yii\widgets\ActiveForm;
+
+$this->title='Add new page';
+$this->registerJsFile('@web/js/administration/add-edit-page.js', ['depends' => [\yii\web\JqueryAsset::className()]] );
+$back_icon='<i class="fas fa-arrow-left"></i>';
+/*
+ * Users are able to view the name, version, start date, end date, mountpoint 
+ * and running status of their previous software executions. 
+ */
+?>
+<div class='title row'>
+	<div class="col-md-11">
+		<h1><?= Html::encode($this->title) ?></h1>
+	</div>
+	<div class="col-md-1 float-right">
+		<?= Html::a("$back_icon Back", ['/administration/manage-pages'], ['class'=>'btn btn-default']) ?>
+	</div>
+</div>
+
+<?php $form = ActiveForm::begin($form_params);  ?>
+
+<?= $form->field($model, 'title') ?>
+
+<?= $form->field($model, 'content')->textarea(['rows'=>30,'id'=>'content-area']) ?>
+
+
+ <div class="row">
+    <div class="col-md-1"><?= Html::submitButton('<i class="fas fa-check"></i> Submit', ['class' => 'btn btn-primary']) ?></div>
+    <div class="col-md-1"><?= Html::a('<i class="fas fa-times"></i> Cancel', ['/project/index'], ['class'=>'btn btn-default']) ?></div>
+    <div class="col-md-1"><?= Html::a('<i class="fas fa-eye"></i> Preview', "javascript:void(0);", ['class'=>'btn btn-secondary preview-btn']) ?></div>
+
+</div>
+
+<?php ActiveForm::end(); ?>
+

views/administration/edit-page.php

@@ -0,0 +1,37 @@
+<?php
+
+use yii\helpers\Html;
+use webvimark\modules\UserManagement\models\User;
+use yii\widgets\ActiveForm;
+
+$this->title="Edit page \"$page->title\"";
+$this->registerJsFile('@web/js/administration/add-edit-page.js', ['depends' => [\yii\web\JqueryAsset::className()]] );
+$back_icon='<i class="fas fa-arrow-left"></i>';
+/*
+ * Users are able to view the name, version, start date, end date, mountpoint 
+ * and running status of their previous software executions. 
+ */
+?>
+<div class='title row'>
+	<div class="col-md-11">
+		<h1><?= Html::encode($this->title) ?></h1>
+	</div>
+	<div class="col-md-1 float-right">
+		<?= Html::a("$back_icon Back", ['/administration/manage-pages'], ['class'=>'btn btn-default']) ?>
+	</div>
+</div>
+
+<?php $form = ActiveForm::begin($form_params);  ?>
+
+<?= $form->field($page, 'content')->textarea(['rows'=>30,'id'=>'content-area']) ?>
+
+
+ <div class="row">
+    <div class="col-md-1"><?= Html::submitButton('<i class="fas fa-check"></i> Submit', ['class' => 'btn btn-primary']) ?></div>
+    <div class="col-md-1"><?= Html::a('<i class="fas fa-times"></i> Cancel', ['/administration/index'], ['class'=>'btn btn-default']) ?></div>
+    <div class="col-md-1"><?= Html::a('<i class="fas fa-eye"></i> Preview', "javascript:void(0);", ['class'=>'btn btn-secondary preview-btn']) ?></div>
+
+</div>
+
+<?php ActiveForm::end(); ?>
+

views/administration/error_page_exist.php

@@ -0,0 +1,28 @@
+<?php
+
+use yii\helpers\Html;
+use app\components\Headers;
+
+echo Html::CssFile('@web/css/project/vm-details.css');
+
+$this->title="Authorization error";
+
+$back_icon='<i class="fas fa-arrow-left"></i>';
+
+Headers::begin() ?>
+<?php echo Headers::widget(
+['title'=>"Page does not exist.", 
+	'buttons'=>
+	[
+		['fontawesome_class'=>$back_icon,'name'=> 'Back', 'action'=> ['/administration/manage-pages'], 'type'=>'a', 'options'=>['class'=>'btn btn-default'] ],
+
+	]
+])
+?>
+<?Headers::end()?>
+
+
+
+<div class="row">
+	<div class="col-md-12"><h3>This page does not exist.</h3></div>
+</div>