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

New: Can filter on project on agenda

Browse Source
This commit is contained in:
Laurent Destailleur 2010-01-12 09:22:05 +00:00
parent d02b975ec4
commit 3b6d0c77d3
1 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ require_once("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); 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");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
$filtera = isset($_REQUEST["userasked"])?$_REQUEST["userasked"]:(isset($_REQUEST["filtera"])?$_REQUEST["filtera"]:''); $filtera = isset($_REQUEST["userasked"])?$_REQUEST["userasked"]:(isset($_REQUEST["filtera"])?$_REQUEST["filtera"]:'');
$filtert = isset($_REQUEST["usertodo"])?$_REQUEST["usertodo"]:(isset($_REQUEST["filtert"])?$_REQUEST["filtert"]:''); $filtert = isset($_REQUEST["usertodo"])?$_REQUEST["usertodo"]:(isset($_REQUEST["filtert"])?$_REQUEST["filtert"]:'');
@ -162,7 +163,7 @@ $param.='&year='.$year.'&month='.$month.($day?'&day='.$day:'');
print_fiche_titre($title,$nav); print_fiche_titre($title,$nav);
// Filters // Filters
if ($canedit) if ($canedit || $conf->projet->enabled)
{ {
print '<form name="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">'; print '<form name="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -174,37 +175,47 @@ if ($canedit)
print '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">'; print '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">';
print '<input type="hidden" name="action" value="'.$_REQUEST['action'].'">'; print '<input type="hidden" name="action" value="'.$_REQUEST['action'].'">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr>'; if ($canedit)
print '<td nowrap="nowrap">'; {
//print '<input type="checkbox" name="userasked" '.($canedit?'':'disabled="true" ').($filtera?'checked="true"':'').'> '; $rowspan=3;
print $langs->trans("ActionsAskedBy"); if ($conf->projet->enabled) $rowspan++;
print '</td><td nowrap="nowrap">'; print '<tr>';
print $form->select_users($filtera,'userasked',1,'',!$canedit); print '<td nowrap="nowrap">';
print '</td>'; print $langs->trans("ActionsAskedBy");
print '<td rowspan="3" align="center" valign="middle" nowrap="nowrap">'; print '</td><td nowrap="nowrap">';
print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'">'; print $form->select_users($filtera,'userasked',1,'',!$canedit);
print '<br>'; print '</td>';
print '<br>'; print '<td rowspan="'.$rowspan.'" align="center" valign="middle" nowrap="nowrap">';
print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">'; print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'">';
print '</td>'; print '<br>';
print '</tr>'; print '<br>';
print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
print '</td>';
print '</tr>';
print '<tr>'; print '<tr>';
print '<td nowrap="nowrap">'; print '<td nowrap="nowrap">';
//print '<input type="checkbox" name="usertodo" '.($canedit?'':'disabled="true" ').($filtert?'checked="true"':'').'> '; print $langs->trans("ActionsToDoBy");
print $langs->trans("ActionsToDoBy"); print '</td><td nowrap="nowrap">';
print '</td><td nowrap="nowrap">'; print $form->select_users($filtert,'usertodo',1,'',!$canedit);
print $form->select_users($filtert,'usertodo',1,'',!$canedit); print '</td></tr>';
print '</td></tr>';
print '<tr>';
print '<td nowrap="nowrap">';
//print '<input type="checkbox" name="userdone" '.($canedit?'':'disabled="true" ').($filterd?'checked="true"':'').'> ';
print $langs->trans("ActionsDoneBy");
print '</td><td nowrap="nowrap">';
print $form->select_users($filterd,'userdone',1,'',!$canedit);
print '</td></tr>';
print '<tr>';
print '<td nowrap="nowrap">';
print $langs->trans("ActionsDoneBy");
print '</td><td nowrap="nowrap">';
print $form->select_users($filterd,'userdone',1,'',!$canedit);
print '</td></tr>';
}
if ($conf->projet->enabled)
{
print '<tr>';
print '<td nowrap="nowrap">';
print $langs->trans("Project");
print '</td><td nowrap="nowrap">';
select_projects($socid,$_REQUEST["projectid"],'projectid');
print '</td></tr>';
}
print '</table>'; print '</table>';
print '</form><br>'; print '</form><br>';
} }