This commit is contained in:
Laurent Destailleur 2010-06-07 23:52:43 +00:00
parent b18920de44
commit 7e3791d847
18 changed files with 47 additions and 47 deletions

View File

@ -18,7 +18,7 @@
*/ */
/** /**
\file htdocs/core/address.class.php \file htdocs/core/class/address.class.php
\brief Fichier de la classe des adresses postales \brief Fichier de la classe des adresses postales
\version $Id$ \version $Id$
*/ */
@ -39,7 +39,7 @@ class Address {
function Address() { function Address() {
} }
} }
?> ?>

View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/commonobject.class.php * \file htdocs/core/class/commonobject.class.php
* \ingroup core * \ingroup core
* \brief Fichier de la classe mere des classes metiers (facture, contrat, propal, commande, etc...) * \brief Fichier de la classe mere des classes metiers (facture, contrat, propal, commande, etc...)
* \version $Id$ * \version $Id$

View File

@ -21,7 +21,7 @@
*/ */
/** /**
* \file htdocs/core/conf.class.php * \file htdocs/core/class/conf.class.php
* \ingroup core * \ingroup core
* \brief Fichier de la classe de stockage de la config courante * \brief Fichier de la classe de stockage de la config courante
* \remarks La config est stockee dans le fichier conf/conf.php * \remarks La config est stockee dans le fichier conf/conf.php

View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/core/cookie.class.php * \file htdocs/core/class/cookie.class.php
* \ingroup core * \ingroup core
* \version $Id$ * \version $Id$
* \brief File of class to manage cookies * \brief File of class to manage cookies

View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/core/dolgraph.class.php * \file htdocs/core/class/dolgraph.class.php
* \brief Fichier de la classe mere de gestion des graph * \brief Fichier de la classe mere de gestion des graph
* \version $Id$ * \version $Id$
* \remarks Usage: * \remarks Usage:
@ -55,14 +55,14 @@ class DolGraph
var $SetShading=0; var $SetShading=0;
var $PrecisionY=-1; var $PrecisionY=-1;
var $horizTickIncrement=-1; var $horizTickIncrement=-1;
var $SetNumXTicks=-1; var $SetNumXTicks=-1;
var $labelInterval=-1; var $labelInterval=-1;
var $hideXGrid=false; var $hideXGrid=false;
var $hideYGrid=false; var $hideYGrid=false;
var $Legend=array(); var $Legend=array();
var $LegendWidthMin=0; var $LegendWidthMin=0;
@ -154,7 +154,7 @@ class DolGraph
$this->labelInterval = $x; $this->labelInterval = $x;
return true; return true;
} }
/** /**
* \brief Hide X grid * \brief Hide X grid
*/ */
@ -172,7 +172,7 @@ class DolGraph
$this->hideYGrid = $bool; $this->hideYGrid = $bool;
return true; return true;
} }
function SetYLabel($label) function SetYLabel($label)
{ {
$this->YLabel = $label; $this->YLabel = $label;
@ -250,7 +250,7 @@ class DolGraph
return $this->error; return $this->error;
} }
/** /**
* \brief Definie la couleur de fond de l'image complete * \brief Definie la couleur de fond de l'image complete
* \param bg_color array(R,G,B) ou 'onglet' ou 'default' * \param bg_color array(R,G,B) ou 'onglet' ou 'default'
@ -384,7 +384,7 @@ class DolGraph
{ {
$factor*=10; $factor*=10;
} }
$res=floor($min/$factor)*$factor; $res=floor($min/$factor)*$factor;
//print "min=".$min." res=".$res; //print "min=".$min." res=".$res;
@ -433,7 +433,7 @@ class DolGraph
$colorsemitrans=new Color(255,255,255,60); $colorsemitrans=new Color(255,255,255,60);
$colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0); $colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
$colorwhite=new Color(255,255,255); $colorwhite=new Color(255,255,255);
// Graph // Graph
$graph = new Graph($this->width, $this->height); $graph = new Graph($this->width, $this->height);
$graph->border->hide(); $graph->border->hide();
@ -465,7 +465,7 @@ class DolGraph
if ($this->hideXGrid) $group->grid->hideVertical(true); if ($this->hideXGrid) $group->grid->hideVertical(true);
if ($this->hideYGrid) $group->grid->hideHorizontal(true); if ($this->hideYGrid) $group->grid->hideHorizontal(true);
// On boucle sur chaque lot de donnees // On boucle sur chaque lot de donnees
$legends=array(); $legends=array();
$i=0; $i=0;
@ -499,7 +499,7 @@ class DolGraph
$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20); $color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
$colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50); $colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50);
$colorgrey=new Color(100,100,100); $colorgrey=new Color(100,100,100);
$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]); $colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
@ -509,7 +509,7 @@ class DolGraph
$plot->barBorder->setColor($colorgrey); $plot->barBorder->setColor($colorgrey);
//$plot->setBarColor($color); //$plot->setBarColor($color);
$plot->setBarGradient( new LinearGradient($colorbis, $color, 90) ); $plot->setBarGradient( new LinearGradient($colorbis, $color, 90) );
if ($this->mode == 'side') $plot->setBarPadding(0.1, 0.1); if ($this->mode == 'side') $plot->setBarPadding(0.1, 0.1);
if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4); if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
if ($this->mode == 'side') $plot->setBarSpace(5); if ($this->mode == 'side') $plot->setBarSpace(5);
@ -532,11 +532,11 @@ class DolGraph
$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20); $color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
$colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60); $colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60);
$colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90); $colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90);
$plot = new LinePlot($newvalues); $plot = new LinePlot($newvalues);
//$plot->setSize(1, 0.96); //$plot->setSize(1, 0.96);
//$plot->setCenter(0.5, 0.52); //$plot->setCenter(0.5, 0.52);
$plot->setColor($color); $plot->setColor($color);
$plot->setThickness(1); $plot->setThickness(1);
@ -544,14 +544,14 @@ class DolGraph
$plot->setFillGradient( new LinearGradient($colorter, $colorbis, 90) ); $plot->setFillGradient( new LinearGradient($colorter, $colorbis, 90) );
$plot->xAxis->setLabelText($legends); $plot->xAxis->setLabelText($legends);
// Le mode automatique est plus efficace // Le mode automatique est plus efficace
$plot->SetYMax($this->MaxValue); $plot->SetYMax($this->MaxValue);
$plot->SetYMin($this->MinValue); $plot->SetYMin($this->MinValue);
//$plot->setYAxis(0); //$plot->setYAxis(0);
//$plot->hideLine(true); //$plot->hideLine(true);
} }
//$plot->reduce(80); // Evite temps d'affichage trop long et nombre de ticks absisce satures //$plot->reduce(80); // Evite temps d'affichage trop long et nombre de ticks absisce satures
$group->legend->setTextFont(new Tuffy(10)); // This is to force Artichow to use awFileFontDriver to $group->legend->setTextFont(new Tuffy(10)); // This is to force Artichow to use awFileFontDriver to
@ -571,7 +571,7 @@ class DolGraph
//print $group->axis->bottom->getLabelNumber(); //print $group->axis->bottom->getLabelNumber();
if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval); if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
$graph->add($group); $graph->add($group);
// Generate file // Generate file

View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/core/events.class.php * \file htdocs/core/class/events.class.php
* \ingroup core * \ingroup core
* \brief Events class file. * \brief Events class file.
* \version $Id$ * \version $Id$

View File

@ -26,7 +26,7 @@
*/ */
/** /**
* \file htdocs/html.form.class.php * \file htdocs/core/class/html.form.class.php
* \brief Fichier de la classe des fonctions predefinie de composants html * \brief Fichier de la classe des fonctions predefinie de composants html
* \version $Id$ * \version $Id$
*/ */

View File

@ -17,7 +17,7 @@
*/ */
/** /**
\file htdocs/html.formactions.class.php \file htdocs/core/class/html.formactions.class.php
\brief Fichier de la classe des fonctions predefinie de composants html actions \brief Fichier de la classe des fonctions predefinie de composants html actions
\version $Id$ \version $Id$
*/ */
@ -25,7 +25,7 @@
/** /**
\class FormActions \class FormActions
\brief Classe permettant la g<EFBFBD>n<EFBFBD>ration de composants html actions \brief Classe permettant la generation de composants html actions
*/ */
class FormActions class FormActions
{ {

View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/html.formadmin.class.php * \file htdocs/core/class/html.formadmin.class.php
* \brief File of class for html functions for admin pages * \brief File of class for html functions for admin pages
* \version $Id$ * \version $Id$
*/ */

View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/html.formcompany.class.php * \file htdocs/core/class/html.formcompany.class.php
* \brief File of class to build HTML component for third parties management * \brief File of class to build HTML component for third parties management
* \version $Id$ * \version $Id$
*/ */

View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/html.formfile.class.php * \file htdocs/core/class/html.formfile.class.php
* \brief Fichier de la classe des fonctions predefinie de composants html fichiers * \brief Fichier de la classe des fonctions predefinie de composants html fichiers
* \version $Id$ * \version $Id$
*/ */

View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/html.formmail.class.php * \file htdocs/core/class/html.formmail.class.php
* \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
* \version $Id$ * \version $Id$
*/ */

View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/html.formorder.class.php * \file htdocs/core/class/html.formorder.class.php
* \brief File of predefined functions for HTML forms for order module * \brief File of predefined functions for HTML forms for order module
* \version $Id$ * \version $Id$
*/ */
@ -81,10 +81,10 @@ class FormOrder
{ {
global $conf,$langs; global $conf,$langs;
$listemethodes=array(); $listemethodes=array();
require_once(DOL_DOCUMENT_ROOT."/core/class/html.form.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.form.class.php");
$form=new Form($this->db); $form=new Form($this->db);
$sql = "SELECT rowid, libelle "; $sql = "SELECT rowid, libelle ";
$sql.= " FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur";
$sql.= " WHERE active = 1"; $sql.= " WHERE active = 1";

View File

@ -26,7 +26,7 @@
*/ */
/** /**
* \file htdocs/html.formother.class.php * \file htdocs/core/class/html.formother.class.php
* \brief Fichier de la classe des fonctions predefinie de composants html autre * \brief Fichier de la classe des fonctions predefinie de composants html autre
* \version $Id$ * \version $Id$
*/ */

View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/core/menubase.class.php * \file htdocs/core/class/menubase.class.php
* \ingroup core * \ingroup core
* \version $Id$ * \version $Id$
* \brief File of class to manage dynamic menu entries * \brief File of class to manage dynamic menu entries

View File

@ -18,7 +18,7 @@
*/ */
/** /**
\file htdocs/notify.class.php \file htdocs/core/class/notify.class.php
\brief Fichier de la classe de gestion des notifications \brief Fichier de la classe de gestion des notifications
\version $Id$ \version $Id$
*/ */

View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/stats.class.php * \file htdocs/core/class/stats.class.php
* \ingroup core * \ingroup core
* \brief Common class to manage statistics reports * \brief Common class to manage statistics reports
* \version $Id$ * \version $Id$
@ -47,7 +47,7 @@ class Stats
function getNbByMonthWithPrevYear($endyear,$startyear) function getNbByMonthWithPrevYear($endyear,$startyear)
{ {
$datay=array(); $datay=array();
$year=$startyear; $year=$startyear;
while($year <= $endyear) while($year <= $endyear)
{ {
@ -67,8 +67,8 @@ class Stats
$year++; $year++;
} }
} }
// return array(array('Month',val1,val2,val3),...) // return array(array('Month',val1,val2,val3),...)
return $data; return $data;
} }
@ -82,7 +82,7 @@ class Stats
function getAmountByMonthWithPrevYear($endyear,$startyear) function getAmountByMonthWithPrevYear($endyear,$startyear)
{ {
$datay=array(); $datay=array();
$year=$startyear; $year=$startyear;
while($year <= $endyear) while($year <= $endyear)
{ {
@ -115,7 +115,7 @@ class Stats
function _getNbByYear($sql) function _getNbByYear($sql)
{ {
$result = array(); $result = array();
dol_syslog("Stats::_getNbByYear sql=".$sql); dol_syslog("Stats::_getNbByYear sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -144,7 +144,7 @@ class Stats
function _getAllByYear($sql) function _getAllByYear($sql)
{ {
$result = array(); $result = array();
dol_syslog("Stats::_getAllByYear sql=".$sql); dol_syslog("Stats::_getAllByYear sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -166,8 +166,8 @@ class Stats
dol_print_error($this->db); dol_print_error($this->db);
} }
return $result; return $result;
} }
/** /**
* \brief Renvoie le nombre de proposition par mois pour une annee donnee * \brief Renvoie le nombre de proposition par mois pour une annee donnee
* *
@ -195,7 +195,7 @@ class Stats
{ {
dol_print_error($this->db); dol_print_error($this->db);
} }
for ($i = 1 ; $i < 13 ; $i++) for ($i = 1 ; $i < 13 ; $i++)
{ {
$res[$i] = $result[$i] + 0; $res[$i] = $result[$i] + 0;

View File

@ -19,7 +19,7 @@
*/ */
/** /**
* \file htdocs/translate.class.php * \file htdocs/core/class/translate.class.php
* \brief File for Tanslate class * \brief File for Tanslate class
* \author Eric Seigne * \author Eric Seigne
* \author Laurent Destailleur * \author Laurent Destailleur