Skip to content

Commit 47c4f6b

Browse files
LusanSmileLusanSmile
committedMay 22, 2020
- Create 2 constants an use in controller
- update phpdoc
1 parent bbfc11e commit 47c4f6b

17 files changed

+35
-27
lines changed
 

‎src/Controller/BaseController.php

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
*/
2929
abstract class BaseController
3030
{
31+
const PATH_TO_JS = '/public/js';
32+
const PATH_TO_CSS = '/public/css';
3133
/**
3234
* @param $pageData
3335
* @return string

‎src/Controller/Pages/AdministrationController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public static function get(&$pageData): string
9595
$pageData['hddSize'] = $diskTotal;
9696
$pageData['httpConnectionsCount'] = SystemHelper::getHttpConnectionsCount();
9797
$pageData['processCount'] = SystemHelper::getProcessCount();
98-
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/administration.css';
99-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/administration.js';
98+
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/administration.css';
99+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/administration.js';
100100

101101
return Render::getInstance()->get('/desktop/pages/administration.html.twig', $pageData);
102102
}

‎src/Controller/Pages/ConnectionController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public static function get(&$pageData): string
5555
if (count($coreUpdate) > 0) {
5656
$pageData['INSTALL_TYPE'] = $coreUpdate[0]->getSource();
5757
}
58-
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/connection.css';
58+
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/connection.css';
5959
$pageData[ControllerData::JS_END_POOL][] = '/vendor/node_modules/admin-lte/dist/js/adminlte.min.js';
60-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/connection.js';
60+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/connection.js';
6161

6262

6363
return Render::getInstance()->get('desktop/pages/connection.html.twig', $pageData);

‎src/Controller/Pages/DashBoardController.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static function get(&$pageData): string
8080
if (!empty($currentJeeObject)) {
8181
$currentJeeObjectId = $currentJeeObject->getId();
8282
} else {
83-
throw new CoreException(__('Aucun objet racine trouvé. Pour en créer un, allez dans dashboard -> <a href="/index.php?v=d&p=object">Liste objets et résumés</a>'));
83+
throw new CoreException(__('Aucun objet racine trouvé. Pour en créer un, allez dans dashboard -> <a href="/index.php?' . http_build_query(['v' => 'd', 'p' => 'object']). '">Liste objets et résumés</a>'));
8484
}
8585

8686
$pageData[ControllerData::JS_VARS]['SEL_OBJECT_ID'] = $currentJeeObjectId;
@@ -98,9 +98,9 @@ public static function get(&$pageData): string
9898
$pageData['dashboardObjectListMenu'] = self::getObjectsListMenu($currentJeeObjectId);
9999
$pageData['dashboardChildrenObjects'] = JeeObjectManager::buildTree($currentJeeObject);
100100

101-
$pageData[ControllerData::JS_POOL][] = '/public/js/libs/widget.js';
102-
$pageData[ControllerData::JS_POOL][] = '/public/js/desktop/pages/dashboard.js';
103-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/dashboard_events.js';
101+
$pageData[ControllerData::JS_POOL][] = self::PATH_TO_JS . '/libs/widget.js';
102+
$pageData[ControllerData::JS_POOL][] = self::PATH_TO_JS . '/desktop/pages/dashboard.js';
103+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/dashboard_events.js';
104104
// A remettre une fois mise sous forme de thème
105105
$pageData[ControllerData::JS_POOL][] = '/vendor/node_modules/isotope-layout/dist/isotope.pkgd.min.js';
106106
$pageData[ControllerData::JS_POOL][] = '/assets/3rdparty/jquery.multi-column-select/multi-column-select.js';

‎src/Controller/Pages/FirstUseController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public static function get(&$pageData): string
6868
'serverDatetime' => Utils::getMicrotime()
6969
];
7070

71-
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/firstUse.css';
72-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/tools/log.js';
73-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/firstUse.js';
71+
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/firstUse.css';
72+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/tools/log.js';
73+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/firstUse.js';
7474
$pageData[ControllerData::AJAX_TOKEN] = AjaxHelper::getToken();
7575

7676
return Render::getInstance()->get('desktop/pages/firstUse.html.twig', $pageData);

‎src/Controller/Pages/PlanController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public static function get(&$pageData): string
7878
$pageData[ControllerData::JS_VARS]['planHeader_id'] = $planHeader->getId();
7979
}
8080

81-
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/plan.css';
82-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/plan.js';
81+
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/plan.css';
82+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/plan.js';
8383

8484
return Render::getInstance()->get('/desktop/pages/plan.html.twig', $pageData);
8585
}

‎src/Controller/Pages/ViewController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ public static function get(&$pageData): string
8181
$pageData['viewHideList'] = false;
8282
}
8383
$pageData[ControllerData::JS_VARS][AjaxParams::VIEW_ID] = $currentView->getId();
84-
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/view.css';
85-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/libs/widget.js';
86-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/view.js';
84+
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/view.css';
85+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/libs/widget.js';
86+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/view.js';
8787

8888
return Render::getInstance()->get('/desktop/pages/view.html.twig', $pageData);
8989
}

‎src/Controller/Pages/ViewEditController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ class ViewEditController extends BaseController
4444
public static function get(&$pageData): string
4545
{
4646
$pageData['viewEditViewsList'] = ViewManager::all();
47-
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/view.css';
48-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/view_edit.js';
47+
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/view.css';
48+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/view_edit.js';
4949

5050
return Render::getInstance()->get('/desktop/pages/view_edit.html.twig', $pageData);
5151
}

‎src/Controller/Params/CommandeController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ class CommandeController extends BaseController
3939
*
4040
* @return string Content of commandes page
4141
*
42+
* @throws \Exception
4243
*/
4344
public static function get(&$pageData): string
4445
{
45-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/commandes.js';
46+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/commandes.js';
4647

4748
return Render::getInstance()->get('/desktop/params/commandes.html.twig', $pageData);
4849
}

‎src/Controller/Params/EqlogicController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ class EqlogicController extends BaseController
3636
*
3737
* @param array $pageData
3838
* @return string
39+
* @throws \Exception
3940
*/
4041
public static function get(&$pageData): string
4142
{
42-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/eqlogic.js';
43+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/eqlogic.js';
4344

4445
return Render::getInstance()->get('/desktop/params/eqlogic.html.twig', $pageData);
4546
}

‎src/Controller/Params/GeneralController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static function get(&$pageData): string
5151
$cache = CacheManager::byKey('hour');
5252
$pageData['adminLastKnowDate'] = $cache->getValue();
5353

54-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/general.js';
54+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/general.js';
5555

5656
return Render::getInstance()->get('/desktop/params/general.html.twig', $pageData);
5757
}

‎src/Controller/Params/InteractConfigController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ class InteractConfigController extends BaseController
3939
*
4040
* @return string Content of interaction config page
4141
*
42+
* @throws \Exception
4243
*/
4344
public static function get(&$pageData): string
4445
{
4546

46-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/interact_config.js';
47+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/interact_config.js';
4748

4849
return Render::getInstance()->get('/desktop/params/interact_config.html.twig', $pageData);
4950
}

‎src/Controller/Params/LinksController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ class LinksController extends BaseController
3939
*
4040
* @return string Content of links page
4141
*
42+
* @throws \Exception
4243
*/
4344
public static function get(&$pageData): string
4445
{
4546

46-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/links.js';
47+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/links.js';
4748

4849
return Render::getInstance()->get('/desktop/params/links.html.twig', $pageData);
4950
}

‎src/Controller/Params/LogConfigController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static function get(&$pageData): string
5858
$pluginData['plugin'] = $plugin;
5959
$pageData['adminPluginsList'][] = $pluginData;
6060
}
61-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/log_config.js';
61+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/log_config.js';
6262

6363
return Render::getInstance()->get('/desktop/params/log_config.html.twig', $pageData);
6464
}

‎src/Controller/Params/ProfilsController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public static function get(&$pageData): string
136136

137137
$pageData['adminCategories'] = NextDomHelper::getConfiguration('eqLogic:category');
138138

139-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/profils.js';
139+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/profils.js';
140140

141141
return Render::getInstance()->get('/desktop/params/profils.html.twig', $pageData);
142142
}

‎src/Controller/Params/ReportConfigController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ class ReportConfigController extends BaseController
3939
*
4040
* @return string Content of report config page
4141
*
42+
* @throws \Exception
4243
*/
4344
public static function get(&$pageData): string
4445
{
45-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/report_config.js';
46+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/report_config.js';
4647

4748
return Render::getInstance()->get('/desktop/params/report_config.html.twig', $pageData);
4849
}

‎src/Controller/Params/SummaryController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ class SummaryController extends BaseController
3838
*
3939
* @return string Content of summary page
4040
*
41+
* @throws \Exception
4142
*/
4243
public static function get(&$pageData): string
4344
{
44-
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/summary.js';
45+
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/summary.js';
4546

4647
return Render::getInstance()->get('/desktop/params/summary.html.twig', $pageData);
4748
}

0 commit comments

Comments
 (0)