diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0a9f463 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/Source/Config/vendor/ diff --git a/Source/.htaccess b/Source/.htaccess index 374a44e..db7c21f 100644 --- a/Source/.htaccess +++ b/Source/.htaccess @@ -1,17 +1,28 @@ RewriteEngine on +# Vérifier si le serveur est MAMP ou WAMP +RewriteCond %{DOCUMENT_ROOT} /Applications/MAMP/htdocs/ +RewriteRule .* - [E=APP_ROOT:/SAE4.01_FORMULAIRE/] -RewriteRule ^/$ index.php?page=goToForm [L] -RewriteRule ^goToForm$ index.php?page=goToForm [L] -RewriteRule ^submitForm$ index.php?page=submitForm [L] -RewriteRule ^addQuestion$ index.php?page=addQuestion [L] -RewriteRule ^addResponse$ index.php?page=addResponse [L] -RewriteRule ^continueResponse$ index.php?page=continueResponse [L] -RewriteRule ^createForm$ index.php?page=createForm [L] -RewriteRule ^addKeyword$ index.php?page=addKeyword [L] -RewriteRule "goToAdmin" index.php?page=goToAdmin [L] -RewriteRule ^goToAdminLogin$ index.php?page=goToAdminLogin [L] -RewriteRule ^login$ index.php?page=login [L] -RewriteRule ^goToCategories$ index.php?page=goToCategories [L] -RewriteRule ^goToQuestions$ index.php?page=goToQuestions [L] -RewriteRule ^goToResponses$ index.php?page=goToResponses [L] \ No newline at end of file +RewriteCond %{DOCUMENT_ROOT} / +RewriteRule .* - [E=APP_ROOT:] + +# Redirection des URLs +RewriteRule ^/$ %{ENV:APP_ROOT}index.php?page=goToForm [L] +RewriteRule ^goToForm$ %{ENV:APP_ROOT}index.php?page=goToForm [L] +RewriteRule ^submitForm$ %{ENV:APP_ROOT}index.php?page=submitForm [L] +RewriteRule ^addQuestion$ %{ENV:APP_ROOT}index.php?page=addQuestion [L] +RewriteRule ^addResponse$ %{ENV:APP_ROOT}index.php?page=addResponse [L] +RewriteRule ^continueResponse$ %{ENV:APP_ROOT}index.php?page=continueResponse [L] +RewriteRule ^createForm$ %{ENV:APP_ROOT}index.php?page=createForm [L] +RewriteRule ^addKeyword$ %{ENV:APP_ROOT}index.php?page=addKeyword [L] +RewriteRule "goToAdmin" %{ENV:APP_ROOT}index.php?page=goToAdmin [L] +RewriteRule ^goToAdminLogin$ %{ENV:APP_ROOT}index.php?page=goToAdminLogin [L] +RewriteRule ^login$ %{ENV:APP_ROOT}index.php?page=login [L] +RewriteRule ^goToCategories$ %{ENV:APP_ROOT}index.php?page=goToCategories [L] +RewriteRule ^goToQuestions$ %{ENV:APP_ROOT}index.php?page=goToQuestions [L] +RewriteRule ^goToResponses$ %{ENV:APP_ROOT}index.php?page=goToResponses [L] +RewriteRule ^deleteQuestion$ %{ENV:APP_ROOT}index.php?page=deleteQuestion [L] +RewriteRule ^deleteResponse$ %{ENV:APP_ROOT}index.php?page=deleteResponse [L] +RewriteRule ^deleteKeyword$ %{ENV:APP_ROOT}index.php?page=deleteKeyword [L] +RewriteRule ^deleteResponsesCandidate$ %{ENV:APP_ROOT}index.php?page=deleteResponsesCandidate [L] \ No newline at end of file diff --git a/Source/Config/config.php b/Source/Config/config.php index 2995d00..5d2e867 100644 --- a/Source/Config/config.php +++ b/Source/Config/config.php @@ -14,6 +14,7 @@ $views['categories'] = 'Views/HTML/categories.php'; $views['questions'] = 'Views/HTML/questions.php'; $views['responses'] = 'Views/HTML/responses.php'; $views['thanks'] = 'Views/HTML/thanks.php'; +$views['error'] = 'Views/HTML/error.php'; $_SERVER['BASE_URI'] = ''; @@ -26,9 +27,9 @@ $poppins = "https://fonts.googleapis.com/css2?family=Poppins:wght@300&display=sw $icon = "https://cdn.uca.fr/images/favicon/favicon.ico"; $logoUCA = "https://cdn.uca.fr/images/logos/logo_uca_mini_light.png"; -function connect() +function connect() //temoignage formulaire { - $dsn = "mysql:host=localhost;dbname=formulaire;charset=utf8"; + $dsn = "mysql:host=localhost;dbname=temoignage;charset=utf8"; $login = "root"; try { diff --git a/Source/Controller/ControllerAdmin.php b/Source/Controller/ControllerAdmin.php index 98e3aa5..5dd5f8d 100644 --- a/Source/Controller/ControllerAdmin.php +++ b/Source/Controller/ControllerAdmin.php @@ -31,6 +31,16 @@ class ControllerAdmin } } + /** + * Supprime une question par son id récupéré par le tableau $_POST ainsi que les possibles réponses associées + * + * @return void + */ + public function deleteQuestion(): void + { + (new ModelAdmin())->deleteQuestion(); + $this->goToQuestions(); + } /** * Ajoute une possibilité de réponse à une question, on assige également cette réponse @@ -49,6 +59,17 @@ class ControllerAdmin require_once($rep.$views['continue']); } + /** + * Permet de supprimer une possible réponse par son id récupéré par le tableau $_POST + * + * @return void + */ + public function deleteResponse(): void + { + (new ModelAdmin())->deleteResponse(); + $this->goToQuestions(); + } + /** * Permet de proposer à l'utiliser de continuer ou non à ajouter des possibilités de réponses à l'aide @@ -94,6 +115,16 @@ class ControllerAdmin $this->goToCategories(); } + /** + * Permet de supprimer un mot clef qui sera récupéré par le tableau $_POST + * + * @return void + */ + public function deleteKeyword(): void + { + (new ModelAdmin())->deleteKeyword(); + $this->goToCategories(); + } /** * Permet de naviguer jusqu'à la page de gestion des catégories @@ -120,7 +151,6 @@ class ControllerAdmin require_once($rep.$views['questions']); } - /** * Permet de naviguer jusqu'à la page de gestion des réponses * @@ -138,4 +168,10 @@ class ControllerAdmin global $rep, $views; require_once($rep.$views['admin']); } + + public function deleteResponsesCandidate(): void + { + (new ModelAdmin())->deleteResponsesCandidate(); + $this->goToResponses(); + } } diff --git a/Source/Controller/FrontController.php b/Source/Controller/FrontController.php index ebb37d0..3efe4bc 100644 --- a/Source/Controller/FrontController.php +++ b/Source/Controller/FrontController.php @@ -37,7 +37,9 @@ class FrontController { $_SESSION['role'] = 'Candidate'; } $role = Clean::simpleString($_SESSION['role']); + foreach($this->rights[$role] as $controllerName) { + if(strcmp($controllerName,$target[0])===0) { $controllerClass = '\Controller\\' . $target[0]; $controller = new $controllerClass(); @@ -46,12 +48,12 @@ class FrontController { } } if(!$exists) { - $error = $error['403']; + $error = '403'; require_once($rep . $views['error']); } } else { // no route was matched - $error = $error['404']; + $error = '404'; require_once($rep . $views['error']); } } @@ -72,5 +74,9 @@ class FrontController { $this->router->map('GET','/goToCategories',array($controller['Admin'],'goToCategories'),'goToCategories'); $this->router->map('GET','/goToQuestions',array($controller['Admin'],'goToQuestions'),'goToQuestions'); $this->router->map('GET','/goToResponses',array($controller['Admin'],'goToResponses'),'goToResponses'); + $this->router->map('POST','/deleteQuestion',array($controller['Admin'],'deleteQuestion'),'deleteQuestion'); + $this->router->map('POST','/deleteResponse',array($controller['Admin'],'deleteResponse'),'deleteResponse'); + $this->router->map('POST','/deleteKeyword',array($controller['Admin'],'deleteKeyword'),'deleteKeyword'); + $this->router->map('POST','/deleteResponsesCandidate',array($controller['Admin'],'deleteResponsesCandidate'),'deleteResponsesCandidate'); } } diff --git a/Source/Model/ModelAdmin.php b/Source/Model/ModelAdmin.php index 425c162..1c9cbd4 100644 --- a/Source/Model/ModelAdmin.php +++ b/Source/Model/ModelAdmin.php @@ -62,6 +62,28 @@ class ModelAdmin return -1; } + /** + * Permet de supprimer une question du formulaire + * + * @return void + * @throws Exception + */ + public function deleteQuestion():void + { + $idQuestion = $_POST["idQuestion"]; + $type = $_POST["type"]; + try { + $res = $this->client->request('DELETE', 'https://codefirst.iut.uca.fr/containers/Temoignages-deploy_api_form/deleteQuestion? + classQuestion='.$type.'& + id='.$idQuestion + ); + if ($res->getStatusCode()!=200){ + throw new Exception('DeleteQuestion failed'); + } + }catch (GuzzleException $g){ + throw new Exception($g->getMessage(),$g->getCode(),$g); + } + } /** * Permet d'ajouter une possibilité de réponse à une question en l'assignant à des catégories. @@ -88,6 +110,25 @@ class ModelAdmin } } + /** + * Permet de supprimer une possible réponse à une question + * + * @return void + * @throws Exception + */ + public function deleteResponse(): void + { + try { + $res = $this->client->request('DELETE', 'https://codefirst.iut.uca.fr/containers/Temoignages-deploy_api_form/deletePossibleResponse? + id='.$_POST["possibleResponse"] + ); + if ($res->getStatusCode()!=200){ + throw new Exception('DeletePossibleResponse failed'); + } + }catch (GuzzleException $g){ + throw new Exception($g->getMessage(),$g->getCode(),$g); + } + } /** * Permet de créer un nouveau formulaire en précisant son titre et sa description. @@ -131,6 +172,25 @@ class ModelAdmin } } + /** + * Permet de supprimer une catégorie (mot-clef) + * + * @return void + * @throws Exception + */ + public function deleteKeyword(): void + { + try { + $res = $this->client->request('DELETE', 'https://codefirst.iut.uca.fr/containers/Temoignages-deploy_api_form/deleteKeyword? + keyword='.$_POST["idCateg"] + ); + if ($res->getStatusCode()!=200){ + throw new Exception('DeleteKeyword failed'); + } + }catch (GuzzleException $g){ + throw new Exception($g->getMessage(),$g->getCode(),$g); + } + } /** * Permet de récupérer toutes les catégories existantes. @@ -205,4 +265,24 @@ class ModelAdmin throw new Exception($g->getMessage(),$g->getCode(),$g); } } + + /** + * Permet de supprimer les réponses d'une personne d'un formulaire + * + * @return void + * @throws Exception + */ + public function deleteResponsesCandidate(): void + { + try { + $res = $this->client->request('DELETE', 'https://codefirst.iut.uca.fr/containers/Temoignages-deploy_api_form/deleteListResponseOfCandidate? + id='.$_POST["idResponseCandidate"] + ); + if ($res->getStatusCode()!=200){ + throw new Exception('DeleteListResponseOfCandidate failed'); + } + }catch (GuzzleException $g){ + throw new Exception($g->getMessage(),$g->getCode(),$g); + } + } } diff --git a/Source/Model/ModelCandidate.php b/Source/Model/ModelCandidate.php index a768c55..ac91bde 100644 --- a/Source/Model/ModelCandidate.php +++ b/Source/Model/ModelCandidate.php @@ -109,7 +109,7 @@ class ModelCandidate $html = "
-
+

$title

"; diff --git a/Source/Views/HTML/admin.php b/Source/Views/HTML/admin.php index 5acd0eb..e1e6918 100644 --- a/Source/Views/HTML/admin.php +++ b/Source/Views/HTML/admin.php @@ -51,7 +51,7 @@
- +

Ajout d'une question

diff --git a/Source/Views/HTML/categories.php b/Source/Views/HTML/categories.php index ac4b254..cc398b5 100644 --- a/Source/Views/HTML/categories.php +++ b/Source/Views/HTML/categories.php @@ -29,18 +29,26 @@

Les catégories :

- +
    -
    • +
    +
  • '; + echo $category; + echo ' '; + echo ' '; + echo ' '; + echo '
    • '; + } + ?> +
diff --git a/Source/Views/HTML/continue.php b/Source/Views/HTML/continue.php index cae34b6..2b8a00d 100644 --- a/Source/Views/HTML/continue.php +++ b/Source/Views/HTML/continue.php @@ -51,7 +51,7 @@

Continuer d'ajouter des possibilités de réponses ?

-
+ diff --git a/Source/Views/HTML/form.php b/Source/Views/HTML/form.php index 0e77f4f..b5a7670 100644 --- a/Source/Views/HTML/form.php +++ b/Source/Views/HTML/form.php @@ -28,7 +28,7 @@
- +