From aaf36302ac8146b497f7c397c2529cea51f3db07 Mon Sep 17 00:00:00 2001
From: "laura.chevillet" <chevillet.laura@hotmail.fr>
Date: Mon, 19 Jan 2026 15:46:30 +0100
Subject: [PATCH] =?UTF-8?q?maj=20models,=20entit=C3=A9=20et=20page=20reche?=
 =?UTF-8?q?rche,=20d=C3=A9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/project_controller.php | 12 +++---
 app/models/category_model.php          |  8 ++--
 app/models/image_model.php             |  2 +-
 app/models/project_model.php           | 54 +++++++++++++++++++++++++-
 4 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/app/controllers/project_controller.php b/app/controllers/project_controller.php
index 497401b..3bb4a79 100644
--- a/app/controllers/project_controller.php
+++ b/app/controllers/project_controller.php
@@ -51,11 +51,10 @@
                 $strEndDate		= $_GET['enddate']??'';
                 $intCategory	= $_GET['category']??0;
             
-            // Récupération des Projects 
+            // Récupération des projetc 
             $objProjectModel    = new ProjectModel;
-
-            // Depuis PHP 8 - accès direct aux paramètres
-            $arrProject         = $objProjectModel->findAll();
+            $arrProject         = $objProjectModel->findAll(intAuthor:$intAuthor, intPeriod:$intPeriod, strDate:$strDate, 
+							        strKeywords:$strKeywords, strStartDate:$strStartDate, strEndDate:$strEndDate, intCategory:$intCategory);
         
             // Initialisation d'un tableau => objets
             $arrProjectToDisplay    = array(); 
@@ -63,10 +62,11 @@
             foreach($arrProject as $arrDetProject){
                 $objProject = new Project;
                 $objProject->hydrate($arrDetProject);
-                
                 $arrProjectToDisplay[]  = $objProject;
             }
-        
+
+            var_dump($arrProjectToDisplay);
+
             // Récupération des utilisateurs
             require_once("../app/models/user_model.php");
             $objUserModel   = new UserModel;
diff --git a/app/models/category_model.php b/app/models/category_model.php
index aa13516..4aa3e6c 100644
--- a/app/models/category_model.php
+++ b/app/models/category_model.php
@@ -1,10 +1,10 @@
 <?php
 	require_once('../config/database.php');
 	
-/**
- * Classe d'un objet Projet
- * @author Laura
- */
+	/**
+	* Traitement des requêtes pour les catégories
+	* @author : Laura
+	*/
 
 	class CategoryModel extends Connect{
 
diff --git a/app/models/image_model.php b/app/models/image_model.php
index 9515ecd..6c0ca45 100644
--- a/app/models/image_model.php
+++ b/app/models/image_model.php
@@ -2,7 +2,7 @@
 	require_once('../config/database.php');
 	
 /**
- * Classe d'un objet Projet
+ * Traitement de la requête pour les images
  * @author Laura
  */
 
diff --git a/app/models/project_model.php b/app/models/project_model.php
index 85742ae..f55917d 100644
--- a/app/models/project_model.php
+++ b/app/models/project_model.php
@@ -1,9 +1,16 @@
 <?php
 	require_once('../config/database.php');
+
+	/**
+	* Traitement des requêtes pour les projets
+	* @author : Laura
+	*/
 	
 	class ProjectModel extends Connect{
 		
-		public function findAll(int $intLimit=0):array{
+		public function findAll(int $intLimit=0, string $strKeywords='', int $intAuthor=0, 
+						 int $intPeriod=0, string $strDate='', string $strStartDate='', 
+						 string $strEndDate='', int $intCategory=0):array{
 			
 			// Ecrire la requête
 			$strRq	= "SELECT project.*, 
@@ -12,7 +19,52 @@
 						FROM project
 							INNER JOIN users ON user_id = project_user";
 			
+			$strWhere	= " WHERE ";
+			// Recherche par mot clé
+			if ($strKeywords != '') {
+				$strRq .= " WHERE (project_title LIKE '%".$strKeywords."%'
+								OR project_content LIKE '%".$strKeywords."%') ";
+
+				//$boolWhere	= true;
+				$strWhere	= " AND ";
+			}
 			
+			// Recherche par auteur
+			if ($intAuthor > 0){
+				$strRq .= $strWhere." project_creatorname = ".$intAuthor;
+				$strWhere	= " AND ";
+			}
+
+			// Recherche par catégorie
+			if ($intAuthor > 0){
+				$strRq .= $strWhere." project_category = ".$intCategory;
+				$strWhere	= " AND ";
+			}
+			
+			// Recherche par dates
+			if ($intPeriod == 0){
+				// Par date exacte
+				if ($strDate != ''){
+					$strRq .= $strWhere." project_creation_date = '".$strDate."'";
+				}
+			}else{
+				// Par période de dates
+				if ($strStartDate != '' && $strEndDate != ''){
+					$strRq .= $strWhere." project_creation_date BETWEEN '".$strStartDate."' AND '".$strEndDate."'";
+				}else{
+					if ($strStartDate != ''){
+						// A partir de
+						$strRq .= $strWhere." project_creation_date >= '".$strStartDate."'";
+					}else if ($strEndDate != ''){
+						// Avant le
+						$strRq .= $strWhere." project_creation_date <= '".$strEndDate."'";
+					}
+				}
+			}
+			
+			$strRq .= " ORDER BY project_creation_date DESC";
+
+
 			if ($intLimit > 0){
 				$strRq  .= " LIMIT ".$intLimit;
 			}