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

General Bug Fixes and Improvements

parent b45c0c66
<?php
use elitedivision\amos\core\migration\AmosMigrationPermissions;
use arter\amos\core\migration\AmosMigrationPermissions;
use yii\rbac\Permission;
......
<?php
/**
* Elite Division S.r.l.
* OPEN 2.0
* Emilia Romagna Open Innovation
* 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\community\migrations
* @package arter\amos\community\migrations
* @category CategoryName
* @author Elite Division S.r.l.
*/
use elitedivision\amos\videoconference\models\Videoconf;
use arter\amos\videoconference\models\Videoconf;
use yii\db\Migration;
/**
......
<?php
namespace elitedivision\amos\videoconference\models;
namespace arter\amos\videoconference\models;
use elitedivision\amos\admin\models\UserProfile;
use elitedivision\amos\notificationmanager\models\Notification;
use arter\amos\admin\models\UserProfile;
use arter\amos\notificationmanager\models\Notification;
use Yii;
use yii\helpers\ArrayHelper;
use yii\helpers\Url;
use elitedivision\amos\core\interfaces\ContentModelInterface;
use elitedivision\amos\core\interfaces\ViewModelInterface;
use elitedivision\amos\videoconference\widgets\icons\WidgetIconVideoconference;
use elitedivision\amos\videoconference\i18n\grammar\VideoconferenceGrammar;
use arter\amos\core\interfaces\ContentModelInterface;
use arter\amos\core\interfaces\ViewModelInterface;
use arter\amos\videoconference\widgets\icons\WidgetIconVideoconference;
use arter\amos\videoconference\i18n\grammar\VideoconferenceGrammar;
/**
* This is the model class for table "videoconf".
*/
class Videoconf extends \elitedivision\amos\videoconference\models\base\Videoconf implements ContentModelInterface ,ViewModelInterface{
class Videoconf extends \arter\amos\videoconference\models\base\Videoconf implements ContentModelInterface ,ViewModelInterface{
const STATUS_FUTURE = 1;
const STATUS_RUNNING = 2;
......@@ -40,7 +40,6 @@ class Videoconf extends \elitedivision\amos\videoconference\models\base\Videocon
* Returns the text hint for the specified attribute.
* @param string $attribute the attribute name
* @return string the attribute hint
* @see attributeHints
*/
public function getAttributeHint($attribute) {
$hints = $this->attributeHints();
......
<?php
namespace elitedivision\amos\videoconference\models;
namespace arter\amos\videoconference\models;
use elitedivision\amos\admin\models\UserProfile;
use arter\amos\admin\models\UserProfile;
use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use elitedivision\amos\videoconference\models\Videoconf;
use arter\amos\videoconference\models\Videoconf;
/**
* VideoconfSearch represents the model behind the search form about `elitedivision\amos\videoconference\models\Videoconf`.
* VideoconfSearch represents the model behind the search form about `arter\amos\videoconference\models\Videoconf`.
*/
class VideoconfSearch extends Videoconf {
......@@ -100,7 +100,7 @@ class VideoconfSearch extends Videoconf {
$notify = Yii::$app->getModule('notify');
if($notify)
{
$notify->notificationOff(Yii::$app->getUser()->id, Community::className(),$query, \elitedivision\amos\notificationmanager\models\NotificationChannels::CHANNEL_READ);
$notify->notificationOff(Yii::$app->getUser()->id, Community::className(),$query, \arter\amos\notificationmanager\models\NotificationChannels::CHANNEL_READ);
} */
$dp_params = ['query' => $query,];
if ($limit) {
......@@ -165,7 +165,7 @@ class VideoconfSearch extends Videoconf {
$isSetCwh = $this->isSetCwh($moduleCwh, $classname);
if ($isSetCwh) {
$moduleCwh->setCwhScopeFromSession();
$cwhActiveQuery = new \elitedivision\amos\cwh\query\CwhActiveQuery(
$cwhActiveQuery = new \arter\amos\cwh\query\CwhActiveQuery(
$classname, [
'queryBase' => $query
]);
......
<?php
namespace elitedivision\amos\videoconference\models;
namespace arter\amos\videoconference\models;
use Yii;
use yii\helpers\ArrayHelper;
......@@ -8,7 +8,7 @@ use yii\helpers\ArrayHelper;
/**
* This is the model class for table "videoconf_users_mm".
*/
class VideoconfUsersMm extends \elitedivision\amos\videoconference\models\base\VideoconfUsersMm {
class VideoconfUsersMm extends \arter\amos\videoconference\models\base\VideoconfUsersMm {
public function representingColumn() {
return [
......@@ -25,7 +25,6 @@ class VideoconfUsersMm extends \elitedivision\amos\videoconference\models\base\V
* Returns the text hint for the specified attribute.
* @param string $attribute the attribute name
* @return string the attribute hint
* @see attributeHints
*/
public function getAttributeHint($attribute) {
$hints = $this->attributeHints();
......
<?php
namespace elitedivision\amos\videoconference\models\base;
namespace arter\amos\videoconference\models\base;
use elitedivision\amos\admin\models\UserContact;
use elitedivision\amos\admin\models\UserProfile;
use arter\amos\admin\models\UserContact;
use arter\amos\admin\models\UserProfile;
use yii\helpers\ArrayHelper;
use elitedivision\amos\admin\AmosAdmin;
use arter\amos\admin\AmosAdmin;
/**
* Class UserProfileForm
* @package elitedivision\amos\videoconference\models\base
* @package arter\amos\videoconference\models\base
* Classe "cuscinetto" per permettere il caricamento dei partecipanti delle videoconferenze
*/
class UserProfileForm extends \yii\base\Model
......@@ -58,7 +58,6 @@ class UserProfileForm extends \yii\base\Model
* Returns the text hint for the specified attribute.
* @param string $attribute the attribute name
* @return string the attribute hint
* @see attributeHints
*/
public function getAttributeHint($attribute)
{
......@@ -130,11 +129,11 @@ class UserProfileForm extends \yii\base\Model
}
//controllo se esiste già almeno una notifica per videoconferenza_id e user_id
$has_notification = \elitedivision\amos\videoconference\models\Videoconf::checkHasNotificationByVideoconfAndUser($this->videoconf_id,
$has_notification = \arter\amos\videoconference\models\Videoconf::checkHasNotificationByVideoconfAndUser($this->videoconf_id,
$user_profile_id);
//se non esiste: lo creo in modo che venga poi inviata
if ($has_notification === false) {
\elitedivision\amos\videoconference\models\Videoconf::createNotificationByVideoconfAnduser($this->videoconf_id,
\arter\amos\videoconference\models\Videoconf::createNotificationByVideoconfAnduser($this->videoconf_id,
$user_profile_id);
}
}
......
<?php
namespace elitedivision\amos\videoconference\models\base;
namespace arter\amos\videoconference\models\base;
use elitedivision\amos\notificationmanager\models\Notification;
use arter\amos\notificationmanager\models\Notification;
use Yii;
use elitedivision\amos\videoconference\AmosVideoconference;
use arter\amos\videoconference\AmosVideoconference;
/**
* This is the base-model class for table "videoconf".
......@@ -26,9 +26,9 @@ use elitedivision\amos\videoconference\AmosVideoconference;
* @property integer $updated_by
* @property integer $deleted_by
*
* @property \elitedivision\amos\videoconference\models\VideoconfUsersMm[] $videoconfUsersMms
* @property \arter\amos\videoconference\models\VideoconfUsersMm[] $videoconfUsersMms
*/
class Videoconf extends \elitedivision\amos\core\record\Record
class Videoconf extends \arter\amos\core\record\Record
{
......@@ -118,7 +118,7 @@ class Videoconf extends \elitedivision\amos\core\record\Record
*/
public function getVideoconfUsersMms()
{
return $this->hasMany(\elitedivision\amos\videoconference\models\VideoconfUsersMm::className(), ['videoconf_id' => 'id']);
return $this->hasMany(\arter\amos\videoconference\models\VideoconfUsersMm::className(), ['videoconf_id' => 'id']);
}
......
<?php
namespace elitedivision\amos\videoconference\models\base;
namespace arter\amos\videoconference\models\base;
use elitedivision\amos\admin\models\UserProfile;
use arter\amos\admin\models\UserProfile;
use Yii;
/**
......@@ -18,10 +18,10 @@ use Yii;
* @property integer $updated_by
* @property integer $deleted_by
*
* @property \elitedivision\amos\admin\models\UserProfile $user
* @property \elitedivision\amos\videoconference\models\Videoconf $videoconf
* @property \arter\amos\admin\models\UserProfile $user
* @property \arter\amos\videoconference\models\Videoconf $videoconf
*/
class VideoconfUsersMm extends \elitedivision\amos\core\record\Record
class VideoconfUsersMm extends \arter\amos\core\record\Record
{
......@@ -70,7 +70,7 @@ return [
*/
public function getUserProfile()
{
return $this->hasOne(\elitedivision\amos\admin\models\UserProfile::className(), ['id' => 'user_profile_id']);
return $this->hasOne(\arter\amos\admin\models\UserProfile::className(), ['id' => 'user_profile_id']);
}
/**
......@@ -78,6 +78,6 @@ return [
*/
public function getVideoconf()
{
return $this->hasOne(\elitedivision\amos\videoconference\models\Videoconf::className(), ['id' => 'videoconf_id']);
return $this->hasOne(\arter\amos\videoconference\models\Videoconf::className(), ['id' => 'videoconf_id']);
}
}
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* 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
* @author Lombardia Informatica S.p.A.
*/
namespace elitedivision\amos\videoconference\rules;
namespace arter\amos\videoconference\rules;
use elitedivision\amos\videoconference\AmosVideoconference;
use elitedivision\amos\admin\models\UserProfile;
use arter\amos\videoconference\AmosVideoconference;
use arter\amos\admin\models\UserProfile;
use yii\rbac\Item;
use yii\rbac\Rule;
use elitedivision\amos\videoconference\models\Videoconf;
use elitedivision\amos\videoconference\models\VideoconfUsersMm;
use elitedivision\amos\admin\AmosAdmin;
use arter\amos\videoconference\models\Videoconf;
use arter\amos\videoconference\models\VideoconfUsersMm;
use arter\amos\admin\AmosAdmin;
/**
* Class JoinOwnVideoconference
* @package elitedivision\amos\admin\rbac
* @package arter\amos\admin\rbac
*/
class JoinOwnVideoconference extends Rule
{
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* 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
* @author Lombardia Informatica S.p.A.
*/
namespace elitedivision\amos\videoconference\rules;
namespace arter\amos\videoconference\rules;
use elitedivision\amos\videoconference\AmosVideoconference;
use elitedivision\amos\admin\models\UserProfile;
use arter\amos\videoconference\AmosVideoconference;
use arter\amos\admin\models\UserProfile;
use yii\rbac\Item;
use yii\rbac\Rule;
use elitedivision\amos\videoconference\models\Videoconf;
use arter\amos\videoconference\models\Videoconf;
/**
* Class UpdateOwnVideoconference
* @package elitedivision\amos\admin\rbac
* @package arter\amos\admin\rbac
*/
class UpdateOwnVideoconference extends Rule
{
......
<?php
namespace elitedivision\amos\videoconference\utils;
namespace arter\amos\videoconference\utils;
use elitedivision\amos\core\helpers\Html;
use elitedivision\amos\videoconference\AmosVideoconference;
use elitedivision\amos\videoconference\models\Videoconf;
use arter\amos\core\helpers\Html;
use arter\amos\videoconference\AmosVideoconference;
use arter\amos\videoconference\models\Videoconf;
use yii\helpers\Console;
use yii\helpers\Url;
use elitedivision\amos\core\utilities\Email;
use arter\amos\core\utilities\Email;
class EmailUtil
......@@ -51,8 +51,8 @@ class EmailUtil
// 'videoconference' => $videoconference->toArray(),
// 'url_videoconf' => $url_videoconf
];
$template = '@vendor/elitedivision/amos-videoconference/src/mail/generic/generic-html';
$templateSubject = '@vendor/elitedivision/amos-videoconference/src/mail/generic/subject-html';
$template = '@vendor/arter/amos-videoconference/src/mail/generic/generic-html';
$templateSubject = '@vendor/arter/amos-videoconference/src/mail/generic/subject-html';
$sent = self::sendEmail($to, $from, $subject, $params, $template, $templateSubject, $user);
return $sent;
......@@ -86,8 +86,8 @@ class EmailUtil
'subject' => $subject,
'profile' => $user->userProfile
];
$template = '@vendor/elitedivision/amos-videoconference/src/mail/generic/generic-html';
$templateSubject = '@vendor/elitedivision/amos-videoconference/src/mail/generic/subject-html';
$template = '@vendor/arter/amos-videoconference/src/mail/generic/generic-html';
$templateSubject = '@vendor/arter/amos-videoconference/src/mail/generic/subject-html';
$sent = self::sendEmail($to, $from, $subject, $params, $template, $templateSubject, $user);
return $sent;
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* 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
* @author Lombardia Informatica S.p.A.
*/
/** @var \elitedivision\amos\dashboard\models\AmosUserDashboards $currentDashboard * */
/** @var \arter\amos\dashboard\models\AmosUserDashboards $currentDashboard * */
/** @var \yii\web\View $this * */
use elitedivision\amos\core\icons\AmosIcons;
use elitedivision\amos\core\views\assets\AmosCoreAsset;
use elitedivision\amos\dashboard\assets\ModuleDashboardAsset;
use arter\amos\core\icons\AmosIcons;
use arter\amos\core\views\assets\AmosCoreAsset;
use arter\amos\dashboard\assets\ModuleDashboardAsset;
use yii\helpers\Html;
use elitedivision\amos\videoconference\AmosVideoconference;
use arter\amos\videoconference\AmosVideoconference;
AmosCoreAsset::register($this);
ModuleDashboardAsset::register($this);
......
<?php
use elitedivision\amos\core\helpers\Html;
use elitedivision\amos\core\forms\ActiveForm;
use arter\amos\core\helpers\Html;
use arter\amos\core\forms\ActiveForm;
use kartik\builder\Form;
use kartik\datecontrol\DateControl;
use elitedivision\amos\core\forms\Tabs;
use elitedivision\amos\core\forms\CloseSaveButtonWidget;
use arter\amos\core\forms\Tabs;
use arter\amos\core\forms\CloseSaveButtonWidget;
use yii\helpers\Url;
use kartik\select2\Select2;
use yii\helpers\ArrayHelper;
use elitedivision\amos\videoconference\models\Videoconf;
use arter\amos\videoconference\models\Videoconf;
/**
* @var yii\web\View $this
* @var elitedivision\amos\videoconference\models\Videoconf $model
* @var arter\amos\videoconference\models\Videoconf $model
* @var yii\widgets\ActiveForm $form
*/
?>
......@@ -69,7 +69,7 @@ $this->registerJs($js);
$display = '';
}?>
<div class="col-lg-4 col-sm-12">
<?= $form->field($model, 'sheduledVideoconfCheckBox')->checkbox(['class' => 'schedule-videoconference'])->label(\elitedivision\amos\videoconference\AmosVideoconference::t('amosvideoconference', 'Programma videoconferenza'));?>
<?= $form->field($model, 'sheduledVideoconfCheckBox')->checkbox(['class' => 'schedule-videoconference'])->label(\arter\amos\videoconference\AmosVideoconference::t('amosvideoconference', 'Programma videoconferenza'));?>
</div>
</div>
<div id = "date-hour-container" class="row" style="<?= $display ?>">
......@@ -118,7 +118,6 @@ $this->registerJs($js);
<div class="col-lg-12 col-sm-12">
<?php
/**
* @see https://github.com/softark/yii2-dual-listbox or https://github.com/istvan-ujjmeszaros/bootstrap-duallistbox
*/
echo \softark\duallistbox\DualListbox::widget([
'model' => $model_partecipanti,
......
<?php
use yii\helpers\Html;
use elitedivision\amos\core\icons\AmosIcons;
use arter\amos\core\icons\AmosIcons;
use backend\modules\admin\Module as AdminModule;
/*
......
<?php
use elitedivision\amos\core\icons\AmosIcons;
use arter\amos\core\icons\AmosIcons;
/*
* Personalizzare a piacimento la vista
* $model è il model legato alla tabella del db
......
<?php
use elitedivision\amos\core\helpers\Html;
use arter\amos\core\helpers\Html;
/*
* Personalizzare a piacimento la vista
......
<?php
use elitedivision\amos\core\helpers\Html;
use arter\amos\core\helpers\Html;
use yii\widgets\ActiveForm;
/**
......
<?php
use elitedivision\amos\core\helpers\Html;
use arter\amos\core\helpers\Html;
/**
* @var yii\web\View $this
* @var elitedivision\amos\videoconference\models\Videoconf $model
* @var arter\amos\videoconference\models\Videoconf $model
*/
$this->title = Yii::t('cruds', 'Crea', [
......
<?php
use elitedivision\amos\core\helpers\Html;
use elitedivision\amos\core\views\DataProviderView;
use elitedivision\amos\core\utilities\ViewUtility;
use elitedivision\amos\core\icons\AmosIcons;
use elitedivision\amos\core\utilities\ModalUtility;
use elitedivision\amos\videoconference\AmosVideoconference;
use arter\amos\core\helpers\Html;
use arter\amos\core\views\DataProviderView;
use arter\amos\core\utilities\ViewUtility;
use arter\amos\core\icons\AmosIcons;
use arter\amos\core\utilities\ModalUtility;
use arter\amos\videoconference\AmosVideoconference;
use yii\widgets\Pjax;
......@@ -85,7 +85,7 @@ $this->params['breadcrumbs'][] = $this->title;
// 'updated_by',
// 'deleted_by',
[
'class' => 'elitedivision\amos\core\views\grid\ActionColumn',
'class' => 'arter\amos\core\views\grid\ActionColumn',
'template' => $actionColumn,
'buttons' => [
'join' => function ($url, $model) {
......
......@@ -4,11 +4,11 @@ use yii\helpers\Html;
use yii\widgets\DetailView;
use kartik\datecontrol\DateControl;
use yii\helpers\Url;
use elitedivision\amos\videoconference\assets\VideoconferenceAsset;
use arter\amos\videoconference\assets\VideoconferenceAsset;
/**
* @var yii\web\View $this
* @var elitedivision\amos\videoconference\models\Videoconf $model
* @var arter\amos\videoconference\models\Videoconf $model
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment