lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Show event in calendar

Browse Source
This commit is contained in:
Laurent Destailleur 2008-03-20 19:07:21 +00:00
parent cc08dab7c6
commit 6092741768
1 changed files with 153 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
htdocs/comm/action/index.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Éric Seigne <erics@rycks.com> * Copyright (C) 2003 Éric Seigne <erics@rycks.com>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -30,6 +30,10 @@ require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
$filtera = isset($_REQUEST["userasked"])?$_REQUEST["userasked"]:'';
$filtert = isset($_REQUEST["usertodo"])?$_REQUEST["usertodo"]:'';
$filterd = isset($_REQUEST["userdone"])?$_REQUEST["userdone"]:'';
$page = $_GET["page"]; $page = $_GET["page"];
$sortfield=$_GET["sortfield"]; $sortfield=$_GET["sortfield"];
$sortorder=$_GET["sortorder"]; $sortorder=$_GET["sortorder"];
@ -39,11 +43,19 @@ $offset = $limit * $page ;
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="a.datea"; if (! $sortfield) $sortfield="a.datea";
// Sécurité accés client // Security check
if ($user->societe_id > 0) $socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe', $socid,'');
$canedit=1;
if (! $user->rights->agenda->myactions->read) access_forbidden();
if (! $user->rights->agenda->allactions->read) $canedit=0;
if (! $user->rights->agenda->allactions->read || $_GET["filter"]=='mine')
{ {
$action = ''; $filtera=$user->id;
$socid = $user->societe_id; $filtert=$user->id;
$filterd=$user->id;
} }
$year=isset($_GET["year"])?$_GET["year"]:date("Y"); $year=isset($_GET["year"])?$_GET["year"]:date("Y");
@ -74,6 +86,8 @@ if ($action=='delete_action')
llxHeader(); llxHeader();
$form=new Form($db);
//print $langs->trans("FeatureNotYetAvailable"); //print $langs->trans("FeatureNotYetAvailable");
$now=mktime(0,0,0); $now=mktime(0,0,0);
@ -92,12 +106,113 @@ $day = -date("w",dolibarr_mktime(0,0,0,$month,1,$year))+2;
if ($day > 1) $day -= 7; if ($day > 1) $day -= 7;
// Show navigation bar // Show navigation bar
$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;region=".$region."\">".img_previous($langs->trans("Previous"))."</a>\n"; $param='&amp;userasked='.$fitlera.'&amp;usertodo='.$filtert.'&amp;userdone='.$filterd;
$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;region=".$region.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
$nav.=" <span id=\"month_name\">".dolibarr_print_date(dolibarr_mktime(0,0,0,$month,1,$year),"%b"); $nav.=" <span id=\"month_name\">".dolibarr_print_date(dolibarr_mktime(0,0,0,$month,1,$year),"%b");
$nav.=" <a href=\"?year=".$year."&amp;region=".$region."\">".$year."</a>"."</span>\n"; $nav.=" <a href=\"?year=".$year."&amp;region=".$region.$param."\">".$year."</a>";
$nav.=" <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;region=".$region."\">".img_next($langs->trans("Next"))."</a>\n"; $nav.=" </span>\n";
$nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;region=".$region.$param."\">".img_next($langs->trans("Next"))."</a>\n";
print_fiche_titre($langs->trans("Calendar"),$nav,''); print_fiche_titre($langs->trans("Calendar"),$nav,'');
// Filters
if ($canedit)
{
print '<form name="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="status" value="'.$status.'">';
print '<input type="hidden" name="time" value="'.$_REQUEST["time"].'">';
print '<table class="border" width="100%">';
print '<tr>';
print '<td>';
//print '<input type="checkbox" name="userasked" '.($canedit?'':'disabled="true" ').($filtera?'checked="true"':'').'> ';
print $langs->trans("ActionsAskedBy");
print '</td><td>';
print $form->select_users($filtera,'userasked',1,'',!$canedit);
print '</td>';
print '<td rowspan="3" align="center" valign="middle">';
print '<input type="submit" class="button" value="'.$langs->trans("Search").'" '.($canedit?'':'disabled="true"') .'>';
print '</td>';
print '</tr>';
print '<tr>';
print '<td>';
//print '<input type="checkbox" name="usertodo" '.($canedit?'':'disabled="true" ').($filtert?'checked="true"':'').'> ';
print $langs->trans("ActionsToDoBy");
print '</td><td>';
print $form->select_users($filtert,'usertodo',1,'',!$canedit);
print '</td></tr>';
print '<tr>';
print '<td>';
//print '<input type="checkbox" name="userdone" '.($canedit?'':'disabled="true" ').($filterd?'checked="true"':'').'> ';
print $langs->trans("ActionsDoneBy");
print '</td><td>';
print $form->select_users($filterd,'userdone',1,'',!$canedit);
print '</td></tr>';
print '</table>';
print '</form><br>';
}
// Get event in an array
$sql = 'SELECT a.id,a.label,';
$sql.= ' '.$db->pdate('a.datep').' as datep,';
$sql.= ' '.$db->pdate('a.datep2').' as datep2,';
$sql.= ' '.$db->pdate('a.datea').' as datea,';
$sql.= ' '.$db->pdate('a.datea2').' as datea2,';
$sql.= ' a.percent,a.fk_user_author,a.fk_user_action,a.fk_user_done';
$sql.= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
$sql.= ' WHERE 1=1';
if ($filtera > 0 || $filtert > 0 || $filterd > 0)
{
$sql.= " AND (";
if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
$sql.= ")";
}
//echo "$sql<br>";
$actionarray=array();
$resql=$db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
while ($i < $num)
{
$obj = $db->fetch_object($resql);
$action=new ActionComm($db);
$action->id=$obj->id;
$action->datep=$obj->datep;
$action->datef=$obj->datep2;
$action->date=$obj->datea;
$action->dateend=$obj->datea2;
$action->libelle=$obj->label;
$action->percentage=$obj->percent;
if ($action->percentage <= 0)
{
$action->date_to_show_in_calendar=$action->datep;
// Add days until datep2
}
else if ($action->percentage > 0)
{
$action->date_to_show_in_calendar=$action->date;
// Add days until dateend
}
//var_dump($action);
$actionarray[]=$action;
$i++;
}
//echo $num;
}
else
{
dolibarr_print_error($db);
}
echo '<table width="100%" class="nocellnopadd">'; echo '<table width="100%" class="nocellnopadd">';
echo ' <tr class="liste_titre">'; echo ' <tr class="liste_titre">';
echo ' <td align="center">'.$langs->trans("Monday")."</td>\n"; echo ' <td align="center">'.$langs->trans("Monday")."</td>\n";
@ -119,8 +234,8 @@ for($iter_week = 0; $iter_week < 6 ; $iter_week++)
if($day <= 0) if($day <= 0)
{ {
$style='cal_other_month'; $style='cal_other_month';
echo ' <td class="'.$style.'" width="14%">'; echo ' <td class="'.$style.'" width="14%" valign="top">';
show_day_events ($db, $max_day_in_prev_month + $day, $prev_month, $prev_year, $style); show_day_events ($db, $max_day_in_prev_month + $day, $prev_month, $prev_year, $style, $actionarray);
echo " </td>\n"; echo " </td>\n";
} }
/* Show days of the current month */ /* Show days of the current month */
@ -135,16 +250,16 @@ for($iter_week = 0; $iter_week < 6 ; $iter_week++)
else else
$style='cal_current_month'; $style='cal_current_month';
echo ' <td class="'.$style.'" width="14%">'; echo ' <td class="'.$style.'" width="14%" valign="top">';
show_day_events ($db, $day, $month, $year, $style); show_day_events ($db, $day, $month, $year, $style, $actionarray);
echo " </td>\n"; echo " </td>\n";
} }
/* Show days after the current month (next month) */ /* Show days after the current month (next month) */
else else
{ {
$style='cal_other_month'; $style='cal_other_month';
echo ' <td class="'.$style.'" width="14%">'; echo ' <td class="'.$style.'" width="14%" valign="top">';
show_day_events ($db, $day - $max_day_in_month, $next_month, $next_year, $style); show_day_events ($db, $day - $max_day_in_month, $next_month, $next_year, $style, $actionarray);
echo "</td>\n"; echo "</td>\n";
} }
$day++; $day++;
@ -158,11 +273,33 @@ $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');
function show_day_events($db, $day, $month, $year, $style)
/** \brief Show event of a particular day
*/
function show_day_events($db, $day, $month, $year, $style, $actionarray)
{ {
global $filtera, $filtert, $filted;
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td align="left">'.$day.'</td></tr>'; print '<tr><td align="left">'.$day.'</td></tr>';
print '<tr height="60"><td>&nbsp;</td></tr>'; print '<tr height="60"><td valign="top">';
//$curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year);
$i=0;
foreach ($actionarray as $action)
{
$annee = date('Y',$action->date_to_show_in_calendar);
$mois = date('m',$action->date_to_show_in_calendar);
$jour = date('d',$action->date_to_show_in_calendar);
if ($day==$jour && $month==$mois && $year==$annee)
{
if ($i) print "<br>";
print $action->getNomUrl(1,10)." ".$action->getLibStatut(3);
$i++;
}
}
print '&nbsp;</td></tr>';
print '</table>'; print '</table>';
} }