From ccbb8704e24f4b1d5b913dd2f534c1e01887d1e3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 8 May 2004 18:44:22 +0000 Subject: [PATCH] =?UTF-8?q?Optim:=20Si=20le=20module=20n'est=20pas=20actif?= =?UTF-8?q?=20on=20ne=20fait=20pas=20les=20select=20en=20rapport.=20New:?= =?UTF-8?q?=20Ajout=20d'un=20r=E9sum=E9=20sur=20page=20accueil=20espace=20?= =?UTF-8?q?commercial=20(nbre=20de=20client=20et=20nbre=20de=20prospect).?= =?UTF-8?q?=20Fix:=20Les=20zone=20en=20rapport=20avec=20les=20commandes=20?= =?UTF-8?q?et=20propales=20s'affichent=20ou=20nons=20sur=20l'espace=20comm?= =?UTF-8?q?ercial=20si=20le=20module=20commande=20ou=20propale=20est=20act?= =?UTF-8?q?if=20ou=20non.=20New:=20Ajout=20des=20derniers=20contrats=20sur?= =?UTF-8?q?=20page=20accueil=20commercial?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/index.php | 254 +++++++++++++++++++++++++++++------------- 1 file changed, 179 insertions(+), 75 deletions(-) diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 5ee3869f00b..71bace06fde 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -76,10 +76,58 @@ if ($action == 'del_bookmark') print_titre("Espace commercial"); -print ''; +print '
'; print '"; + print ''; + $i++; + $var=!$var; + } + } + } + print "
'; + +/* + * Résumé + * + */ + +$sql = "SELECT count(s.idp) as nb, client"; +$sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; +$sql .= " WHERE client in (1,2)"; +$sql .= " GROUP BY client"; +$nb = array(); +if ( $db->query($sql) ) +{ + $i=0; + $num = $db->num_rows(); + while ($i < $num) + { + $obj = $db->fetch_object( $i); + $nb[$obj->client]=$obj->nb; + $i++; + } +} +else { + print $db->error(); +} + + +print ''; +print ""; +print ""; +print "\n"; +$var = false; +$type_client_id = array(1,2); +$type_client[1]="Clients"; +$type_client[2]="Prospects"; +foreach ($type_client_id as $type) { + print ""; + print ''; + print ''; + print ''; + $var=!$var; +} +print "
Résumé
Nombre de '.$type_client[$type].''.round($nb[$type]).'

\n"; + + +/* + * Recherche Propal + */ if ($conf->propal->enabled) { print '
'; print ''; @@ -99,7 +147,7 @@ if ($conf->propal->enabled) { if ($num > 0 ) { print '
'; - print ""; + print ""; print ""; while ($i < $num) @@ -117,40 +165,42 @@ if ($conf->propal->enabled) { /* * Commandes à valider */ -$sql = "SELECT c.rowid, c.ref, s.nom, s.idp FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s"; -$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 0"; -if ($socidp) -{ - $sql .= " AND c.fk_soc = $socidp"; -} +if ($conf->commande->enabled) { + print '
Propositions commerciales brouillons
'; + print ''; + print ''; -if ( $db->query($sql) ) -{ - $num = $db->num_rows(); - if ($num) + $sql = "SELECT c.rowid, c.ref, s.nom, s.idp FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s"; + $sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 0"; + if ($socidp) { - $i = 0; - print '
'.translate("Commandes à valider").'
'; - print ''; - print ''; - $var = False; - while ($i < $num) - { - $obj = $db->fetch_object($i); - print ""; - print ''; - $i++; - $var=!$var; - } - print "
'.translate("Commandes à valider").'
rowid\">$obj->ref'.$obj->nom.'

"; + $sql .= " AND c.fk_soc = $socidp"; } + + if ( $db->query($sql) ) + { + $num = $db->num_rows(); + if ($num) + { + $i = 0; + $var = False; + while ($i < $num) + { + $obj = $db->fetch_object($i); + print "
rowid\">$obj->ref'.$obj->nom.'

"; } /* - * + * Bookmark * */ - $sql = "SELECT s.idp, s.nom,b.rowid as bid"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."bookmark as b"; $sql .= " WHERE b.fk_soc = s.idp AND b.fk_user = ".$user->id; @@ -162,9 +212,9 @@ if ( $db->query($sql) ) $i = 0; print ''; - print ""; - print ""; - print "\n"; + print ""; + print ""; + print "\n"; while ($i < $num) { @@ -179,10 +229,10 @@ if ( $db->query($sql) ) } print '
Bookmark
Bookmark
'; } + /* * Actions commerciales a faire * - * */ print ''; @@ -194,13 +244,13 @@ $sql .= " ORDER BY a.datea DESC"; if ( $db->query($sql) ) { $num = $db->num_rows(); - if ($num > 0) - { - print ''; - print ''; - $var = True; - $i = 0; - while ($i < $num ) + + print '
Actions à faire
'; + print ''; + $var = true; + $i = 0; + + while ($i < $num ) { $obj = $db->fetch_object($i); $var=!$var; @@ -212,8 +262,10 @@ if ( $db->query($sql) ) print ''; $i++; } - print "
Actions à faire
'.$obj->sname.'

"; - } + // TODO Ajouter rappel pour "il y a des contrats à mettre en service" + // TODO Ajouter rappel pour "il y a des contrats qui arrivent à expiration" + print "
"; + $db->free(); } else @@ -221,43 +273,96 @@ else print $db->error(); } -$sql = "SELECT s.nom, s.idp, p.rowid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; -$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut = 1"; -if ($socidp) -{ - $sql .= " AND s.idp = $socidp"; -} +//Speed: Si le module n'est pas actif on ne fait pas les select en rapport. +//New: Ajout d'un résumé sur page accueil espace commercial (nbre de client et nbre de prospect). +//Fix: Les zone en rapport avec les commandes et propales s'affichent ou nons sur l'espace commercial si le module commande ou propale est actif ou non. +//New: Ajout des derniers contrats sur page accueil commercial -$sql .= " ORDER BY p.rowid DESC"; -$sql .= $db->plimit(5, 0); +/* + * Derniers contrat + * + */ +if ($conf->contrat->enabled) { + $labelservice[0]="Hors service"; + $labelservice[1]="En service"; -if ( $db->query($sql) ) -{ - $num = $db->num_rows(); - $i = 0; - if ($num > 0 ) - { - print ''; - print ''; - $var=False; - while ($i < $num) - { - $obj = $db->fetch_object( $i); - print ""; - print "\n"; - print "\n"; - print "\n"; - $var=!$var; - $i++; - } - print "
Propositions commerciales ouvertes
rowid."\">".img_file()." "; - print "rowid."\">".$obj->ref."idp\">$obj->nom"; - print strftime("%d %B %Y",$obj->dp)."".price($obj->price)."

"; + $sql = "SELECT s.nom, s.idp, c.enservice, c.rowid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."product as p WHERE c.fk_soc = s.idp and c.fk_product = p.rowid"; + if ($socidp) + { + $sql .= " AND s.idp = $socidp"; } + $sql .= " ORDER BY c.tms DESC"; + $sql .= $db->plimit(5, 0); + + print ''; + print ''; + + if ( $db->query($sql) ) + { + $num = $db->num_rows(); + $i = 0; + + $var=false; + while ($i < $num) + { + $obj = $db->fetch_object( $i); + print ""; + print "\n"; + print "\n"; + $var=!$var; + $i++; + } + } + else { + print $db->error(); + } + print "
Les 5 derniers contrats
rowid."\">".img_file()." "; + print "rowid."\">".$obj->ref."idp\">$obj->nom".$labelservice[$obj->enservice]."

"; } /* - * Dernières propales + * Dernières propales ouvertes + * + */ +if ($conf->propal->enabled) { + + $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut = 1"; + if ($socidp) + { + $sql .= " AND s.idp = $socidp"; + } + $sql .= " ORDER BY p.rowid DESC"; + $sql .= $db->plimit(5, 0); + + if ( $db->query($sql) ) + { + $num = $db->num_rows(); + $i = 0; + + print ''; + print ''; + $var=false; + while ($i < $num) + { + $obj = $db->fetch_object( $i); + print ""; + print "\n"; + print "\n"; + print "\n"; + $var=!$var; + $i++; + } + print "
Les 5 dernières propositions commerciales ouvertes
propalid."\">".img_file()." "; + print "rowid."\">".$obj->ref."idp\">$obj->nom"; + print strftime("%d %B %Y",$obj->dp)."".price($obj->price)."

"; + } + +} + +/* + * Dernières propales fermées * */ @@ -269,7 +374,6 @@ if ($conf->propal->enabled) { { $sql .= " AND s.idp = $socidp"; } - $sql .= " ORDER BY p.rowid DESC"; $sql .= $db->plimit(5, 0); @@ -278,8 +382,8 @@ if ($conf->propal->enabled) { $num = $db->num_rows(); $i = 0; - print ''; - print ''; + print '
Dernières propositions commerciales
'; + print ''; $var=False; while ($i < $num) {
Les 5 dernières propositions commerciales traitées