From 885ed6f95bfa5595e4442f86a6070e1555ed9dc2 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 17 Jan 2011 12:35:55 +0000 Subject: [PATCH] --- inc/commons/class.common.core.php | 1 + inc/commons/class.common.url.php | 129 ++++++++++++++++++ .../Controlleur/class.extranet.url.php | 129 ------------------ 3 files changed, 130 insertions(+), 129 deletions(-) diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php index e223dc79a..0628abf93 100644 --- a/inc/commons/class.common.core.php +++ b/inc/commons/class.common.core.php @@ -256,6 +256,7 @@ class commonCore extends cubeCore { $db->dashboard->equipier('integer', 0, false); $db->dashboard->state('integer', 1, false, '1'); $db->dashboard->sort('integer', 0, false); + $db->dashboard->site('varchar', 32, false, '\'extranet\''); // Clés $db->dashboard->primary('pk_dashboard', 'dashboard_id'); $db->dashboard->reference('fk_dashboard_equipier', 'equipier', 'utilisateurs', 'utilisateur_id'); diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php index fcef32988..ebcb90454 100644 --- a/inc/commons/class.common.url.php +++ b/inc/commons/class.common.url.php @@ -156,6 +156,135 @@ class commonUrl { $res .= ''; return $res; } + + public static function autocomplete($args) + { + global $core; + + if (isset($_GET['q'])) { + $args[2] = $_GET['q']; + } + $q = mb_strtolower(cubeText::removeAccents($args[2])); + $suggestions = array(); + if ($args[1] == 'client') { + $dao = new commonDAOClient($core->con); + $dao->setSearch($q, true); + $clients = $dao->getListe(); + foreach($clients as $client) { + $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'; + } + } elseif ($args[1] == 'projet') { + $dao = new extranetDAOProjet($core->con); + $dao->setSearch($q, true); + $projets = $dao->getListe(); + foreach($projets as $projet) { + $suggestions[] = $projet->projet_id . ' - ' . $projet->nom . ' (' . $projet->client . ')'; + } + } elseif ($args[1] == 'book') { + $dao = new wsDAOBook($core->con); + $dao->setSearch($q, true); + $books = $dao->getListe('date', 'DESC', 15); + foreach($books as $book) { + $suggestions[] = $book->book_id . ' - ' . $book->nom; + } + } elseif ($args[1] == 'wsuser') { + $dao = new commonDAOClient($core->con); + $dao->setSearch($q, true); + $clients = $dao->getListe(); + foreach($clients as $client) { + $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'; + } + } elseif ($args[1] == 'wsadmin') { + $dao = new commonDAOUtilisateur($core->con); + $dao->setSearch($q, true); + $clients = $dao->getListe('utilisateur_id', 'ASC', null, null, 'AND ws_grade>=2'); + foreach($clients as $client) { + $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'; + } + } + cubeSearch::searchSuggestion($args[2], $suggestions); + exit; + } + + public static function dashboard($args) + { + cubePage::ui('Sortable'); + $res = commonPage::barre(); + $res .= commonPage::tMain('dash'); + $res .= commonUrl::listeDashboard($args); + $res .= commonPage::bMain(); + return $res; + } + + public static function listeDashboard($args) + { + global $core; + $r = $core->con->select('SELECT * FROM dashboard WHERE equipier=\'' . $core->user->utilisateur_id . '\' AND site=\'' . MODE . '\' ORDER BY sort'); + $res = ''; + while ($r->fetch()) { + $res .= '
'; + $res .= commonUrl::displayDashboard($r); + $res .= '
'; + } + return $res; + } + + public static function displayDashboard($r) + { + global $core; + $res = '
' . $core->typo->OngletBlanc($r->nom); + + $close = ($r->state == '0')?' close':''; + $hide = ($r->state == '0')?' class="close"':''; + + $res .= '' . cubeMedia::spacer(18, 10) . ''; + $res .= '' . cubeMedia::image(IMG . '/edit.png') . ''; + $res .= '' . cubeMedia::image(IMG . '/delete.png') . ''; + $res .= '
'; + $res .= commonPage::bh(); + $res .= ''; + + if ($r->rubrique == 'projets') { + $res .= extranetUrl::listeProjets($r->dashboard_id, self::getDashboardSettings($r->settings)); + } elseif ($r->rubrique == 'factures') { + $res .= extranetUrl::listeFactures($r->dashboard_id, self::getDashboardSettings($r->settings)); + } elseif ($r->rubrique == 'devis') { + $res .= extranetUrl::listeDevis($r->dashboard_id, self::getDashboardSettings($r->settings)); + } elseif ($r->rubrique == 'clients' && MODE=='extranet') { + $res .= extranetUrl::listeClients($r->dashboard_id, self::getDashboardSettings($r->settings)); + } elseif ($r->rubrique == 'timereport') { + $res .= extranetUrl::listeTimereport($r->dashboard_id, self::getDashboardSettings($r->settings)); + } + $res .= ''; + $res .= commonPage::bf(); + + return $res; + } + + public static function getDashboardSettings($s) + { + $s = unserialize($s); + if (isset($s['filtres']['annee'])) { + $s['filtres']['annee'] = range(2006, date('Y'), 1); + } + return $s; + } + + public static function formDashboard($args) + { + global $core; + $rub = $args[1]; + $dashboard_id = isset($args[2])?$args[2]:'new'; + + if ($dashboard_id == 'new') { + $res = 'Titre de la liste' . form::field('nom', 20, 128, false) . form::hidden('rubrique', $rub) . form::hidden('dashboard_id', $dashboard_id) . ''; + } else { + $r = $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard_id) . '\''); + $res = 'Titre de la liste' . form::field('nom', 20, 128, $r->nom) . form::hidden('dashboard_id', $dashboard_id) . ''; + } + + return $res; + } } ?> \ No newline at end of file diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php index 8d89e6c15..9cf503f84 100644 --- a/inc/extranet/Controlleur/class.extranet.url.php +++ b/inc/extranet/Controlleur/class.extranet.url.php @@ -1547,135 +1547,6 @@ class extranetUrl { return $res; } - public static function dashboard($args) - { - extranetDroits::min(1); - cubePage::ui('Sortable'); - $res = commonPage::barre(); - $res .= commonPage::tMain('dash'); - $res .= self::listeDashboard($args); - $res .= commonPage::bMain(); - return $res; - } - - public static function listeDashboard($args) - { - global $core; - $r = $core->con->select('SELECT * FROM dashboard WHERE equipier=\'' . $core->user->utilisateur_id . '\' ORDER BY sort'); - $res = ''; - while ($r->fetch()) { - $res .= '
'; - $res .= self::displayDashboard($r); - $res .= '
'; - } - return $res; - } - - public static function displayDashboard($r) - { - global $core; - $res = '
' . $core->typo->OngletBlanc($r->nom); - - $close = ($r->state == '0')?' close':''; - $hide = ($r->state == '0')?' class="close"':''; - - $res .= '' . cubeMedia::spacer(18, 10) . ''; - $res .= '' . cubeMedia::image(IMG . '/edit.png') . ''; - $res .= '' . cubeMedia::image(IMG . '/delete.png') . ''; - $res .= '
'; - $res .= commonPage::bh(); - $res .= ''; - if ($r->rubrique == 'projets') { - $res .= self::listeProjets($r->dashboard_id, self::getDashboardSettings($r->settings)); - } elseif ($r->rubrique == 'factures') { - $res .= self::listeFactures($r->dashboard_id, self::getDashboardSettings($r->settings)); - } elseif ($r->rubrique == 'devis') { - $res .= self::listeDevis($r->dashboard_id, self::getDashboardSettings($r->settings)); - } elseif ($r->rubrique == 'clients') { - $res .= self::listeClients($r->dashboard_id, self::getDashboardSettings($r->settings)); - } elseif ($r->rubrique == 'timereport') { - $res .= self::listeTimereport($r->dashboard_id, self::getDashboardSettings($r->settings)); - } - $res .= ''; - $res .= commonPage::bf(); - - return $res; - } - - public static function getDashboardSettings($s) - { - $s = unserialize($s); - if (isset($s['filtres']['annee'])) { - $s['filtres']['annee'] = range(2006, date('Y'), 1); - } - return $s; - } - - public static function formDashboard($args) - { - global $core; - $rub = $args[1]; - $dashboard_id = isset($args[2])?$args[2]:'new'; - - if ($dashboard_id == 'new') { - $res = 'Titre de la liste' . form::field('nom', 20, 128, false) . form::hidden('rubrique', $rub) . form::hidden('dashboard_id', $dashboard_id) . ''; - } else { - $r = $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard_id) . '\''); - $res = 'Titre de la liste' . form::field('nom', 20, 128, $r->nom) . form::hidden('dashboard_id', $dashboard_id) . ''; - } - - return $res; - } - - public static function autocomplete($args) - { - global $core; - - if (isset($_GET['q'])) { - $args[2] = $_GET['q']; - } - $q = mb_strtolower(cubeText::removeAccents($args[2])); - $suggestions = array(); - if ($args[1] == 'client') { - $dao = new commonDAOClient($core->con); - $dao->setSearch($q, true); - $clients = $dao->getListe(); - foreach($clients as $client) { - $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'; - } - } elseif ($args[1] == 'projet') { - $dao = new extranetDAOProjet($core->con); - $dao->setSearch($q, true); - $projets = $dao->getListe(); - foreach($projets as $projet) { - $suggestions[] = $projet->projet_id . ' - ' . $projet->nom . ' (' . $projet->client . ')'; - } - } elseif ($args[1] == 'book') { - $dao = new wsDAOBook($core->con); - $dao->setSearch($q, true); - $books = $dao->getListe('date', 'DESC', 15); - foreach($books as $book) { - $suggestions[] = $book->book_id . ' - ' . $book->nom; - } - } elseif ($args[1] == 'wsuser') { - $dao = new commonDAOClient($core->con); - $dao->setSearch($q, true); - $clients = $dao->getListe(); - foreach($clients as $client) { - $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'; - } - } elseif ($args[1] == 'wsadmin') { - $dao = new commonDAOUtilisateur($core->con); - $dao->setSearch($q, true); - $clients = $dao->getListe('utilisateur_id', 'ASC', null, null, 'AND ws_grade>=2'); - foreach($clients as $client) { - $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'; - } - } - cubeSearch::searchSuggestion($args[2], $suggestions); - exit; - } - public static function traduction($args) { global $core; -- 2.39.5