NEW Add page statistics for project tasks
This commit is contained in:
parent
447db1b324
commit
1761df2bc2
@ -288,6 +288,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
|
|||||||
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
|
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
|
||||||
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
|
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
|
||||||
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
|
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
|
||||||
|
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->lire', '', 2, 4, __ENTITY__);
|
||||||
|
|
||||||
-- Project - Categories
|
-- Project - Categories
|
||||||
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3804__+MAX_llx_menu__, 'project', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=6', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
|
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3804__+MAX_llx_menu__, 'project', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=6', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
|
||||||
|
|||||||
@ -52,7 +52,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
|
|||||||
if (empty($noout)) print_start_menu_array();
|
if (empty($noout)) print_start_menu_array();
|
||||||
|
|
||||||
$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
|
$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
|
||||||
|
|
||||||
// Show/Hide vertical menu
|
// Show/Hide vertical menu
|
||||||
if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
|
if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
|
||||||
{
|
{
|
||||||
@ -437,7 +437,7 @@ function print_end_menu_array()
|
|||||||
/**
|
/**
|
||||||
* Core function to output left menu eldy
|
* Core function to output left menu eldy
|
||||||
* Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
|
* Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
|
||||||
*
|
*
|
||||||
* @param DoliDB $db Database handler
|
* @param DoliDB $db Database handler
|
||||||
* @param array $menu_array_before Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
|
* @param array $menu_array_before Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
|
||||||
* @param array $menu_array_after Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
|
* @param array $menu_array_after Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
|
||||||
@ -445,7 +445,7 @@ function print_end_menu_array()
|
|||||||
* @param Menu $menu Object Menu to return back list of menu entries
|
* @param Menu $menu Object Menu to return back list of menu entries
|
||||||
* @param int $noout Disable output (Initialise &$menu only).
|
* @param int $noout Disable output (Initialise &$menu only).
|
||||||
* @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
|
* @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
|
||||||
* @param string $forceleftmenu 'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session.
|
* @param string $forceleftmenu 'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session.
|
||||||
* @param array $moredata An array with more data to output
|
* @param array $moredata An array with more data to output
|
||||||
* @return int nb of menu entries
|
* @return int nb of menu entries
|
||||||
*/
|
*/
|
||||||
@ -459,7 +459,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
|
$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
|
||||||
|
|
||||||
$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
|
$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
|
||||||
|
|
||||||
// Show logo company
|
// Show logo company
|
||||||
if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
|
if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
|
||||||
{
|
{
|
||||||
@ -503,7 +503,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
print '</div>'."\n";
|
print '</div>'."\n";
|
||||||
print "<!-- End Bookmarks -->\n";
|
print "<!-- End Bookmarks -->\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We update newmenu with entries found into database
|
* We update newmenu with entries found into database
|
||||||
* --------------------------------------------------
|
* --------------------------------------------------
|
||||||
@ -605,7 +605,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin);
|
$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -839,7 +839,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
}
|
}
|
||||||
|
|
||||||
$newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire);
|
$newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire);
|
||||||
|
|
||||||
$newmenu->add("/fourn/facture/rapport.php",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire);
|
$newmenu->add("/fourn/facture/rapport.php",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire);
|
||||||
|
|
||||||
$newmenu->add("/compta/facture/stats/index.php?mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire);
|
$newmenu->add("/compta/facture/stats/index.php?mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire);
|
||||||
@ -957,29 +957,29 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
|
||||||
if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
|
if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
|
||||||
{
|
{
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
|
||||||
}
|
}
|
||||||
if (! empty($conf->tax->enabled))
|
if (! empty($conf->tax->enabled))
|
||||||
{
|
{
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
|
||||||
}
|
}
|
||||||
if (! empty($conf->expensereport->enabled))
|
if (! empty($conf->expensereport->enabled))
|
||||||
{
|
{
|
||||||
if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
|
if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
|
||||||
}
|
}
|
||||||
/* not required yet, already supported by default account
|
/* not required yet, already supported by default account
|
||||||
if (! empty($conf->loan->enabled))
|
if (! empty($conf->loan->enabled))
|
||||||
{
|
{
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/loan.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuLoanAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_loan', 45);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/loan.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuLoanAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_loan', 45);
|
||||||
}
|
}
|
||||||
if (! empty($conf->don->enabled))
|
if (! empty($conf->don->enabled))
|
||||||
{
|
{
|
||||||
if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
|
if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
|
||||||
}*/
|
}*/
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 60);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 60);
|
||||||
|
|
||||||
// Binding
|
// Binding
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_customer",$langs->trans("ToBind"),2,$user->rights->accounting->bind->write);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_customer",$langs->trans("ToBind"),2,$user->rights->accounting->bind->write);
|
||||||
@ -1023,19 +1023,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
$objp = $db->fetch_object($resql);
|
$objp = $db->fetch_object($resql);
|
||||||
|
|
||||||
$nature='';
|
$nature='';
|
||||||
// Must match array $sourceList defined into journals_list.php
|
// Must match array $sourceList defined into journals_list.php
|
||||||
if ($objp->nature == 2) $nature="sells";
|
if ($objp->nature == 2) $nature="sells";
|
||||||
if ($objp->nature == 3) $nature="purchases";
|
if ($objp->nature == 3) $nature="purchases";
|
||||||
if ($objp->nature == 4) $nature="bank";
|
if ($objp->nature == 4) $nature="bank";
|
||||||
if ($objp->nature == 1) $nature="various";
|
if ($objp->nature == 1) $nature="various";
|
||||||
if ($objp->nature == 9) $nature="hasnew";
|
if ($objp->nature == 9) $nature="hasnew";
|
||||||
|
|
||||||
// To enable when page exists
|
// To enable when page exists
|
||||||
if (empty($conf->global->MAIN_FEATURES_LEVEL))
|
if (empty($conf->global->MAIN_FEATURES_LEVEL))
|
||||||
{
|
{
|
||||||
if ($nature == 'various' || $nature == 'hasnew') $nature='';
|
if ($nature == 'various' || $nature == 'hasnew') $nature='';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($nature)
|
if ($nature)
|
||||||
{
|
{
|
||||||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
|
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
|
||||||
@ -1275,7 +1275,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
|
$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Expeditions
|
// Expeditions
|
||||||
if (! empty($conf->expedition->enabled))
|
if (! empty($conf->expedition->enabled))
|
||||||
{
|
{
|
||||||
@ -1299,9 +1299,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
if (! empty($conf->projet->enabled))
|
if (! empty($conf->projet->enabled))
|
||||||
{
|
{
|
||||||
$langs->load("projects");
|
$langs->load("projects");
|
||||||
|
|
||||||
$search_project_user = GETPOST('search_project_user','int');
|
$search_project_user = GETPOST('search_project_user','int');
|
||||||
|
|
||||||
// Project affected to user
|
// Project affected to user
|
||||||
$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
|
$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
|
||||||
$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
|
$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
|
||||||
@ -1314,7 +1314,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
$newmenu->add("/projet/list.php?leftmenu=projects&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
|
$newmenu->add("/projet/list.php?leftmenu=projects&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
|
||||||
*/
|
*/
|
||||||
$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
|
$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
|
||||||
|
|
||||||
if (empty($conf->global->PROJECT_HIDE_TASKS))
|
if (empty($conf->global->PROJECT_HIDE_TASKS))
|
||||||
{
|
{
|
||||||
// Project affected to user
|
// Project affected to user
|
||||||
@ -1322,6 +1322,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
|
$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
|
||||||
$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("List"), 1, $user->rights->projet->lire);
|
$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("List"), 1, $user->rights->projet->lire);
|
||||||
$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
|
$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
|
||||||
|
$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
|
||||||
|
|
||||||
// All project i have permission on
|
// All project i have permission on
|
||||||
/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
|
/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
|
||||||
@ -1445,7 +1446,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
|
|||||||
$newmenu->add("/adherents/stats/index.php?leftmenu=members",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire);
|
$newmenu->add("/adherents/stats/index.php?leftmenu=members",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire);
|
||||||
if (! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/adherents/htpasswd.php?leftmenu=export",$langs->trans("Filehtpasswd"),1,$user->rights->adherent->export);
|
if (! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/adherents/htpasswd.php?leftmenu=export",$langs->trans("Filehtpasswd"),1,$user->rights->adherent->export);
|
||||||
if ($usemenuhider || empty($leftmenu) || $leftmenu=="export") $newmenu->add("/adherents/cartes/carte.php?leftmenu=export",$langs->trans("MembersCards"),1,$user->rights->adherent->export);
|
if ($usemenuhider || empty($leftmenu) || $leftmenu=="export") $newmenu->add("/adherents/cartes/carte.php?leftmenu=export",$langs->trans("MembersCards"),1,$user->rights->adherent->export);
|
||||||
|
|
||||||
$newmenu->add("/adherents/index.php?leftmenu=members&mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire);
|
$newmenu->add("/adherents/index.php?leftmenu=members&mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire);
|
||||||
$newmenu->add("/adherents/list.php?leftmenu=members&statut=-1,1&mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
|
$newmenu->add("/adherents/list.php?leftmenu=members&statut=-1,1&mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
|
||||||
$newmenu->add("/adherents/subscription/list.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire);
|
$newmenu->add("/adherents/subscription/list.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire);
|
||||||
|
|||||||
@ -41,6 +41,7 @@ ShowProject=Show project
|
|||||||
SetProject=Set project
|
SetProject=Set project
|
||||||
NoProject=No project defined or owned
|
NoProject=No project defined or owned
|
||||||
NbOfProjects=Nb of projects
|
NbOfProjects=Nb of projects
|
||||||
|
NbOfTasks=Nb of tasks
|
||||||
TimeSpent=Time spent
|
TimeSpent=Time spent
|
||||||
TimeSpentByYou=Time spent by you
|
TimeSpentByYou=Time spent by you
|
||||||
TimeSpentByUser=Time spent by user
|
TimeSpentByUser=Time spent by user
|
||||||
@ -181,10 +182,12 @@ ProjectOverview=Overview
|
|||||||
ManageTasks=Use projects to follow tasks and time
|
ManageTasks=Use projects to follow tasks and time
|
||||||
ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
|
ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
|
||||||
ProjectNbProjectByMonth=Nb of created projects by month
|
ProjectNbProjectByMonth=Nb of created projects by month
|
||||||
|
ProjectNbTaskByMonth=Nb of created tasks by month
|
||||||
ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
|
ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
|
||||||
ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
|
ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
|
||||||
ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
|
ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
|
||||||
ProjectsStatistics=Statistics on projects/leads
|
ProjectsStatistics=Statistics on projects/leads
|
||||||
|
TasksStatistics=Statistics on project/lead tasks
|
||||||
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
|
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
|
||||||
IdTaskTime=Id task time
|
IdTaskTime=Id task time
|
||||||
YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
|
YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
|
||||||
|
|||||||
471
htdocs/projet/class/taskstats.class.php
Normal file
471
htdocs/projet/class/taskstats.class.php
Normal file
@ -0,0 +1,471 @@
|
|||||||
|
<?php
|
||||||
|
/* Lead
|
||||||
|
* Copyright (C) 2014-2015 Florian HENRY <florian.henry@open-concept.pro>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
|
||||||
|
include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class to manage statistics on project tasks
|
||||||
|
*/
|
||||||
|
class TaskStats extends Stats
|
||||||
|
{
|
||||||
|
private $project;
|
||||||
|
public $userid;
|
||||||
|
public $socid;
|
||||||
|
public $year;
|
||||||
|
|
||||||
|
function __construct($db)
|
||||||
|
{
|
||||||
|
global $conf, $user;
|
||||||
|
|
||||||
|
$this->db = $db;
|
||||||
|
|
||||||
|
require_once 'task.class.php';
|
||||||
|
$this->task = new Task($this->db);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return all tasks grouped by status.
|
||||||
|
*
|
||||||
|
* @param int $limit Limit results
|
||||||
|
* @return array|int Array with value or -1 if error
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
function getAllTaskByStatus($limit = 5)
|
||||||
|
{
|
||||||
|
global $conf, $user, $langs;
|
||||||
|
|
||||||
|
$datay = array ();
|
||||||
|
|
||||||
|
$sql = "SELECT";
|
||||||
|
$sql .= " COUNT(t.rowid), t.priority";
|
||||||
|
$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
|
||||||
|
$sql .= $this->buildWhere();
|
||||||
|
//$sql .= " AND t.fk_statut <> 0"; // We want historic also, so all task not draft
|
||||||
|
$sql .= " GROUP BY t.priority";
|
||||||
|
|
||||||
|
$result = array ();
|
||||||
|
$res = array ();
|
||||||
|
|
||||||
|
dol_syslog(get_class($this) . '::' . __METHOD__ . "", LOG_DEBUG);
|
||||||
|
$resql = $this->db->query($sql);
|
||||||
|
if ($resql) {
|
||||||
|
$num = $this->db->num_rows($resql);
|
||||||
|
$i = 0;
|
||||||
|
$other = 0;
|
||||||
|
while ( $i < $num ) {
|
||||||
|
$row = $this->db->fetch_row($resql);
|
||||||
|
if ($i < $limit || $num == $limit)
|
||||||
|
{
|
||||||
|
$result[$i] = array(
|
||||||
|
$row[1],
|
||||||
|
$row[0]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
$other += $row[1];
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
if ($num > $limit)
|
||||||
|
$result[$i] = array (
|
||||||
|
$langs->transnoentitiesnoconv("Other"),
|
||||||
|
$other
|
||||||
|
);
|
||||||
|
$this->db->free($resql);
|
||||||
|
} else {
|
||||||
|
$this->error = "Error " . $this->db->lasterror();
|
||||||
|
dol_syslog(get_class($this) . '::' . __METHOD__ . ' ' . $this->error, LOG_ERR);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return count, and sum of products
|
||||||
|
*
|
||||||
|
* @return array of values
|
||||||
|
*/
|
||||||
|
function getAllByYear()
|
||||||
|
{
|
||||||
|
global $conf, $user, $langs;
|
||||||
|
|
||||||
|
$datay = array ();
|
||||||
|
|
||||||
|
$wonlostfilter=0; // No filter on status WON/LOST
|
||||||
|
|
||||||
|
$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
|
||||||
|
$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
|
||||||
|
if (! $user->rights->societe->client->voir && ! $user->societe_id)
|
||||||
|
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
|
||||||
|
$sql.= $this->buildWhere();
|
||||||
|
$sql.= " GROUP BY year";
|
||||||
|
$sql.= $this->db->order('year', 'DESC');
|
||||||
|
|
||||||
|
return $this->_getAllByYear($sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build the where part
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function buildWhere()
|
||||||
|
{
|
||||||
|
$sqlwhere_str = '';
|
||||||
|
$sqlwhere = array();
|
||||||
|
|
||||||
|
$sqlwhere[] = ' t.entity IN (' . getEntity('project') . ')';
|
||||||
|
|
||||||
|
if (! empty($this->userid))
|
||||||
|
$sqlwhere[] = ' t.fk_user_resp=' . $this->userid;
|
||||||
|
if (! empty($this->socid))
|
||||||
|
$sqlwhere[] = ' t.fk_soc=' . $this->socid;
|
||||||
|
if (! empty($this->year) && empty($this->yearmonth))
|
||||||
|
$sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->db->escape($this->year) . "'";
|
||||||
|
if (! empty($this->yearmonth))
|
||||||
|
$sqlwhere[] = " t.datec BETWEEN '" . $this->db->idate(dol_get_first_day($this->yearmonth)) . "' AND '" . $this->db->idate(dol_get_last_day($this->yearmonth)) . "'";
|
||||||
|
|
||||||
|
if (! empty($this->status))
|
||||||
|
$sqlwhere[] = " t.priority IN (" . $this->priority . ")";
|
||||||
|
|
||||||
|
if (count($sqlwhere) > 0) {
|
||||||
|
$sqlwhere_str = ' WHERE ' . implode(' AND ', $sqlwhere);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $sqlwhere_str;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return Task number by month for a year
|
||||||
|
*
|
||||||
|
* @param int $year scan
|
||||||
|
* @return array of values
|
||||||
|
*/
|
||||||
|
function getNbByMonth($year)
|
||||||
|
{
|
||||||
|
global $user;
|
||||||
|
|
||||||
|
$this->yearmonth = $year;
|
||||||
|
|
||||||
|
$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
|
||||||
|
$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
|
||||||
|
if (! $user->rights->societe->client->voir && ! $user->societe_id)
|
||||||
|
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
|
||||||
|
$sql .= $this->buildWhere();
|
||||||
|
$sql .= " GROUP BY dm";
|
||||||
|
$sql .= $this->db->order('dm', 'DESC');
|
||||||
|
|
||||||
|
$this->yearmonth=0;
|
||||||
|
|
||||||
|
$res = $this->_getNbByMonth($year, $sql);
|
||||||
|
// var_dump($res);print '<br>';
|
||||||
|
return $res;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the Task amount by month for a year
|
||||||
|
*
|
||||||
|
* @param int $year scan
|
||||||
|
* @return array with amount by month
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
function getAmountByMonth($year)
|
||||||
|
{
|
||||||
|
global $user;
|
||||||
|
|
||||||
|
$this->yearmonth = $year;
|
||||||
|
|
||||||
|
$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid)";
|
||||||
|
$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
|
||||||
|
if (! $user->rights->societe->client->voir && ! $user->societe_id)
|
||||||
|
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
|
||||||
|
$sql .= $this->buildWhere();
|
||||||
|
$sql .= " GROUP BY dm";
|
||||||
|
$sql .= $this->db->order('dm', 'DESC');
|
||||||
|
$this->yearmonth=0;
|
||||||
|
|
||||||
|
$res = $this->_getAmountByMonth($year, $sql);
|
||||||
|
// var_dump($res);print '<br>';
|
||||||
|
return $res;
|
||||||
|
}*/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return amount of elements by month for several years
|
||||||
|
*
|
||||||
|
* @param int $endyear Start year
|
||||||
|
* @param int $startyear End year
|
||||||
|
* @param int $cachedelay Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
|
||||||
|
* @param int $wonlostfilter Add a filter on status won/lost
|
||||||
|
* @return array Array of values
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
function getWeightedAmountByMonthWithPrevYear($endyear,$startyear,$cachedelay=0,$wonlostfilter=1)
|
||||||
|
{
|
||||||
|
global $conf,$user,$langs;
|
||||||
|
|
||||||
|
if ($startyear > $endyear) return -1;
|
||||||
|
|
||||||
|
$datay=array();
|
||||||
|
|
||||||
|
// Search into cache
|
||||||
|
if (! empty($cachedelay))
|
||||||
|
{
|
||||||
|
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
||||||
|
include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
|
||||||
|
}
|
||||||
|
|
||||||
|
$newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache';
|
||||||
|
$newmask='0644';
|
||||||
|
|
||||||
|
$nowgmt = dol_now();
|
||||||
|
|
||||||
|
$foundintocache=0;
|
||||||
|
if ($cachedelay > 0)
|
||||||
|
{
|
||||||
|
$filedate=dol_filemtime($newpathofdestfile);
|
||||||
|
if ($filedate >= ($nowgmt - $cachedelay))
|
||||||
|
{
|
||||||
|
$foundintocache=1;
|
||||||
|
|
||||||
|
$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load file into $data
|
||||||
|
if ($foundintocache) // Cache file found and is not too old
|
||||||
|
{
|
||||||
|
dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
|
||||||
|
$data = json_decode(file_get_contents($newpathofdestfile), true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$year=$startyear;
|
||||||
|
while($year <= $endyear)
|
||||||
|
{
|
||||||
|
$datay[$year] = $this->getWeightedAmountByMonth($year,$wonlostfilter);
|
||||||
|
$year++;
|
||||||
|
}
|
||||||
|
|
||||||
|
$data = array();
|
||||||
|
// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
|
||||||
|
for ($i = 0 ; $i < 12 ; $i++)
|
||||||
|
{
|
||||||
|
$data[$i][]=$datay[$endyear][$i][0]; // set label
|
||||||
|
$year=$startyear;
|
||||||
|
while($year <= $endyear)
|
||||||
|
{
|
||||||
|
$data[$i][]=$datay[$year][$i][1]; // set yval for x=i
|
||||||
|
$year++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save cache file
|
||||||
|
if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
|
||||||
|
{
|
||||||
|
dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
|
||||||
|
if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
|
||||||
|
$fp = fopen($newpathofdestfile, 'w');
|
||||||
|
if ($fp)
|
||||||
|
{
|
||||||
|
fwrite($fp, json_encode($data));
|
||||||
|
fclose($fp);
|
||||||
|
if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
|
||||||
|
@chmod($newpathofdestfile, octdec($newmask));
|
||||||
|
}
|
||||||
|
else dol_syslog("Failed to write cache file", LOG_ERR);
|
||||||
|
$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $data;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the Task weighted opp amount by month for a year.
|
||||||
|
*
|
||||||
|
* @param int $year Year to scan
|
||||||
|
* @param int $wonlostfilter Add a filter on status won/lost
|
||||||
|
* @return array Array with amount by month
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
function getWeightedAmountByMonth($year, $wonlostfilter=1)
|
||||||
|
{
|
||||||
|
global $user;
|
||||||
|
|
||||||
|
$this->yearmonth = $year;
|
||||||
|
|
||||||
|
$sql = "SELECT date_format(t.datec,'%m') as dm";
|
||||||
|
$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
|
||||||
|
if (! $user->rights->societe->client->voir && ! $user->societe_id)
|
||||||
|
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
|
||||||
|
$sql .= $this->buildWhere();
|
||||||
|
$sql .= " GROUP BY dm";
|
||||||
|
$sql .= $this->db->order('dm', 'DESC');
|
||||||
|
$this->yearmonth=0;
|
||||||
|
|
||||||
|
$res = $this->_getAmountByMonth($year, $sql);
|
||||||
|
// var_dump($res);print '<br>';
|
||||||
|
return $res;
|
||||||
|
}*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return amount of elements by month for several years
|
||||||
|
*
|
||||||
|
* @param int $endyear End year
|
||||||
|
* @param int $startyear Start year
|
||||||
|
* @param int $cachedelay accept for cache file (0=No read, no save of cache, -1=No read but save)
|
||||||
|
* @return array of values
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
function getTransformRateByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
|
||||||
|
{
|
||||||
|
global $conf, $user, $langs;
|
||||||
|
|
||||||
|
if ($startyear > $endyear) return - 1;
|
||||||
|
|
||||||
|
$datay = array();
|
||||||
|
|
||||||
|
// Search into cache
|
||||||
|
if (! empty($cachedelay))
|
||||||
|
{
|
||||||
|
include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
|
||||||
|
include_once DOL_DOCUMENT_ROOT . '/core/lib/json.lib.php';
|
||||||
|
}
|
||||||
|
|
||||||
|
$newpathofdestfile = $conf->user->dir_temp . '/' . get_class($this) . '_' . __FUNCTION__ . '_' . (empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix . '_') . $langs->defaultlang . '_user' . $user->id . '.cache';
|
||||||
|
$newmask = '0644';
|
||||||
|
|
||||||
|
$nowgmt = dol_now();
|
||||||
|
|
||||||
|
$foundintocache = 0;
|
||||||
|
if ($cachedelay > 0) {
|
||||||
|
$filedate = dol_filemtime($newpathofdestfile);
|
||||||
|
if ($filedate >= ($nowgmt - $cachedelay)) {
|
||||||
|
$foundintocache = 1;
|
||||||
|
|
||||||
|
$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $filedate;
|
||||||
|
} else {
|
||||||
|
dol_syslog(get_class($this) . '::' . __FUNCTION__ . " cache file " . $newpathofdestfile . " is not found or older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . ") so we can't use it.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load file into $data
|
||||||
|
if ($foundintocache) // Cache file found and is not too old
|
||||||
|
{
|
||||||
|
dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
|
||||||
|
$data = json_decode(file_get_contents($newpathofdestfile), true);
|
||||||
|
} else {
|
||||||
|
$year = $startyear;
|
||||||
|
while ( $year <= $endyear ) {
|
||||||
|
$datay[$year] = $this->getTransformRateByMonth($year);
|
||||||
|
$year ++;
|
||||||
|
}
|
||||||
|
|
||||||
|
$data = array ();
|
||||||
|
// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
|
||||||
|
for($i = 0; $i < 12; $i ++) {
|
||||||
|
$data[$i][] = $datay[$endyear][$i][0]; // set label
|
||||||
|
$year = $startyear;
|
||||||
|
while ( $year <= $endyear ) {
|
||||||
|
$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
|
||||||
|
$year ++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save cache file
|
||||||
|
if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
|
||||||
|
dol_syslog(get_class($this) . '::' . __FUNCTION__ . " save cache file " . $newpathofdestfile . " onto disk.");
|
||||||
|
if (! dol_is_dir($conf->user->dir_temp))
|
||||||
|
dol_mkdir($conf->user->dir_temp);
|
||||||
|
$fp = fopen($newpathofdestfile, 'w');
|
||||||
|
fwrite($fp, json_encode($data));
|
||||||
|
fclose($fp);
|
||||||
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
|
$newmask = $conf->global->MAIN_UMASK;
|
||||||
|
@chmod($newpathofdestfile, octdec($newmask));
|
||||||
|
|
||||||
|
$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $nowgmt;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $data;
|
||||||
|
}*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the Task transformation rate by month for a year
|
||||||
|
*
|
||||||
|
* @param int $year scan
|
||||||
|
* @return array with amount by month
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
function getTransformRateByMonth($year)
|
||||||
|
{
|
||||||
|
global $user;
|
||||||
|
|
||||||
|
$this->yearmonth = $year;
|
||||||
|
|
||||||
|
$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
|
||||||
|
$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
|
||||||
|
if (! $user->rights->societe->client->voir && ! $user->societe_id)
|
||||||
|
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
|
||||||
|
$sql .= $this->buildWhere();
|
||||||
|
$sql .= " GROUP BY dm";
|
||||||
|
$sql .= $this->db->order('dm', 'DESC');
|
||||||
|
|
||||||
|
$res_total = $this->_getNbByMonth($year, $sql);
|
||||||
|
|
||||||
|
$this->status=6;
|
||||||
|
|
||||||
|
$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
|
||||||
|
$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as t";
|
||||||
|
if (! $user->rights->societe->client->voir && ! $user->societe_id)
|
||||||
|
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
|
||||||
|
$sql .= $this->buildWhere();
|
||||||
|
$sql .= " GROUP BY dm";
|
||||||
|
$sql .= $this->db->order('dm', 'DESC');
|
||||||
|
|
||||||
|
$this->status=0;
|
||||||
|
$this->yearmonth=0;
|
||||||
|
|
||||||
|
$res_only_wined = $this->_getNbByMonth($year, $sql);
|
||||||
|
|
||||||
|
$res=array();
|
||||||
|
|
||||||
|
foreach($res_total as $key=>$total_row) {
|
||||||
|
//var_dump($total_row);
|
||||||
|
if (!empty($total_row[1])) {
|
||||||
|
$res[$key]=array($total_row[0],(100*$res_only_wined[$key][1])/$total_row[1]);
|
||||||
|
} else {
|
||||||
|
$res[$key]=array($total_row[0],0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
// var_dump($res);print '<br>';
|
||||||
|
return $res;
|
||||||
|
}*/
|
||||||
|
}
|
||||||
218
htdocs/projet/tasks/stats/index.php
Normal file
218
htdocs/projet/tasks/stats/index.php
Normal file
@ -0,0 +1,218 @@
|
|||||||
|
<?php
|
||||||
|
/* Copyright (C) 2014-2015 Florian HENRY <florian.henry@open-concept.pro>
|
||||||
|
* Copyright (C) 2015 Laurent Destailleur <ldestailleur@users.sourceforge.net>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \file htdocs/projet/tasks/stats/index.php
|
||||||
|
* \ingroup project
|
||||||
|
* \brief Page for tasks statistics
|
||||||
|
*/
|
||||||
|
|
||||||
|
require '../../../main.inc.php';
|
||||||
|
require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
|
||||||
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
|
||||||
|
require_once DOL_DOCUMENT_ROOT.'/projet/class/taskstats.class.php';
|
||||||
|
|
||||||
|
// Security check
|
||||||
|
if (! $user->rights->projet->lire)
|
||||||
|
accessforbidden();
|
||||||
|
|
||||||
|
|
||||||
|
$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
|
||||||
|
$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
|
||||||
|
|
||||||
|
$userid=GETPOST('userid','int');
|
||||||
|
$socid=GETPOST('socid','int');
|
||||||
|
// Security check
|
||||||
|
if ($user->societe_id > 0)
|
||||||
|
{
|
||||||
|
$action = '';
|
||||||
|
$socid = $user->societe_id;
|
||||||
|
}
|
||||||
|
$nowyear=strftime("%Y", dol_now());
|
||||||
|
$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
|
||||||
|
//$startyear=$year-2;
|
||||||
|
$startyear=$year-1;
|
||||||
|
$endyear=$year;
|
||||||
|
|
||||||
|
$langs->load('companies');
|
||||||
|
$langs->load('projects');
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* View
|
||||||
|
*/
|
||||||
|
|
||||||
|
$form=new Form($db);
|
||||||
|
|
||||||
|
$includeuserlist=array();
|
||||||
|
|
||||||
|
|
||||||
|
llxHeader('', $langs->trans('Tasks'));
|
||||||
|
|
||||||
|
$title=$langs->trans("TasksStatistics");
|
||||||
|
$dir=$conf->projet->dir_output.'/temp';
|
||||||
|
|
||||||
|
print load_fiche_titre($title,'','title_project.png');
|
||||||
|
|
||||||
|
dol_mkdir($dir);
|
||||||
|
|
||||||
|
|
||||||
|
$stats_tasks= new TaskStats($db);
|
||||||
|
if (!empty($userid) && $userid!=-1) $stats_tasks->userid=$userid;
|
||||||
|
if (!empty($socid) && $socid!=-1) $stats_tasks->socid=$socid;
|
||||||
|
if (!empty($year)) $stats_tasks->year=$year;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// Build graphic number of object
|
||||||
|
// $data = array(array('Lib',val1,val2,val3),...)
|
||||||
|
$data = $stats_tasks->getNbByMonthWithPrevYear($endyear,$startyear);
|
||||||
|
//var_dump($data);
|
||||||
|
|
||||||
|
$filenamenb = $conf->project->dir_output . "/stats/tasknbprevyear-".$year.".png";
|
||||||
|
$fileurlnb = DOL_URL_ROOT . '/viewimage.php?modulepart=taskstats&file=tasknbprevyear-'.$year.'.png';
|
||||||
|
|
||||||
|
$px1 = new DolGraph();
|
||||||
|
$mesg = $px1->isGraphKo();
|
||||||
|
if (! $mesg)
|
||||||
|
{
|
||||||
|
$px1->SetData($data);
|
||||||
|
$px1->SetPrecisionY(0);
|
||||||
|
$i=$startyear;$legend=array();
|
||||||
|
while ($i <= $endyear)
|
||||||
|
{
|
||||||
|
$legend[]=$i;
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
$px1->SetLegend($legend);
|
||||||
|
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
||||||
|
$px1->SetWidth($WIDTH);
|
||||||
|
$px1->SetHeight($HEIGHT);
|
||||||
|
$px1->SetYLabel($langs->trans("ProjectNbTask"));
|
||||||
|
$px1->SetShading(3);
|
||||||
|
$px1->SetHorizTickIncrement(1);
|
||||||
|
$px1->SetPrecisionY(0);
|
||||||
|
$px1->mode='depth';
|
||||||
|
$px1->SetTitle($langs->trans("ProjectNbTaskByMonth"));
|
||||||
|
|
||||||
|
$px1->draw($filenamenb,$fileurlnb);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Show array
|
||||||
|
$stats_tasks->year=0;
|
||||||
|
$data_all_year = $stats_tasks->getAllByYear();
|
||||||
|
|
||||||
|
if (!empty($year)) $stats_tasks->year=$year;
|
||||||
|
$arrayyears=array();
|
||||||
|
foreach($data_all_year as $val) {
|
||||||
|
$arrayyears[$val['year']]=$val['year'];
|
||||||
|
}
|
||||||
|
if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
|
||||||
|
|
||||||
|
|
||||||
|
$h=0;
|
||||||
|
$head = array();
|
||||||
|
$head[$h][0] = DOL_URL_ROOT . '/projet/tasks/stats/index.php?mode='.$mode;
|
||||||
|
$head[$h][1] = $langs->trans("ByMonthYear");
|
||||||
|
$head[$h][2] = 'byyear';
|
||||||
|
$h++;
|
||||||
|
|
||||||
|
complete_head_from_modules($conf,$langs,null,$head,$h,$type);
|
||||||
|
|
||||||
|
dol_fiche_head($head,'byyear',$langs->trans("Statistics"), -1, '');
|
||||||
|
|
||||||
|
|
||||||
|
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||||
|
|
||||||
|
print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
||||||
|
|
||||||
|
print '<table class="noborder" width="100%">';
|
||||||
|
print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
|
||||||
|
// Company
|
||||||
|
/*print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
|
||||||
|
if ($mode == 'customer') $filter='s.client in (1,2,3)';
|
||||||
|
if ($mode == 'supplier') $filter='s.fournisseur = 1';
|
||||||
|
print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
|
||||||
|
print '</td></tr>';
|
||||||
|
*/
|
||||||
|
// User
|
||||||
|
/*print '<tr><td>'.$langs->trans("ProjectCommercial").'</td><td>';
|
||||||
|
print $form->select_dolusers($userid, 'userid', 1, array(),0,$includeuserlist);
|
||||||
|
print '</td></tr>';*/
|
||||||
|
// Year
|
||||||
|
print '<tr><td>'.$langs->trans("Year").'</td><td>';
|
||||||
|
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
|
||||||
|
if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
|
||||||
|
arsort($arrayyears);
|
||||||
|
print $form->selectarray('year',$arrayyears,$year,0);
|
||||||
|
print '</td></tr>';
|
||||||
|
print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
|
||||||
|
print '</table>';
|
||||||
|
print '</form>';
|
||||||
|
print '<br><br>';
|
||||||
|
|
||||||
|
print '<table class="noborder" width="100%">';
|
||||||
|
print '<tr class="liste_titre" height="24">';
|
||||||
|
print '<td align="center">'.$langs->trans("Year").'</td>';
|
||||||
|
print '<td align="right">'.$langs->trans("NbOfTasks").'</td>';
|
||||||
|
print '</tr>';
|
||||||
|
|
||||||
|
$oldyear=0;
|
||||||
|
$var=true;
|
||||||
|
foreach ($data_all_year as $val)
|
||||||
|
{
|
||||||
|
$year = $val['year'];
|
||||||
|
while ($year && $oldyear > $year+1)
|
||||||
|
{ // If we have empty year
|
||||||
|
$oldyear--;
|
||||||
|
|
||||||
|
print '<tr '.$bc[$var].' height="24">';
|
||||||
|
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
|
||||||
|
print '<td align="right">0</td>';
|
||||||
|
print '</tr>';
|
||||||
|
}
|
||||||
|
|
||||||
|
print '<tr '.$bc[$var].' height="24">';
|
||||||
|
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
|
||||||
|
print '<td align="right">'.$val['nb'].'</td>';
|
||||||
|
print '</tr>';
|
||||||
|
$oldyear=$year;
|
||||||
|
}
|
||||||
|
|
||||||
|
print '</table>';
|
||||||
|
|
||||||
|
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
|
||||||
|
|
||||||
|
$stringtoshow.= '<table class="border" width="100%"><tr valign="top"><td align="center">';
|
||||||
|
if ($mesg) { print $mesg; }
|
||||||
|
else {
|
||||||
|
$stringtoshow.= $px1->show();
|
||||||
|
$stringtoshow.= "<br>\n";
|
||||||
|
}
|
||||||
|
$stringtoshow.= '</td></tr></table>';
|
||||||
|
|
||||||
|
print $stringtoshow;
|
||||||
|
|
||||||
|
|
||||||
|
print '</div></div></div>';
|
||||||
|
print '<div style="clear:both"></div>';
|
||||||
|
|
||||||
|
|
||||||
|
llxFooter();
|
||||||
|
$db->close();
|
||||||
Loading…
Reference in New Issue
Block a user