diff --git a/public/index.php b/public/index.php index 8756a1f..39ede27 100644 --- a/public/index.php +++ b/public/index.php @@ -21,6 +21,7 @@ use Middlewares\Whoops; chdir(dirname(__DIR__)); require 'vendor/autoload.php'; + $chemin = $_SERVER['DOCUMENT_ROOT']; $chemin_new = substr($chemin,0,-6); diff --git a/public/js/utils.js b/public/js/utils.js index 3596a7f..530ddcf 100644 --- a/public/js/utils.js +++ b/public/js/utils.js @@ -8,4 +8,4 @@ function cleanArray(array) { out.push(j); } return out; -} \ No newline at end of file +} diff --git a/src/Admin/AdminModule.php b/src/Admin/AdminModule.php index 5e986ce..c045212 100644 --- a/src/Admin/AdminModule.php +++ b/src/Admin/AdminModule.php @@ -25,8 +25,6 @@ class AdminModule extends Module ) { $chemin = str_replace('Admin','Antenne',__DIR__); - //var_dump($chemin); - //die(); $renderer->addPath('antenne', $chemin . '/views'); $router->get('/dashboard/{user:[a-zA-Z\-0-9]+}', [LoggedInMiddleware::class, DashboardAction::class], 'dashboard'); $router->get('/dashboard/details/{user:[a-zA-Z\-0-9]+}', [LoggedInMiddleware::class, DashboardUserAction::class], 'dashboard.user'); @@ -34,7 +32,8 @@ class AdminModule extends Module $router->post('/activation', ActiveAction::class); $router->get('/profil-user', [LoggedInMiddleware::class, AccountUserEditAction::class], 'account.user'); $router->post('/profil-user', [LoggedInMiddleware::class, AccountUserEditAction::class]); - $router->get('/antenne/create', [LoggedInMiddleware::class, AntenneCrudAction::class], 'antenne.create'); + //$router->get('/antenne/new', [LoggedInMiddleware::class, AntenneCrudAction::class], 'antenne.create'); + $router->crud('/antenne', [LoggedInMiddleware::class, AntenneCrudAction::class],'antenne'); $router->get('/antenne/edit', [LoggedInMiddleware::class, AntenneEditAction::class], 'antenne.edit'); $router->post('/antenne/edit', [LoggedInMiddleware::class, AntenneEditAction::class]); if ($renderer instanceof TwigRenderer) { diff --git a/src/Admin/views/dashboard.twig b/src/Admin/views/dashboard.twig index 68f6124..cb7c882 100644 --- a/src/Admin/views/dashboard.twig +++ b/src/Admin/views/dashboard.twig @@ -7,14 +7,14 @@
"; - var_dump($container); - echo ""; - die();*/ if ($request->getMethod() === 'GET') { $params = $request->getQueryParams(); $gmarchePrefix = $this->container->get('gmarche.prefix'); diff --git a/src/Gmarche/Entity/Antenne.php b/src/Gmarche/Entity/Antenne.php index c6a1bbc..74417ab 100644 --- a/src/Gmarche/Entity/Antenne.php +++ b/src/Gmarche/Entity/Antenne.php @@ -20,6 +20,10 @@ class Antenne public $createdAt; public $regionId; + public $edito1; + public $edito2; + public $edito3; + public $edito4; public function setCreatedAt($datetime) { diff --git a/src/Gmarche/Table/AntenneTable.php b/src/Gmarche/Table/AntenneTable.php index 420e836..dac54f3 100644 --- a/src/Gmarche/Table/AntenneTable.php +++ b/src/Gmarche/Table/AntenneTable.php @@ -3,7 +3,6 @@ namespace App\Gmarche\Table; use App\Gmarche\Entity\Antenne; -use App\Auth\UserTable; use Framework\Database\Query; use Framework\Database\Table; @@ -22,6 +21,16 @@ class AntenneTable extends Table ->where("a.region_id = $region_id") ->order('a.name ASC'); } + + public function findAllRegions(): Query + { + //$region = new RegionTable($this->pdo); + $table = 'regions'; + return $this->makeQuery() + ->select('r.*') + ->order('r.name ASC'); + } + public function findAnyAntennes(string $tri, $antennes_select): Query { $region = new RegionTable($this->pdo); diff --git a/src/Product/Actions/RechIndexAction.php b/src/Product/Actions/RechIndexAction.php index 52b8fca..20556d1 100644 --- a/src/Product/Actions/RechIndexAction.php +++ b/src/Product/Actions/RechIndexAction.php @@ -53,6 +53,10 @@ class RechIndexAction $requete = $this->antenneTable->findBy('slug', $antenne_slug); $antenne_name = $requete->name; $antenne_id = $requete->id; + $edito1 = $requete->edito1; + $edito2 = $requete->edito2; + $edito3 = $requete->edito3; + $edito4 = $requete->edito4; $requete_region = $this->regionTable->findBy('slug', $region_slug); $region_name = $requete_region->name; $page = $params['p'] ?? 1; @@ -68,6 +72,8 @@ class RechIndexAction $user_id = ''; } $sess = $_SESSION; - return $this->renderer->render($viewPath.'/index', compact('sess','nom_user','user_id','antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' )); + return $this->renderer->render($viewPath.'/index', compact('sess','nom_user','user_id', + 'antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', + 'items', 'edito1', 'edito2','edito3','edito4' )); } } diff --git a/src/Product/views/admin/recherches/index.twig b/src/Product/views/admin/recherches/index.twig index aac4fd2..9e507f4 100644 --- a/src/Product/views/admin/recherches/index.twig +++ b/src/Product/views/admin/recherches/index.twig @@ -39,14 +39,11 @@
{{ edito2 }}
+ {{ edito3 }} +{{ edito4 }}
{% if affiche_username() != '' or (sess.connecte != '' and sess.connecte != '---') %}