(no commit message)

diff --git a/inc/commons/Metier/class.common.utilisateur.php b/inc/commons/Metier/class.common.utilisateur.php
index 793ade3a6b44081a81f574b3d10e31a4ed5b0a69..af7ba03bfc6c25c7820612cd4a628d29fe2f4366 100644 (file)
--- a/inc/commons/Metier/class.common.utilisateur.php
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -41,7 +41,7 @@ class commonUtilisateur extends cubeMetier {
 \r
        public function getSettings($liste)\r
        {\r
-               $cles = array('clients' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id', 'demandes' => 'demande_id');\r
+               $cles = array('clients' => 'entreprise_id', 'clients_ws' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id', 'demandes' => 'demande_id');\r
                if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {\r
                        $this->settings['search'][$liste] = array();\r
                }\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index b839ae9f2d5de86c167434a7f1019d76d39875cc..172c7fb1aaa82a4483abd13e9e6b5808dd3e997a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -99,30 +99,30 @@ class wsAjax extends cubeAjax {
 \r
        public static function sortClient($args, &$x)\r
        {\r
-               commonAjax::sort('clients', $args[1]);\r
+               commonAjax::sort('clients_ws', $args[1]);\r
                $x->addContent('listeClients', wsUrl::listeClients());\r
        }\r
 \r
        public static function pageClient($args, &$x)\r
        {\r
-               commonAjax::page('clients', $args[1]);\r
+               commonAjax::page('clients_ws', $args[1]);\r
                $x->addContent('listeClients', wsUrl::listeClients());\r
        }\r
 \r
        public static function parPageClient($args, &$x)\r
        {\r
-               commonAjax::parPage('clients', $_POST['par_page']);\r
+               commonAjax::parPage('clients_ws', $_POST['par_page']);\r
                $x->addContent('listeClients', wsUrl::listeClients());\r
        }\r
 \r
        public static function filtreClients($args, &$x)\r
        {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
-                       commonAjax::filtre('clients');\r
+                       commonAjax::filtre('clients_ws');\r
                        $x->addReload();\r
                        return;\r
                } else {\r
-                       commonAjax::filtre('clients', $_POST);\r
+                       commonAjax::filtre('clients_ws', $_POST);\r
                        $x->addContent('listeClients', wsUrl::listeClients());\r
                }\r
        }\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 114f3351b3de5c7b767cc47b8f41265565da9a36..f61a4f1596789c58c0bb4c3451a9906e4291133a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -676,7 +676,7 @@ html{height:100%}' . "\n";
                cubePage::autoComplete();\r
                cubePage::emptyfield();\r
                commonDroits::min(3);\r
-               $settings = $core->user->getSettings('clients');\r
+               $settings = $core->user->getSettings('clients_ws');\r
 \r
                $shortcuts = array();\r
                $shortcuts[] = '<a href="#" class="popup" rel="formClient/new">' . $core->typo->Ajouter('Créer un nouveau client') . '</a>';\r
@@ -702,7 +702,7 @@ html{height:100%}' . "\n";
        {\r
                global $core;\r
                commonDroits::min(3);\r
-               $settings = is_null($settings)?$core->user->getSettings('clients'):$settings;\r
+               $settings = is_null($settings)?$core->user->getSettings('clients_ws'):$settings;\r
                $change = is_null($dashboard)?'Client':'Dashboard/' . $dashboard;\r
                $dao = new commonDAOEntreprise($core->con);\r
                if (isset($settings['search']) && !is_null($settings['search'])) {\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index d9dd18f8f6213c7aa0357d2ea3de75a4b635ff31..2284f7e096539a09d315d45d44e08014e28b8648 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -31,7 +31,7 @@ class wsDAODocument extends commonDAO {
 \r
                for($page = 1;$page <= $document->generalInfos['pages'];$page++) {\r
                        $csv = WS_DOCS . '/' . $document->document_id . '/p' . $page . '.csv';\r
-                       if(!file_exists($csv)){\r
+                       if (!file_exists($csv)) {\r
                                continue;\r
                        }\r
                        $c->update = filemtime($csv);\r
@@ -155,18 +155,29 @@ class wsDAODocument extends commonDAO {
                                continue;\r
                        }\r
 \r
+                       $left = floatval((string)$l->startX);\r
+                       $right = floatval((string)$l->endX);\r
+                       $top = floatval((string)$l->startY);\r
+                       $bottom = floatval((string)$l->endY);\r
+\r
+                       $lwidth = abs($right - $left);\r
+                       $lheight = abs($bottom - $top);\r
+\r
+                       $left = min($left, $right);\r
+                       $top = min($top, $bottom);\r
+\r
                        $link = array();\r
                        $link['page'] = (string)$l->page;\r
                        $link['numerotation'] = false;\r
-                       $link['left'] = intval((string)$l->startX);\r
-                       $link['width'] = intval((string)$l->endX) - $link['left'];\r
+                       $link['left'] = $left;\r
+                       $link['width'] = $lwidth;\r
                        if ($link['left'] > $width) {\r
                                $link['page']++;\r
                                $link['left'] -= $width;\r
                        }\r
                        $page = $link['page'];\r
-                       $link['top'] = intval((string)$l->startY);\r
-                       $link['height'] = intval((string)$l->endY) - $link['top'];\r
+                       $link['top'] = $top;\r
+                       $link['height'] = $lheight;\r
                        $link['infobulle'] = '';\r
                        $link['target'] = '_blank';\r
                        $link['to'] = (string)$l->linkTo;\r