From 13867bcb998de66f5f844580fe6dd0f0f69adccc Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 29 Mar 2011 08:41:32 +0000 Subject: [PATCH] --- inc/commons/class.common.core.php | 25 ++++++++++++++++++- inc/extranet/DAO/class.extranet.dao.devis.php | 8 +++++- .../DAO/class.extranet.dao.facture.php | 8 +++++- .../DAO/class.extranet.dao.projet.php | 8 +++++- 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php index 6cb6d6e00..37490f5d1 100644 --- 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'); $db->utilisateurs->index('index_utilisateurs_prenom', 'BTREE', 'prenom'); $db->utilisateurs->index('index_utilisateurs_grade', 'BTREE', 'grade'); + $db->utilisateurs->index('index_utilisateurs_login', 'BTREE', 'login'); + $db->utilisateurs->index('index_utilisateurs_entreprise', 'BTREE', 'entreprise'); // Table entreprises $db->entreprises->entreprise_id('integer', 0, false); $db->entreprises->nom('varchar', 64, false); @@ -161,6 +163,8 @@ class commonCore extends cubeCore { // Clés $db->entreprises->primary('pk_entreprises', 'entreprise_id'); $db->entreprises->index('index_entreprises_nom', 'BTREE', 'nom'); + $db->entreprises->index('index_entreprises_ws_grade', 'BTREE', 'ws_grade'); + // . // Table projets $db->projets->projet_id('integer', 0, false); @@ -177,6 +181,8 @@ class commonCore extends cubeCore { $db->projets->primary('pk_projets', 'projet_id'); $db->projets->index('index_projets_status', 'BTREE', 'status'); $db->projets->index('index_projets_nom', 'BTREE', 'nom'); + $db->projets->index('index_projets_client', 'BTREE', 'client'); + $db->projets->index('index_projets_chef', 'BTREE', 'chef'); // . // Table taches $db->taches->tache_id('integer', 0, false); @@ -190,6 +196,7 @@ class commonCore extends cubeCore { $db->taches->primary('pk_taches', 'tache_id'); $db->taches->index('index_taches_nom', 'BTREE', 'nom'); $db->taches->index('index_taches_categorie', 'BTREE', 'categorie'); + $db->taches->index('index_taches_projet', 'BTREE', 'projet'); // . // Table timereport $db->timereport->utilisateur_id('integer', 0, false); @@ -199,6 +206,7 @@ class commonCore extends cubeCore { // Clés $db->timereport->primary('pk_timereport', 'utilisateur_id', 'tache_id', 'date'); $db->timereport->index('index_timereport_date', 'BTREE', 'date'); + $db->timereport->index('index_timereport_tache_id', 'BTREE', 'tache_id'); // . // Table devis $db->devis->devis_id('integer', 0, false); @@ -215,6 +223,8 @@ class commonCore extends cubeCore { $db->devis->primary('pk_devis', 'devis_id'); $db->devis->index('index_devis_status', 'BTREE', 'status'); $db->devis->index('index_devis_nom', 'BTREE', 'nom'); + $db->devis->index('index_devis_client', 'BTREE', 'client'); + $db->devis->index('index_devis_createur', 'BTREE', 'createur'); // . // Table factures $db->factures->facture_id('varchar', 8, false); @@ -234,6 +244,8 @@ class commonCore extends cubeCore { $db->factures->primary('pk_factures', 'facture_id'); $db->factures->index('index_factures_status', 'BTREE', 'status'); $db->factures->index('index_factures_nom', 'BTREE', 'nom'); + $db->factures->index('index_factures_projet', 'BTREE', 'projet'); + $db->factures->index('index_factures_createur', 'BTREE', 'createur'); // . // Table dashboard $db->dashboard->dashboard_id('integer', 0, false); @@ -246,6 +258,9 @@ class commonCore extends cubeCore { $db->dashboard->site('varchar', 32, false, '\'extranet\''); // Clés $db->dashboard->primary('pk_dashboard', 'dashboard_id'); + $db->dashboard->index('index_dashboard_equipier','BTREE', 'equipier'); + $db->dashboard->index('index_dashboard_sort','BTREE', 'sort'); + $db->dashboard->index('index_dashboard_site','BTREE', 'site'); // . // Table Signatures $db->signatures->signature_id('integer', 0, false); @@ -266,6 +281,7 @@ class commonCore extends cubeCore { $db->icones->primary('pk_icones', 'icone_id'); $db->icones->index('index_icones_nom', 'BTREE', 'nom'); $db->icones->index('index_icones_date', 'BTREE', 'date'); + $db->icones->index('index_icones_proprietaire', 'BTREE', 'proprietaire'); // Table thèmes $db->themes->theme_id('integer', 0, false); $db->themes->icones('integer', 0, false); @@ -277,6 +293,7 @@ class commonCore extends cubeCore { $db->themes->primary('pk_themes', 'theme_id'); $db->themes->index('index_themes_nom', 'BTREE', 'nom'); $db->themes->index('index_themes_date', 'BTREE', 'date'); + $db->themes->index('index_themes_proprietaire', 'BTREE', 'proprietaire'); // Table des langues $db->langues->lang_id('varchar', 20, false); $db->langues->font('varchar', 64, false); @@ -304,6 +321,8 @@ class commonCore extends cubeCore { $db->documents->index('index_documents_file', 'BTREE', 'file'); $db->documents->index('index_documents_date', 'BTREE', 'date'); $db->documents->index('index_documents_localHash', 'BTREE', 'localHash'); + $db->documents->index('index_documents_proprietaire', 'BTREE', 'proprietaire'); + $db->documents->index('index_documents_version', 'BTREE', 'version'); // . // Table pages des documents $db->document_links->document_id('integer', 0, false); @@ -335,10 +354,14 @@ class commonCore extends cubeCore { $db->books->numerotation('text', 0, false); $db->books->changedate('integer', 0, false); $db->books->compiledate('integer', 0, false); - $db->books->syncv1('integer', 0, false, 0); // Clés $db->books->primary('pk_books', 'book_id'); $db->books->index('index_books_nom', 'BTREE', 'nom'); + $db->books->index('index_books_proprietaire', 'BTREE', 'proprietaire'); + $db->books->index('index_books_tache', 'BTREE', 'tache'); + $db->books->index('index_books_status', 'BTREE', 'status'); + $db->books->index('index_books_theme', 'BTREE', 'theme'); + $db->books->index('index_books_lang', 'BTREE', 'lang'); // . // Table pages des publications $db->book_pages->book_id('integer', 0, false); diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php index 4ccba7a4e..0fa733555 100644 --- 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 { */ public function count() { - $r = $this->con->select('SELECT COUNT(*) AS nb FROM devis_vue WHERE ' . $this->makeWhereFromFiltres()); + $filters=$this->makeWhereFromFiltres(); + if($filters=='1=1'){ + $table='devis'; + }else{ + $table='devis_vue'; + } + $r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $filters); return $r->nb; } diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php index ef0ed3340..433e7fd58 100644 --- 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 { public function count() { - $r = $this->con->select('SELECT COUNT(*) AS nb FROM factures_vue WHERE ' . $this->makeWhereFromFiltres()); + $filters=$this->makeWhereFromFiltres(); + if($filters=='1=1'){ + $table='factures'; + }else{ + $table='factures_vue'; + } + $r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $filters); return $r->nb; } diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php index 2ea19692a..499c98085 100644 --- 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 { public function count() { - $r = $this->con->select('SELECT COUNT(*) AS nb FROM projets_vue WHERE ' . $this->makeWhereFromFiltres()); + $filters = $this->makeWhereFromFiltres(); + if ($filters == '1=1') { + $table = 'projets'; + } else { + $table = 'projets_vue'; + } + $r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $filters); return $r->nb; } -- 2.39.5