From: vincent@cubedesigners.com Date: Fri, 21 Jan 2011 14:40:06 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=66bcdd7b38725d72f85ee5d79b498a670463a764;p=cubeextranet.git --- diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php index 17e807c81..bf66bf323 100644 --- 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 ' . 'GROUP BY t.theme_id'); - $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 ' + $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 ' . 'FROM demandes d ' . 'LEFT JOIN utilisateurs_entreprise r ON d.revendeur=r.utilisateur_id ' . 'LEFT JOIN utilisateurs_entreprise c ON d.utilisateur=c.utilisateur_id'); diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php index ecb779e5f..94e99f19a 100644 --- 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) { $_POST[$k] = trim($v); } - file_put_contents(ROOT . '/cache/demandeDevis.txt', print_r($_POST,true)); + if(isset($_POST['pages'])){ + + $_POST['nombre_pages']=$_POST['pages']; + $_POST['nombre_liens']=$_POST['liens']; + $_POST['nombre_langues']=$_POST['langues']; + } + file_put_contents(ROOT . '/cache/demandeDevis.txt', print_r($_POST, true)); // Validation des champs de formulaires $ok = true; $non_vides = array('nombre_pages', 'nom', 'adresse', 'code_postal', 'ville', 'pays'); @@ -311,6 +317,41 @@ class wsAjax extends cubeAjax { } return $ok; } + + public static function searchDemandes($args, &$x) + { + $x->addContent('listeDemandes', wsUrl::listeDemandes()); + } + + public static function sortDemandes($args, &$x) + { + commonAjax::sort('demandes', $args[1]); + $x->addContent('listeDemandes', wsUrl::listeDemandes()); + } + + public static function pageDemandes($args, &$x) + { + commonAjax::page('demandes', $args[1]); + $x->addContent('listeDemandes', wsUrl::listeDemandes()); + } + + public static function parPageDemandes($args, &$x) + { + commonAjax::parPage('demandes', $_POST['par_page']); + $x->addContent('listeDemandes', wsUrl::listeDemandes()); + } + + public static function filtreDemandes($args, &$x) + { + if (isset($args[1]) && $args[1] == 'efface') { + commonAjax::filtre('demandes'); + $x->addReload(); + return; + } else { + commonAjax::filtre('demandes', $_POST); + $x->addContent('listeDemandes', wsUrl::listeDemandes()); + } + } } ?> \ 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 841787c48..04db5a669 100644 --- 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; } - public static function listeDemandes() + public static function listeDemandes($dashboard = null, $settings = null) { global $core; commonDroits::min(5); @@ -718,28 +718,25 @@ html{height:100%}' . "\n"; $res = ''; $res .= ''; - $res .= ''; - $res .= ''; + $res .= ''; + $res .= ''; + $res .= ''; + $res .= ''; + $res .= ''; + $res .= ''; $i = 0; - foreach($liste as $id => $client) { - if (!is_array($client->contacts)) { - fb($client); - continue; - } + foreach($liste as $id => $demande) { $odd = cubeMath::isOdd($i)?' class="odd"':''; $res .= ''; - $res .= ''; - $res .= ''; - $contacts = array(); - - foreach($client->contacts as $c) { - $contacts[] = '' . $c->prenom . ' ' . $c->nom . ''; - } - - $res .= ''; - $res .= ''; - $res .= ''; + $res .= ''; + $res .= ''; + $res .= ''; + $res .= ''; + $revendeur = $demande->revendeur == 0?__('Non défini'):$demande->revendeur_nom; + $res .= ''; + $res .= ''; + $res .= ''; + $res .= ''; $res .= ''; $i++; } diff --git a/inc/ws/DAO/class.ws.dao.demande.php b/inc/ws/DAO/class.ws.dao.demande.php index b3eeb6976..b8ff05f00 100644 --- 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) { $demande = new wsDemande(); + $demande->demande_id=$r->demande_id; $demande->type = $r->type; $demande->pages = $r->pages; $demande->liens = $r->liens; @@ -15,6 +16,7 @@ class wsDAODemande extends commonDAO { $demande->utilisateur_nom = $r->utilisateur_nom; $demande->revendeur_nom = $r->revendeur_nom; + $demande->entreprise=$r->entreprise; return $demande; } @@ -27,7 +29,7 @@ class wsDAODemande extends commonDAO { public function selectById($demande_id = null) { - $r = $this->con->select('SELECT * FROM demandes WHERE demande_id=\'' . $this->con->escape($demande_id) . '\' LIMIT 1'); + $r = $this->con->select('SELECT * FROM demandes_vue WHERE demande_id=\'' . $this->con->escape($demande_id) . '\' LIMIT 1'); return $this->singleton($r); } @@ -37,15 +39,14 @@ class wsDAODemande extends commonDAO { if (!is_null($this->q)) { $where = ''; $where .= 'demande_id=\'' . $this->con->escape($this->q) . '\' OR '; - $where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\''; - $daoClient = new commonDAOClient($this->con); - $where .= ' OR client_id IN(' . $daoClient->querySearchByName($this->q) . ')'; + $where .= 'utilisateur_nom LIKE \'%' . $this->con->escape($this->q) . '%\' OR '; + $where .= 'revendeur_nom LIKE \'%' . $this->con->escape($this->q) . '%\' OR '; $limit = null; } else { $where = $this->makeWhereFromFiltres(); } - $orderby = is_null($orderby)?'devis_id':$orderby; + $orderby = is_null($orderby)?'demande_id':$orderby; $sens = is_null($sens)?'DESC':$sens; $limit = is_null($limit)?'':$this->con->limit($limit[0], $limit[1]); diff --git a/inc/ws/Metier/class.ws.demande.php b/inc/ws/Metier/class.ws.demande.php index 3a6311e93..73f17ed12 100644 --- a/inc/ws/Metier/class.ws.demande.php +++ b/inc/ws/Metier/class.ws.demande.php @@ -1,5 +1,6 @@ \ No newline at end of file
' . commonUrl::orderby('#', 'demande_id', $settings, 'sort' . $change) . '' . commonUrl::orderby(__('Demandeur'), 'utilisateur', $settings, 'sort' . $change) . '
' . commonUrl::orderby(__('Date') , 'date', $settings, 'sort' . $change) . '' . commonUrl::orderby(__('Type') , 'type', $settings, 'sort' . $change) . '' . commonUrl::orderby(__('Prospect') . '/' . __('Client'), 'utilisateur_nom', $settings, 'sort' . $change) . '' . commonUrl::orderby(__('Confiée à'), 'revendeur_nom', $settings, 'sort' . $change) . '' . commonUrl::orderby(__('Statut'), 'status', $settings, 'sort' . $change) . '
' . $client->entreprise_id . '' . $client->nom . '' . implode(', ', $contacts) . ''; - $res .= '' . cubeMedia::image(IMG . '/edit.png') . '' . $demande->demande_id . '' . date(__('d/m/Y H:i'), $demande->date) . '' . $core->demandes_type[$demande->type] . '' . $demande->utilisateur_nom . '' . $revendeur . '' . $core->demandes_status[$demande->status] . 'Je me charge du devisJe confie devis