Commit 5564cb29 authored by Aster's avatar Aster Committed by waltermazza
Browse files

General Bug Fixes and Improvements

parent 1cc2ab4f
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\core\components\AmosView;
use arter\amos\core\components\AmosView;
use yii\helpers\Html;
use yii\helpers\Url;
use elitedivision\amos\core\widget\WidgetAbstract;
use arter\amos\core\widget\WidgetAbstract;
////\bedezign\yii2\audit\web\JSLoggingAsset::register($this);
/** @var $this \elitedivision\amos\core\components\AmosView */
/** @var $this \arter\amos\core\components\AmosView */
/** @var $content string */
$urlCorrente = Url::current();
......
<?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\layout\views\layouts\parts
* @package arter\amos\layout\views\layouts\parts
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\community\models\CommunityType;
use elitedivision\amos\community\widgets\JoinCommunityWidget;
use elitedivision\amos\core\forms\ContextMenuWidget;
use elitedivision\amos\core\helpers\Html;
use elitedivision\amos\layout\assets\BaseAsset;
use elitedivision\amos\layout\Module;
use elitedivision\amos\core\forms\CreatedUpdatedWidget;
use elitedivision\amos\report\widgets\ReportDropdownWidget;
use arter\amos\community\models\CommunityType;
use arter\amos\community\widgets\JoinCommunityWidget;
use arter\amos\core\forms\ContextMenuWidget;
use arter\amos\core\helpers\Html;
use arter\amos\layout\assets\BaseAsset;
use arter\amos\layout\Module;
use arter\amos\core\forms\CreatedUpdatedWidget;
use arter\amos\report\widgets\ReportDropdownWidget;
$asset = BaseAsset::register($this);
$moduleCommunity = Yii::$app->getModule('community');
if (isset($community)) {
elitedivision\amos\community\assets\AmosCommunityAsset::register($this);
arter\amos\community\assets\AmosCommunityAsset::register($this);
$viewUrl = ['/community/join/index?id='.$community->id];
$exitUrl = (!empty(\Yii::$app->homeUrl)? \Yii::$app->homeUrl : ['/dashboard']);
$fixedCommunityType = (!is_null($moduleCommunity->communityType));
......@@ -119,7 +115,7 @@ if (isset($community)) {
<!-- 'class' => 'community-modify',-->
<!-- ],-->
<!-- 'actionDelete' => "/community/community/delete?id=" . $community->id,-->
<!-- 'layout' => '@vendor/elitedivision/amos-layout/src/views/widgets/context_menu_widget_network_scope.php'-->
<!-- 'layout' => '@vendor/arter/amos-layout/src/views/widgets/context_menu_widget_network_scope.php'-->
<!-- ]) ?>-->
<!-- </div>-->
<?php
......@@ -138,8 +134,8 @@ if (isset($community)) {
<?php if (\Yii::$app->user->can('COMMUNITY_UPDATE',
['model' => $community])) : ?>
<?php echo
Html::a(\elitedivision\amos\core\icons\AmosIcons::show('modifica', [],
\elitedivision\amos\core\icons\AmosIcons::IC),
Html::a(\arter\amos\core\icons\AmosIcons::show('modifica', [],
\arter\amos\core\icons\AmosIcons::IC),
'/challenge/challenge-team/update?id='.$team->id, ['class' => 'btn btn-icon'])
?>
<?php endif; ?>
......
<?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\layout\views\layouts\parts
* @package arter\amos\layout\views\layouts\parts
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\community\models\CommunityType;
use elitedivision\amos\community\widgets\JoinCommunityWidget;
use elitedivision\amos\core\forms\ContextMenuWidget;
use elitedivision\amos\core\helpers\Html;
use elitedivision\amos\layout\assets\BaseAsset;
use elitedivision\amos\layout\Module;
use elitedivision\amos\core\forms\CreatedUpdatedWidget;
use elitedivision\amos\report\widgets\ReportDropdownWidget;
use arter\amos\community\models\CommunityType;
use arter\amos\community\widgets\JoinCommunityWidget;
use arter\amos\core\forms\ContextMenuWidget;
use arter\amos\core\helpers\Html;
use arter\amos\layout\assets\BaseAsset;
use arter\amos\layout\Module;
use arter\amos\core\forms\CreatedUpdatedWidget;
use arter\amos\report\widgets\ReportDropdownWidget;
$asset = BaseAsset::register($this);
$moduleCommunity = Yii::$app->getModule('community');
if (isset($community)) {
elitedivision\amos\community\assets\AmosCommunityAsset::register($this);
arter\amos\community\assets\AmosCommunityAsset::register($this);
$viewUrl = ['/community/join/index?id='.$community->id];
$exitUrl = (!empty(\Yii::$app->homeUrl)? \Yii::$app->homeUrl : ['/dashboard']);
$fixedCommunityType = (!is_null($moduleCommunity->communityType));
......@@ -114,7 +110,7 @@ if (isset($community)) {
<!-- 'class' => 'community-modify',-->
<!-- ],-->
<!-- 'actionDelete' => "/community/community/delete?id=" . $community->id,-->
<!-- 'layout' => '@vendor/elitedivision/amos-layout/src/views/widgets/context_menu_widget_network_scope.php'-->
<!-- 'layout' => '@vendor/arter/amos-layout/src/views/widgets/context_menu_widget_network_scope.php'-->
<!-- ]) ?>-->
<!-- </div>-->
<?php
......@@ -133,8 +129,8 @@ if (isset($community)) {
<?php if (\Yii::$app->user->can('COMMUNITY_UPDATE',
['model' => $community])) : ?>
<?=
Html::a(\elitedivision\amos\core\icons\AmosIcons::show('modifica', [],
\elitedivision\amos\core\icons\AmosIcons::IC),
Html::a(\arter\amos\core\icons\AmosIcons::show('modifica', [],
\arter\amos\core\icons\AmosIcons::IC),
'/community/community/update?id='.$community->id, ['class' => 'btn btn-icon'])
?>
<?php endif; ?>
......
<?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\layout\views\layouts\fullsize\parts
* @package arter\amos\layout\views\layouts\fullsize\parts
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\community\models\CommunityUserMm;
use elitedivision\amos\core\forms\ContextMenuWidget;
use elitedivision\amos\core\forms\CreatedUpdatedWidget;
use elitedivision\amos\core\forms\MapWidget;
use elitedivision\amos\core\helpers\Html;
use elitedivision\amos\core\icons\AmosIcons;
use elitedivision\amos\core\module\BaseAmosModule;
use elitedivision\amos\events\AmosEvents;
use elitedivision\amos\events\models\EventInvitation;
use elitedivision\amos\events\models\EventMembershipType;
use elitedivision\amos\events\utility\EventsUtility;
use elitedivision\amos\layout\assets\BaseAsset;
use elitedivision\amos\layout\Module;
use arter\amos\community\models\CommunityUserMm;
use arter\amos\core\forms\ContextMenuWidget;
use arter\amos\core\forms\CreatedUpdatedWidget;
use arter\amos\core\forms\MapWidget;
use arter\amos\core\helpers\Html;
use arter\amos\core\icons\AmosIcons;
use arter\amos\core\module\BaseAmosModule;
use arter\amos\events\AmosEvents;
use arter\amos\events\models\EventInvitation;
use arter\amos\events\models\EventMembershipType;
use arter\amos\events\utility\EventsUtility;
use arter\amos\layout\assets\BaseAsset;
use arter\amos\layout\Module;
/**
* @var \elitedivision\amos\events\models\Event $model
* @var \arter\amos\events\models\Event $model
*/
$asset = BaseAsset::register($this);
/** @var \elitedivision\amos\cwh\AmosCwh $cwhModule */
/** @var \arter\amos\cwh\AmosCwh $cwhModule */
$cwhModule = Yii::$app->getModule('cwh');
$issetCwh = !is_null($cwhModule);
......@@ -318,14 +314,14 @@ if (isset($model)) {
?>
<div class="wrap-icons">
<!-- < ?= Html::a(\elitedivision\amos\core\icons\AmosIcons::show('modifica', [],-->
<!-- \elitedivision\amos\core\icons\AmosIcons::IC),-->
<!-- < ?= Html::a(\arter\amos\core\icons\AmosIcons::show('modifica', [],-->
<!-- \arter\amos\core\icons\AmosIcons::IC),-->
<!-- '/events/event/update?id='.$model->id, ['class' => 'btn btn-icon'])-->
<!-- ?>-->
<?php
$url = !empty(\Yii::$app->params['platform']['backendUrl']) ? \Yii::$app->params['platform']['backendUrl'] : "";
echo \elitedivision\amos\core\forms\editors\socialShareWidget\SocialShareWidget::widget([
'mode' => \elitedivision\amos\core\forms\editors\socialShareWidget\SocialShareWidget::MODE_DROPDOWN,
echo \arter\amos\core\forms\editors\socialShareWidget\SocialShareWidget::widget([
'mode' => \arter\amos\core\forms\editors\socialShareWidget\SocialShareWidget::MODE_DROPDOWN,
'configuratorId' => 'socialShare',
'model' => $model,
'url' => \yii\helpers\Url::to($url . '/events/event/public?id=' . $model->id, true), //TODO VIEW
......@@ -338,7 +334,7 @@ if (isset($model)) {
<?php
$reportModule = \Yii::$app->getModule('report');
if (isset($reportModule) && in_array($model->className(), $reportModule->modelsEnabled)) {
echo \elitedivision\amos\report\widgets\ReportDropdownWidget::widget([
echo \arter\amos\report\widgets\ReportDropdownWidget::widget([
'model' => $model,
]);
}
......@@ -353,7 +349,7 @@ if (isset($model)) {
'class' => 'event-modify',
],
'actionDelete' => "/events/event/delete?id=" . $model->id,
'layout' => '@vendor/elitedivision/amos-layout/src/views/widgets/context_menu_widget_network_scope.php'
'layout' => '@vendor/arter/amos-layout/src/views/widgets/context_menu_widget_network_scope.php'
]) ?>
</div>
</div>
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\core\module\BaseAmosModule;
use arter\amos\core\module\BaseAmosModule;
use yii\helpers\Html;
/** @var bool|false $disablePlatformLinks - if true all the links to dashboard, settings, etc are disabled */
......
<?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\layout\views\layouts\fullsize\parts
* @package arter\amos\layout\views\layouts\fullsize\parts
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\events\models\Event;
use arter\amos\events\models\Event;
$moduleCwh = Yii::$app->getModule('cwh');
$moduleCommunity = Yii::$app->getModule('community');
......@@ -21,19 +17,19 @@ $layoutModule = Yii::$app->getModule('layout');
$scope = null;
if (!empty($moduleCwh)) {
/** @var \elitedivision\amos\cwh\AmosCwh $moduleCwh */
/** @var \arter\amos\cwh\AmosCwh $moduleCwh */
$scope = $moduleCwh->getCwhScope();
}
if (!empty($scope)) {
if (isset($scope['community'])) {
$communityId = $scope['community'];
$community = \elitedivision\amos\community\models\Community::findOne($communityId);
$community = \arter\amos\community\models\Community::findOne($communityId);
}
}
$controller = Yii::$app->controller;
$isActionUpdate = ($controller->action->id == 'update');
$confirm = $isActionUpdate ? [
'confirm' => \elitedivision\amos\core\module\BaseAmosModule::t('amoscore', '#confirm_exit_without_saving')
'confirm' => \arter\amos\core\module\BaseAmosModule::t('amoscore', '#confirm_exit_without_saving')
] : null;
$model = null;
......@@ -45,7 +41,7 @@ if ($controller->hasProperty('model')) {
$model = $controller->model;
if ($model->hasProperty('community_id')) {
$communityId = $model->community_id;
$community = \elitedivision\amos\community\models\Community::findOne($communityId);
$community = \arter\amos\community\models\Community::findOne($communityId);
}
}
......@@ -60,7 +56,7 @@ if (isset($community)) {
//TODO check why without register this js the confirmation dialog on delete action (context menu widget) does not make any confirmation popup.
\yii\web\YiiAsset::register($this);
if ($community->context == \elitedivision\amos\community\models\Community::className()) {
if ($community->context == \arter\amos\community\models\Community::className()) {
$viewScope = 'community_network_scope';
echo $this->render($viewScope, $viewParams);
} else {
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\core\components\AmosView;
use elitedivision\amos\dashboard\models\AmosWidgets;
use arter\amos\core\components\AmosView;
use arter\amos\dashboard\models\AmosWidgets;
use yii\helpers\Url;
////\bedezign\yii2\audit\web\JSLoggingAsset::register($this);
......@@ -94,7 +90,7 @@ if ($countArrayUrl) {
<?= $this->render("parts" . DIRECTORY_SEPARATOR . "breadcrumb"); ?>
</div>
<?php if ($this instanceof \elitedivision\amos\core\components\AmosView): ?>
<?php if ($this instanceof \arter\amos\core\components\AmosView): ?>
<?php $this->beginViewContent() ?>
<?php endif; ?>
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\helpers\Html;
use yii\helpers\Url;
use elitedivision\amos\dashboard\models\AmosWidgets;
use arter\amos\dashboard\models\AmosWidgets;
////\bedezign\yii2\audit\web\JSLoggingAsset::register($this);
/* @var $this \yii\web\View */
......@@ -118,7 +114,7 @@ if ($countArrayUrl) {
}
}
echo \elitedivision\amos\core\toolbar\Nav::widget([
echo \arter\amos\core\toolbar\Nav::widget([
'items' => $items,
'encodeLabels' => false,
'options' => ['class' => 'nav nav-tabs'],
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
/* @var $this \yii\web\View */
......@@ -35,7 +31,7 @@
<div class="col-xs-12 dropdown-languages">
<?php
$headerMenu = new \elitedivision\amos\core\views\common\HeaderMenu();
$headerMenu = new \arter\amos\core\views\common\HeaderMenu();
$menuLang = $headerMenu->getListLanguages();
echo $menuLang;
?>
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\core\components\AmosView;
use arter\amos\core\components\AmosView;
use yii\helpers\Html;
use yii\helpers\Url;
////\bedezign\yii2\audit\web\JSLoggingAsset::register($this);
/** @var $this \elitedivision\amos\core\components\AmosView */
/** @var $this \arter\amos\core\components\AmosView */
/** @var $content string */
$urlCorrente = Url::current();
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\helpers\Html;
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\core\icons\AmosIcons;
use arter\amos\core\icons\AmosIcons;
use yii\helpers\Html;
use elitedivision\amos\core\widget\WidgetAbstract;
use arter\amos\core\widget\WidgetAbstract;
//Pickup assistance params
$assistance = isset(\Yii::$app->params['assistance']) ? \Yii::$app->params['assistance'] : [];
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\widgets\Breadcrumbs;
use elitedivision\amos\core\widget\WidgetAbstract;
use arter\amos\core\widget\WidgetAbstract;
/* $urlCorrente = yii\helpers\Url::current();
$posizioneEsclusione = strpos($urlCorrente, '?');
......@@ -27,8 +23,8 @@ use elitedivision\amos\core\widget\WidgetAbstract;
if (!empty($this->params['breadcrumbs'])):
if (!empty(\Yii::$app->params['dashboardEngine']) && \Yii::$app->params['dashboardEngine'] == WidgetAbstract::ENGINE_ROWS) {
$homeLink = \elitedivision\amos\core\icons\AmosIcons::show('dashboard', [],
\elitedivision\amos\core\icons\AmosIcons::DASH);
$homeLink = \arter\amos\core\icons\AmosIcons::show('dashboard', [],
\arter\amos\core\icons\AmosIcons::DASH);
} else {
$homeLink = \Yii::t('amoscore', 'Dashboard');
}
......
<?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\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\widgets\Breadcrumbs;
use elitedivision\amos\core\helpers\Html;
use arter\amos\core\helpers\Html;
$urlCorrente = yii\helpers\Url::current();
$posizioneEsclusione = strpos($urlCorrente, '?');
......
<?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\layout\views\layouts\parts
* @package arter\amos\layout\views\layouts\parts
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\core\controllers\CrudController;
use elitedivision\amos\core\forms\ContentSettingsMenuWidget;
use elitedivision\amos\core\forms\CreateNewButtonWidget;
use elitedivision\amos\core\helpers\Html;
use elitedivision\amos\core\icons\AmosIcons;
use elitedivision\amos\core\views\ChangeView;
use elitedivision\amos\core\views\grid\ActionColumn;
use elitedivision\amos\slideshow\models\Slideshow;
use elitedivision\amos\core\forms\editors\ExportMenu;
use arter\amos\core\controllers\CrudController;
use arter\amos\core\forms\ContentSettingsMenuWidget;
use arter\amos\core\forms\Create