'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '
'."\n";
// Fields title search
// --------------------------------------------------------------------
print '';
// Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
- print '| ';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print ' | ';
$searchpicto = $form->showFilterButtons('left');
print $searchpicto;
print ' | ';
@@ -930,7 +954,7 @@ if (!empty($arrayfields['t.billed']['checked'])) {
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Fields from hook
$parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['t.datec']['checked'])) {
// Date creation
@@ -943,8 +967,8 @@ if (!empty($arrayfields['t.tms']['checked'])) {
print '';
}
// Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
- print '';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print ' | ';
$searchpicto = $form->showFilterButtons();
print $searchpicto;
print ' | ';
@@ -973,8 +997,10 @@ $totalarray = array(
// Fields title label
// --------------------------------------------------------------------
print '
';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
print_liste_field_titre($arrayfields['t.fk_task_parent']['label'], $_SERVER["PHP_SELF"], "t.fk_task_parent", "", $param, "", $sortfield, $sortorder);
@@ -1072,10 +1098,11 @@ if (!empty($arrayfields['t.tms']['checked'])) {
print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
$totalarray['nbfield']++;
}
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ $totalarray['nbfield']++;
}
-$totalarray['nbfield']++;
print '
'."\n";
$plannedworkloadoutputformat = 'allhourmin';
@@ -1091,6 +1118,7 @@ if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
// --------------------------------------------------------------------
$i = 0;
$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
$totalarray['nbfield'] = 0;
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
@@ -1131,6 +1159,13 @@ while ($i < $imaxinloop) {
print '';
}
// Output Kanban
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ }
+
$object->fk_statut = $projectstatic->getLibStatut(1);
$arraydata['projectlink'] = $projectstatic->getNomUrl(1);
print $object->getKanbanView('', $arraydata);
@@ -1141,10 +1176,12 @@ while ($i < $imaxinloop) {
} else {
$userAccess = $projectstatic->restrictedProjectArea($user); // why this ?
if ($userAccess >= 0) {
+ // Show here line of result
+ $j = 0;
print '
';
// Action column
- if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '| ';
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
$selected = 0;
@@ -1154,6 +1191,9 @@ while ($i < $imaxinloop) {
print '';
}
print ' | ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Ref Parent
if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
@@ -1452,8 +1492,8 @@ while ($i < $imaxinloop) {
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+ $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
if (!empty($arrayfields['t.datec']['checked'])) {
@@ -1480,7 +1520,7 @@ while ($i < $imaxinloop) {
print ''.$projectstatic->getLibStatut(5).' | ';
}*/
// Action column
- if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '';
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
$selected = 0;
@@ -1490,9 +1530,9 @@ while ($i < $imaxinloop) {
print '';
}
print ' | ';
- }
- if (!$i) {
- $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
print '
'."\n";
@@ -1554,7 +1594,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
$db->free($resql);
$parameters = array('arrayfields'=>$arrayfields, 'sql' => $sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print '