(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 17e807c818cd70eba7620fafc63ff7e218b35368..bf66bf3239b71a2f85d800f6a98c1a7c60cddc10 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -512,7 +512,7 @@ class commonCore extends cubeCore {
                         . 'LEFT JOIN books b ON t.theme_id=b.theme '\r
                         . 'GROUP BY t.theme_id');\r
 \r
-               $this->views->createView('demandes_vue', 'SELECT d.*, CONCAT(c.rs,\' (\',c.prenom,\' \',c.nom,\')\') AS utilisateur_nom, CONCAT(r.rs,\' (\',r.prenom,\' \',r.nom,\')\') AS revendeur_nom '\r
+               $this->views->createView('demandes_vue', 'SELECT d.*, CONCAT(c.rs,\' (\',c.prenom,\' \',c.nom,\')\') AS utilisateur_nom, CONCAT(r.rs,\' (\',r.prenom,\' \',r.nom,\')\') AS revendeur_nom, c.entreprise AS entreprise '\r
                         . 'FROM demandes d '\r
                         . 'LEFT JOIN utilisateurs_entreprise r ON d.revendeur=r.utilisateur_id '\r
                         . 'LEFT JOIN utilisateurs_entreprise c ON d.utilisateur=c.utilisateur_id');\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index ecb779e5f8f657c9d2bf134231c01ab558f763ec..94e99f19a176992437d3d187a33f7256ce61c3fc 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -286,7 +286,13 @@ class wsAjax extends cubeAjax {
                foreach($d as $k => $v) {\r
                        $_POST[$k] = trim($v);\r
                }\r
-               file_put_contents(ROOT . '/cache/demandeDevis.txt', print_r($_POST,true));\r
+               if(isset($_POST['pages'])){\r
+\r
+                       $_POST['nombre_pages']=$_POST['pages'];\r
+                       $_POST['nombre_liens']=$_POST['liens'];\r
+                       $_POST['nombre_langues']=$_POST['langues'];\r
+               }\r
+               file_put_contents(ROOT . '/cache/demandeDevis.txt', print_r($_POST, true));\r
                // Validation des champs de formulaires\r
                $ok = true;\r
                $non_vides = array('nombre_pages', 'nom', 'adresse', 'code_postal', 'ville', 'pays');\r
@@ -311,6 +317,41 @@ class wsAjax extends cubeAjax {
                }\r
                return $ok;\r
        }\r
+\r
+       public static function searchDemandes($args, &$x)\r
+       {\r
+               $x->addContent('listeDemandes', wsUrl::listeDemandes());\r
+       }\r
+\r
+       public static function sortDemandes($args, &$x)\r
+       {\r
+               commonAjax::sort('demandes', $args[1]);\r
+               $x->addContent('listeDemandes', wsUrl::listeDemandes());\r
+       }\r
+\r
+       public static function pageDemandes($args, &$x)\r
+       {\r
+               commonAjax::page('demandes', $args[1]);\r
+               $x->addContent('listeDemandes', wsUrl::listeDemandes());\r
+       }\r
+\r
+       public static function parPageDemandes($args, &$x)\r
+       {\r
+               commonAjax::parPage('demandes', $_POST['par_page']);\r
+               $x->addContent('listeDemandes', wsUrl::listeDemandes());\r
+       }\r
+\r
+       public static function filtreDemandes($args, &$x)\r
+       {\r
+               if (isset($args[1]) && $args[1] == 'efface') {\r
+                       commonAjax::filtre('demandes');\r
+                       $x->addReload();\r
+                       return;\r
+               } else {\r
+                       commonAjax::filtre('demandes', $_POST);\r
+                       $x->addContent('listeDemandes', wsUrl::listeDemandes());\r
+               }\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 841787c48411280dd4ddc34bf47d7801bd2a8df0..04db5a66971e7bbc205a250a8f18e5721691cc7a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -703,7 +703,7 @@ html{height:100%}' . "\n";
                return $res;\r
        }\r
 \r
-       public static function listeDemandes()\r
+       public static function listeDemandes($dashboard = null, $settings = null)\r
        {\r
                global $core;\r
                commonDroits::min(5);\r
@@ -718,28 +718,25 @@ html{height:100%}' . "\n";
 \r
                $res = '<table class="liste">';\r
                $res .= '<tr><th>' . commonUrl::orderby('#', 'demande_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . commonUrl::orderby(__('Demandeur'), 'utilisateur', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th class="min"></th><th class="min"></th></tr>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Date') , 'date', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Type') , 'type', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Prospect') . '/' . __('Client'), 'utilisateur_nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Confiée à'), 'revendeur_nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Statut'), 'status', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th></th><th></th></tr>';\r
                $i = 0;\r
-               foreach($liste as $id => $client) {\r
-                       if (!is_array($client->contacts)) {\r
-                               fb($client);\r
-                               continue;\r
-                       }\r
+               foreach($liste as $id => $demande) {\r
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '>';\r
-                       $res .= '<td>' . $client->entreprise_id . '</td>';\r
-                       $res .= '<td>' . $client->nom . '</td>';\r
-                       $contacts = array();\r
-\r
-                       foreach($client->contacts as $c) {\r
-                               $contacts[] = '<a href="#" class="popup" rel="formContact/' . $c->utilisateur_id . '">' . $c->prenom . ' ' . $c->nom . '</a>';\r
-                       }\r
-\r
-                       $res .= '<td id="contacts_' . $client->entreprise_id . '">' . implode(', ', $contacts) . '</td>';\r
-                       $res .= '<td class="nowrap">';\r
-                       $res .= '</td>';\r
-                       $res .= '<td class="action"><a href="#" class="popup" rel="formClient/' . $client->entreprise_id . '">' . cubeMedia::image(IMG . '/edit.png') . '</a></td>';\r
+                       $res .= '<td>' . $demande->demande_id . '</td>';\r
+                       $res .= '<td>' . date(__('d/m/Y H:i'), $demande->date) . '</td>';\r
+                       $res .= '<td>' . $core->demandes_type[$demande->type] . '</td>';\r
+                       $res .= '<td><a href="#" class="popup" rel="formClient/' . $demande->entreprise . '">' . $demande->utilisateur_nom . '</a></td>';\r
+                       $revendeur = $demande->revendeur == 0?__('Non défini'):$demande->revendeur_nom;\r
+                       $res .= '<td>' . $revendeur . '</td>';\r
+                       $res .= '<td>' . $core->demandes_status[$demande->status] . '</td>';\r
+                       $res .= '<td><a href="">Je me charge du devis</a></td>';\r
+                       $res .= '<td><a href="">Je confie devis</a></td>';\r
                        $res .= '</tr>';\r
                        $i++;\r
                }\r

diff --git a/inc/ws/DAO/class.ws.dao.demande.php b/inc/ws/DAO/class.ws.dao.demande.php
index b3eeb69765859182bc93c101b08e1f5d4b7487e7..b8ff05f00d40b3c02d3628b70fe22b6b30c362b4 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.demande.php
+++ b/inc/ws/DAO/class.ws.dao.demande.php
@@ -3,6 +3,7 @@ class wsDAODemande extends commonDAO {
        protected function singleton($r)\r
        {\r
                $demande = new wsDemande();\r
+               $demande->demande_id=$r->demande_id;\r
                $demande->type = $r->type;\r
                $demande->pages = $r->pages;\r
                $demande->liens = $r->liens;\r
@@ -15,6 +16,7 @@ class wsDAODemande extends commonDAO {
 \r
                $demande->utilisateur_nom = $r->utilisateur_nom;\r
                $demande->revendeur_nom = $r->revendeur_nom;\r
+               $demande->entreprise=$r->entreprise;\r
 \r
                return $demande;\r
        }\r
@@ -27,7 +29,7 @@ class wsDAODemande extends commonDAO {
 \r
        public function selectById($demande_id = null)\r
        {\r
-               $r = $this->con->select('SELECT * FROM demandes WHERE demande_id=\'' . $this->con->escape($demande_id) . '\' LIMIT 1');\r
+               $r = $this->con->select('SELECT * FROM demandes_vue WHERE demande_id=\'' . $this->con->escape($demande_id) . '\' LIMIT 1');\r
                return $this->singleton($r);\r
        }\r
 \r
@@ -37,15 +39,14 @@ class wsDAODemande extends commonDAO {
                if (!is_null($this->q)) {\r
                        $where = '';\r
                        $where .= 'demande_id=\'' . $this->con->escape($this->q) . '\' OR ';\r
-                       $where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';\r
-                       $daoClient = new commonDAOClient($this->con);\r
-                       $where .= ' OR client_id IN(' . $daoClient->querySearchByName($this->q) . ')';\r
+                       $where .= 'utilisateur_nom LIKE \'%' . $this->con->escape($this->q) . '%\' OR ';\r
+                       $where .= 'revendeur_nom LIKE \'%' . $this->con->escape($this->q) . '%\' OR ';\r
                        $limit = null;\r
                } else {\r
                        $where = $this->makeWhereFromFiltres();\r
                }\r
 \r
-               $orderby = is_null($orderby)?'devis_id':$orderby;\r
+               $orderby = is_null($orderby)?'demande_id':$orderby;\r
                $sens = is_null($sens)?'DESC':$sens;\r
                $limit = is_null($limit)?'':$this->con->limit($limit[0], $limit[1]);\r
 \r

diff --git a/inc/ws/Metier/class.ws.demande.php b/inc/ws/Metier/class.ws.demande.php
index 3a6311e93ff97d90dcf80fa2e48c2724537cec0e..73f17ed124f5d2c87f89c5e1c9cb7fb9a53bdde4 100644 (file)
--- a/inc/ws/Metier/class.ws.demande.php
+++ b/inc/ws/Metier/class.ws.demande.php
@@ -1,5 +1,6 @@
 <?php\r
 class wsDemande extends cubeMetier {\r
+       protected $demande_id;\r
        protected $type;\r
        protected $pages;\r
        protected $liens;\r
@@ -14,6 +15,7 @@ class wsDemande extends cubeMetier {
 \r
        protected $utilisateur_nom;\r
        protected $revendeur_nom;\r
+       protected $entreprise;\r
 }\r
 \r
 ?>
\ No newline at end of file