Commit d7657a56 authored by Aster's avatar Aster Committed by waltermazza
Browse files

General Bug Fixes and Improvements

parent b45c0c66
...@@ -9,13 +9,13 @@ Plugin for E015 common modules. ...@@ -9,13 +9,13 @@ Plugin for E015 common modules.
Either run Either run
```bash ```bash
composer require elitedivision/amos-videoconference composer require arter/amos-videoconference
``` ```
or add this row or add this row
``` ```
"elitedivision/amos-videoconference": "dev-master" "arter/amos-videoconference": "dev-master"
``` ```
to the require section of your `composer.json` file. to the require section of your `composer.json` file.
...@@ -27,7 +27,7 @@ to the require section of your `composer.json` file. ...@@ -27,7 +27,7 @@ to the require section of your `composer.json` file.
<?php <?php
'modules' => [ 'modules' => [
'videoconference' => [ 'videoconference' => [
'class' => 'elitedivision\amos\videoconference\AmosVideoconference', 'class' => 'arter\amos\videoconference\AmosVideoconference',
'rbacEnabled' => false, 'rbacEnabled' => false,
'jitsiDomain' => 'jitsi-server.example.com', 'jitsiDomain' => 'jitsi-server.example.com',
], ],
...@@ -39,7 +39,7 @@ Set **jitsiDomain** to the Jitsi server address. ...@@ -39,7 +39,7 @@ Set **jitsiDomain** to the Jitsi server address.
### 3. Apply migrations ### 3. Apply migrations
```bash ```bash
php yii migrate/up --migrationPath=@vendor/elitedivision/amos-videoconference/src/migrations php yii migrate/up --migrationPath=@vendor/arter/amos-videoconference/src/migrations
``` ```
or add this row to your migrations config in console: or add this row to your migrations config in console:
...@@ -47,7 +47,7 @@ or add this row to your migrations config in console: ...@@ -47,7 +47,7 @@ or add this row to your migrations config in console:
```php ```php
<?php <?php
return [ return [
'@vendor/elitedivision/amos-videoconference/src/migrations', '@vendor/arter/amos-videoconference/src/migrations',
]; ];
``` ```
......
{ {
"name": "elitedivision/amos-videoconference", "name": "arter/amos-videoconference",
"description": "Amos Videoconference", "description": "Amos Videoconference",
"keywords": [ "keywords": [
"amos", "amos",
"video", "video",
"conference" "conference"
], ],
"homepage": "http://www.elitedivision.it/", "homepage": "http://www.arter.it/",
"type": "component", "type": "component",
"require": { "require": {
"php": ">=5.4.0", "php": ">=5.4.0",
"elitedivision/amos-core": ">=1.9", "arter/amos-core": ">=1.9",
"elitedivision/amos-notify": ">=1.4", "arter/amos-notify": ">=1.4",
"softark/yii2-dual-listbox": "^1.0" "softark/yii2-dual-listbox": "^1.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"elitedivision\\amos\\videoconference\\": "src" "arter\\amos\\videoconference\\": "src"
} }
}, },
"fxp-asset": { "fxp-asset": {
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\videoconference * @package arter\amos\videoconference
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\videoconference; namespace arter\amos\videoconference;
use elitedivision\amos\core\module\AmosModule; use arter\amos\core\module\AmosModule;
use elitedivision\amos\core\module\ModuleInterface; use arter\amos\core\module\ModuleInterface;
use Yii; use Yii;
/** /**
* Class AmosVideoconference * Class AmosVideoconference
* @package elitedivision\amos\videoconference * @package arter\amos\videoconference
*/ */
class AmosVideoconference extends AmosModule implements ModuleInterface class AmosVideoconference extends AmosModule implements ModuleInterface
{ {
...@@ -37,7 +33,7 @@ class AmosVideoconference extends AmosModule implements ModuleInterface ...@@ -37,7 +33,7 @@ class AmosVideoconference extends AmosModule implements ModuleInterface
public $name = 'Videoconference'; public $name = 'Videoconference';
public $controllerNamespace = 'elitedivision\amos\videoconference\controllers'; public $controllerNamespace = 'arter\amos\videoconference\controllers';
public $config = []; public $config = [];
...@@ -69,7 +65,7 @@ class AmosVideoconference extends AmosModule implements ModuleInterface ...@@ -69,7 +65,7 @@ class AmosVideoconference extends AmosModule implements ModuleInterface
{ {
parent::init(); parent::init();
\Yii::setAlias('@elitedivision/amos/' . static::getModuleName() . '/controllers/', __DIR__ . '/controllers/'); \Yii::setAlias('@arter/amos/' . static::getModuleName() . '/controllers/', __DIR__ . '/controllers/');
// initialize the module with the configuration loaded from config.php // initialize the module with the configuration loaded from config.php
$config = require(__DIR__ . DIRECTORY_SEPARATOR . self::$CONFIG_FOLDER . DIRECTORY_SEPARATOR . 'config.php'); $config = require(__DIR__ . DIRECTORY_SEPARATOR . self::$CONFIG_FOLDER . DIRECTORY_SEPARATOR . 'config.php');
Yii::configure($this,$config ); Yii::configure($this,$config );
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\moodle\assets * @package arter\amos\moodle\assets
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\videoconference\assets; namespace arter\amos\videoconference\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
use Yii; use Yii;
/** /**
* Class VideoconferenceAsset * Class VideoconferenceAsset
* @package elitedivision\amos\videoconference\assets * @package arter\amos\videoconference\assets
*/ */
class VideoconferenceAsset extends AssetBundle { class VideoconferenceAsset extends AssetBundle {
/** /**
* @inheritdoc * @inheritdoc
*/ */
public $sourcePath = '@vendor/elitedivision/amos-videoconference/src/assets/web'; public $sourcePath = '@vendor/arter/amos-videoconference/src/assets/web';
public $publishOptions = [ public $publishOptions = [
'forceCopy' => YII_DEBUG, 'forceCopy' => YII_DEBUG,
]; ];
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\videoconference * @package arter\amos\videoconference
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
$jitsiDomain = "meet.test.demotestwip.it"; $jitsiDomain = "meet.test.demotestwip.it";
......
<?php <?php
namespace elitedivision\amos\videoconference\controllers; namespace arter\amos\videoconference\controllers;
//namespace console\controllers; //namespace console\controllers;
use elitedivision\amos\admin\models\UserProfile; use arter\amos\admin\models\UserProfile;
use elitedivision\amos\videoconference\AmosVideoconference; use arter\amos\videoconference\AmosVideoconference;
use elitedivision\amos\videoconference\models\Videoconf; use arter\amos\videoconference\models\Videoconf;
use elitedivision\amos\videoconference\models\VideoconfUsersMm; use arter\amos\videoconference\models\VideoconfUsersMm;
use elitedivision\amos\videoconference\utils\EmailUtil; use arter\amos\videoconference\utils\EmailUtil;
use yii\console\Controller; use yii\console\Controller;
use yii\helpers\Console; use yii\helpers\Console;
use Yii; use Yii;
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\videoconference\controllers * @package arter\amos\videoconference\controllers
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\videoconference\controllers; namespace arter\amos\videoconference\controllers;
use elitedivision\amos\dashboard\controllers\base\DashboardController; use arter\amos\dashboard\controllers\base\DashboardController;
use Yii; use Yii;
use yii\helpers\Url; use yii\helpers\Url;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
...@@ -26,7 +22,7 @@ class DefaultController extends DashboardController { ...@@ -26,7 +22,7 @@ class DefaultController extends DashboardController {
/** /**
* @var string $layout Layout per la dashboard interna. * @var string $layout Layout per la dashboard interna.
*/ */
public $layout = "@vendor/elitedivision/amos-core/views/layouts/dashboard_interna"; public $layout = "@vendor/arter/amos-core/views/layouts/dashboard_interna";
/** /**
......
<?php <?php
namespace elitedivision\amos\videoconference\controllers; namespace arter\amos\videoconference\controllers;
use elitedivision\amos\admin\models\UserProfile; use arter\amos\admin\models\UserProfile;
use elitedivision\amos\core\user\User; use arter\amos\core\user\User;
use elitedivision\amos\core\utilities\Email; use arter\amos\core\utilities\Email;
use elitedivision\amos\notificationmanager\models\NotificationsRead; use arter\amos\notificationmanager\models\NotificationsRead;
use elitedivision\amos\videoconference\models\base\UserProfileForm; use arter\amos\videoconference\models\base\UserProfileForm;
use elitedivision\amos\videoconference\models\VideoconfUsersMm; use arter\amos\videoconference\models\VideoconfUsersMm;
use elitedivision\amos\videoconference\utils\EmailUtil; use arter\amos\videoconference\utils\EmailUtil;
use Yii; use Yii;
use elitedivision\amos\videoconference\models\Videoconf; use arter\amos\videoconference\models\Videoconf;
use elitedivision\amos\videoconference\models\VideoconfSearch; use arter\amos\videoconference\models\VideoconfSearch;
use elitedivision\amos\core\controllers\CrudController; use arter\amos\core\controllers\CrudController;
use elitedivision\amos\core\icons\AmosIcons; use arter\amos\core\icons\AmosIcons;
use elitedivision\amos\core\helpers\Html; use arter\amos\core\helpers\Html;
use elitedivision\amos\core\helpers\T; use arter\amos\core\helpers\T;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter; use yii\filters\VerbFilter;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\Url; use yii\helpers\Url;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use elitedivision\amos\videoconference\AmosVideoconference; use arter\amos\videoconference\AmosVideoconference;
/** /**
* This is the class for controller "VideoconfController". * This is the class for controller "VideoconfController".
...@@ -133,15 +133,15 @@ class VideoconfController extends CrudController ...@@ -133,15 +133,15 @@ class VideoconfController extends CrudController
public function actionTest() public function actionTest()
{ {
//$videoconference = new \elitedivision\amos\videoconference\models\Videoconf(); //$videoconference = new \arter\amos\videoconference\models\Videoconf();
$videoconference = \elitedivision\amos\videoconference\models\Videoconf::findOne(1); $videoconference = \arter\amos\videoconference\models\Videoconf::findOne(1);
// pr($videoconference->toArray(), 'videoconference');//exit; // pr($videoconference->toArray(), 'videoconference');//exit;
$users = $videoconference->getVideoconfUsersMms()->all(); $users = $videoconference->getVideoconfUsersMms()->all();
// $users = $videoconference->getVideoconfUsers(); // $users = $videoconference->getVideoconfUsers();
foreach ($users as $u) { foreach ($users as $u) {
pr($u->toArray(), '$u relazione'); //exit; pr($u->toArray(), '$u relazione'); //exit;
$userProfile = \elitedivision\amos\admin\models\UserProfile::findOne($u->user_id); $userProfile = \arter\amos\admin\models\UserProfile::findOne($u->user_id);
// pr($userProfile->toArray(), '$userProfile');//exit; // pr($userProfile->toArray(), '$userProfile');//exit;
$user = $userProfile->getUser()->one(); $user = $userProfile->getUser()->one();
// pr($user->toArray(), '$user');//exit; // pr($user->toArray(), '$user');//exit;
...@@ -233,7 +233,7 @@ class VideoconfController extends CrudController ...@@ -233,7 +233,7 @@ class VideoconfController extends CrudController
*/ */
public function actionCreate() public function actionCreate()
{ {
$this->layout = "@vendor/elitedivision/amos-core/views/layouts/form"; $this->layout = "@vendor/arter/amos-core/views/layouts/form";
$model = new Videoconf; $model = new Videoconf;
//carico i partecipanti ottenendo le variabili $this->model_partecipanti e $this->partecipanti popolate //carico i partecipanti ottenendo le variabili $this->model_partecipanti e $this->partecipanti popolate
...@@ -307,7 +307,7 @@ class VideoconfController extends CrudController ...@@ -307,7 +307,7 @@ class VideoconfController extends CrudController
*/ */
public function actionUpdate($id) public function actionUpdate($id)
{ {
$this->layout = "@vendor/elitedivision/amos-core/views/layouts/form"; $this->layout = "@vendor/arter/amos-core/views/layouts/form";
$model = $this->findModel($id); $model = $this->findModel($id);
//carico i partecipanti ottenendo le variabili $this->model_partecipanti e $this->partecipanti popolate //carico i partecipanti ottenendo le variabili $this->model_partecipanti e $this->partecipanti popolate
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\videoconference\i18n\en-GB * @package arter\amos\videoconference\i18n\en-GB
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
return [ return [
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\videoconference\i18n\en-US * @package arter\amos\videoconference\i18n\en-US
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
return [ return [
......
<?php <?php
namespace elitedivision\amos\videoconference\i18n\grammar; namespace arter\amos\videoconference\i18n\grammar;
use elitedivision\amos\core\interfaces\ModelGrammarInterface; use arter\amos\core\interfaces\ModelGrammarInterface;
use elitedivision\amos\videoconference\AmosVideoconference; use arter\amos\videoconference\AmosVideoconference;
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package piattaforma-openinnovation * @package piattaforma-openinnovation
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
class VideoconferenceGrammar implements ModelGrammarInterface class VideoconferenceGrammar implements ModelGrammarInterface
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\comments\i18n\it-IT * @package arter\amos\comments\i18n\it-IT
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
return [ return [
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\admin * @package arter\amos\admin
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
use yii\helpers\Html; use yii\helpers\Html;
use elitedivision\amos\videoconference\AmosVideoconference; use arter\amos\videoconference\AmosVideoconference;
/* @var $this yii\web\View */ /* @var $this yii\web\View */
/* @var $user common\models\User */ /* @var $user common\models\User */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
use yii\helpers\Html; use yii\helpers\Html;
use elitedivision\amos\videoconference\AmosVideoconference; use arter\amos\videoconference\AmosVideoconference;
?> ?>
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * Arter
* *
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
* *
* @package elitedivision\amos\videoconference\migrations