(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 6cb6d6e00b584f469611ed049ddaed88bb579bc2..37490f5d16518a6e40974f0e180d6871aa41e7e1 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -143,6 +143,8 @@ class commonCore extends cubeCore {
                $db->utilisateurs->index('index_utilisateurs_nom', 'BTREE', 'nom');\r
                $db->utilisateurs->index('index_utilisateurs_prenom', 'BTREE', 'prenom');\r
                $db->utilisateurs->index('index_utilisateurs_grade', 'BTREE', 'grade');\r
+               $db->utilisateurs->index('index_utilisateurs_login', 'BTREE', 'login');\r
+               $db->utilisateurs->index('index_utilisateurs_entreprise', 'BTREE', 'entreprise');\r
                // Table entreprises\r
                $db->entreprises->entreprise_id('integer', 0, false);\r
                $db->entreprises->nom('varchar', 64, false);\r
@@ -161,6 +163,8 @@ class commonCore extends cubeCore {
                // Clés\r
                $db->entreprises->primary('pk_entreprises', 'entreprise_id');\r
                $db->entreprises->index('index_entreprises_nom', 'BTREE', 'nom');\r
+               $db->entreprises->index('index_entreprises_ws_grade', 'BTREE', 'ws_grade');\r
+\r
                // .\r
                // Table projets\r
                $db->projets->projet_id('integer', 0, false);\r
@@ -177,6 +181,8 @@ class commonCore extends cubeCore {
                $db->projets->primary('pk_projets', 'projet_id');\r
                $db->projets->index('index_projets_status', 'BTREE', 'status');\r
                $db->projets->index('index_projets_nom', 'BTREE', 'nom');\r
+               $db->projets->index('index_projets_client', 'BTREE', 'client');\r
+               $db->projets->index('index_projets_chef', 'BTREE', 'chef');\r
                // .\r
                // Table taches\r
                $db->taches->tache_id('integer', 0, false);\r
@@ -190,6 +196,7 @@ class commonCore extends cubeCore {
                $db->taches->primary('pk_taches', 'tache_id');\r
                $db->taches->index('index_taches_nom', 'BTREE', 'nom');\r
                $db->taches->index('index_taches_categorie', 'BTREE', 'categorie');\r
+               $db->taches->index('index_taches_projet', 'BTREE', 'projet');\r
                // .\r
                // Table timereport\r
                $db->timereport->utilisateur_id('integer', 0, false);\r
@@ -199,6 +206,7 @@ class commonCore extends cubeCore {
                // Clés\r
                $db->timereport->primary('pk_timereport', 'utilisateur_id', 'tache_id', 'date');\r
                $db->timereport->index('index_timereport_date', 'BTREE', 'date');\r
+               $db->timereport->index('index_timereport_tache_id', 'BTREE', 'tache_id');\r
                // .\r
                // Table devis\r
                $db->devis->devis_id('integer', 0, false);\r
@@ -215,6 +223,8 @@ class commonCore extends cubeCore {
                $db->devis->primary('pk_devis', 'devis_id');\r
                $db->devis->index('index_devis_status', 'BTREE', 'status');\r
                $db->devis->index('index_devis_nom', 'BTREE', 'nom');\r
+               $db->devis->index('index_devis_client', 'BTREE', 'client');\r
+               $db->devis->index('index_devis_createur', 'BTREE', 'createur');\r
                // .\r
                // Table factures\r
                $db->factures->facture_id('varchar', 8, false);\r
@@ -234,6 +244,8 @@ class commonCore extends cubeCore {
                $db->factures->primary('pk_factures', 'facture_id');\r
                $db->factures->index('index_factures_status', 'BTREE', 'status');\r
                $db->factures->index('index_factures_nom', 'BTREE', 'nom');\r
+               $db->factures->index('index_factures_projet', 'BTREE', 'projet');\r
+               $db->factures->index('index_factures_createur', 'BTREE', 'createur');\r
                // .\r
                // Table dashboard\r
                $db->dashboard->dashboard_id('integer', 0, false);\r
@@ -246,6 +258,9 @@ class commonCore extends cubeCore {
                $db->dashboard->site('varchar', 32, false, '\'extranet\'');\r
                // Clés\r
                $db->dashboard->primary('pk_dashboard', 'dashboard_id');\r
+               $db->dashboard->index('index_dashboard_equipier','BTREE', 'equipier');\r
+               $db->dashboard->index('index_dashboard_sort','BTREE', 'sort');\r
+               $db->dashboard->index('index_dashboard_site','BTREE', 'site');\r
                // .\r
                // Table Signatures\r
                $db->signatures->signature_id('integer', 0, false);\r
@@ -266,6 +281,7 @@ class commonCore extends cubeCore {
                $db->icones->primary('pk_icones', 'icone_id');\r
                $db->icones->index('index_icones_nom', 'BTREE', 'nom');\r
                $db->icones->index('index_icones_date', 'BTREE', 'date');\r
+               $db->icones->index('index_icones_proprietaire', 'BTREE', 'proprietaire');\r
                // Table thèmes\r
                $db->themes->theme_id('integer', 0, false);\r
                $db->themes->icones('integer', 0, false);\r
@@ -277,6 +293,7 @@ class commonCore extends cubeCore {
                $db->themes->primary('pk_themes', 'theme_id');\r
                $db->themes->index('index_themes_nom', 'BTREE', 'nom');\r
                $db->themes->index('index_themes_date', 'BTREE', 'date');\r
+               $db->themes->index('index_themes_proprietaire', 'BTREE', 'proprietaire');\r
                // Table des langues\r
                $db->langues->lang_id('varchar', 20, false);\r
                $db->langues->font('varchar', 64, false);\r
@@ -304,6 +321,8 @@ class commonCore extends cubeCore {
                $db->documents->index('index_documents_file', 'BTREE', 'file');\r
                $db->documents->index('index_documents_date', 'BTREE', 'date');\r
                $db->documents->index('index_documents_localHash', 'BTREE', 'localHash');\r
+               $db->documents->index('index_documents_proprietaire', 'BTREE', 'proprietaire');\r
+               $db->documents->index('index_documents_version', 'BTREE', 'version');\r
                // .\r
                // Table pages des documents\r
                $db->document_links->document_id('integer', 0, false);\r
@@ -335,10 +354,14 @@ class commonCore extends cubeCore {
                $db->books->numerotation('text', 0, false);\r
                $db->books->changedate('integer', 0, false);\r
                $db->books->compiledate('integer', 0, false);\r
-               $db->books->syncv1('integer', 0, false, 0);\r
                // Clés\r
                $db->books->primary('pk_books', 'book_id');\r
                $db->books->index('index_books_nom', 'BTREE', 'nom');\r
+               $db->books->index('index_books_proprietaire', 'BTREE', 'proprietaire');\r
+               $db->books->index('index_books_tache', 'BTREE', 'tache');\r
+               $db->books->index('index_books_status', 'BTREE', 'status');\r
+               $db->books->index('index_books_theme', 'BTREE', 'theme');\r
+               $db->books->index('index_books_lang', 'BTREE', 'lang');\r
                // .\r
                // Table pages des publications\r
                $db->book_pages->book_id('integer', 0, false);\r

diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php
index 4ccba7a4e6efd698f760c245a5b9f874fc327dcf..0fa733555af77490d5dd82ca810748a16425c90e 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.devis.php
+++ b/inc/extranet/DAO/class.extranet.dao.devis.php
@@ -295,7 +295,13 @@ class extranetDAODevis extends commonDAO {
         */\r
        public function count()\r
        {\r
-               $r = $this->con->select('SELECT COUNT(*) AS nb FROM devis_vue WHERE ' . $this->makeWhereFromFiltres());\r
+               $filters=$this->makeWhereFromFiltres();\r
+               if($filters=='1=1'){\r
+                       $table='devis';\r
+               }else{\r
+                       $table='devis_vue';\r
+               }\r
+               $r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $filters);\r
                return $r->nb;\r
        }\r
 \r

diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php
index ef0ed334064f97274043199fba5624e378071fb9..433e7fd58f4f44f7b6fe445c9ea092afe37cd570 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.facture.php
+++ b/inc/extranet/DAO/class.extranet.dao.facture.php
@@ -346,7 +346,13 @@ class extranetDAOFacture extends commonDAO {
 \r
        public function count()\r
        {\r
-               $r = $this->con->select('SELECT COUNT(*) AS nb FROM factures_vue WHERE ' . $this->makeWhereFromFiltres());\r
+               $filters=$this->makeWhereFromFiltres();\r
+               if($filters=='1=1'){\r
+                       $table='factures';\r
+               }else{\r
+                       $table='factures_vue';\r
+               }\r
+               $r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $filters);\r
                return $r->nb;\r
        }\r
 \r

diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php
index 2ea19692a1b147ed634ec54e73eddba402a69b7c..499c9808511640ce974977e1743e8fd9d6ae292f 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.projet.php
+++ b/inc/extranet/DAO/class.extranet.dao.projet.php
@@ -297,7 +297,13 @@ class extranetDAOProjet extends commonDAO {
 \r
        public function count()\r
        {\r
-               $r = $this->con->select('SELECT COUNT(*) AS nb FROM projets_vue WHERE ' . $this->makeWhereFromFiltres());\r
+               $filters = $this->makeWhereFromFiltres();\r
+               if ($filters == '1=1') {\r
+                       $table = 'projets';\r
+               } else {\r
+                       $table = 'projets_vue';\r
+               }\r
+               $r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $filters);\r
                return $r->nb;\r
        }\r
 \r