|
|
@@ -42,6 +42,7 @@ $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected
|
|
|
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'workstationlist'; // To manage different context of search
|
|
|
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
|
|
|
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
|
|
|
+$mode = GETPOST('mode', 'aZ');
|
|
|
|
|
|
$id = GETPOST('id', 'int');
|
|
|
|
|
|
@@ -51,8 +52,9 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
|
|
|
$sortorder = GETPOST('sortorder', 'aZ09comma');
|
|
|
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
|
|
|
if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
|
|
|
+ // If $page is not defined, or '' or -1 or if we click on clear filters
|
|
|
$page = 0;
|
|
|
-} // If $page is not defined, or '' or -1 or if we click on clear filters
|
|
|
+}
|
|
|
$offset = $limit * $page;
|
|
|
$pageprev = $page - 1;
|
|
|
$pagenext = $page + 1;
|
|
|
@@ -108,13 +110,13 @@ $arrayfields = array();
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
// If $val['visible']==0, then we never show the field
|
|
|
if (!empty($val['visible'])) {
|
|
|
- $visible = (int) dol_eval($val['visible'], 1, 1, '1');
|
|
|
+ $visible = (int) dol_eval($val['visible'], 1);
|
|
|
$arrayfields['t.'.$key] = array(
|
|
|
'label'=>$val['label'],
|
|
|
'checked'=>(($visible < 0) ? 0 : 1),
|
|
|
- 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
|
|
|
+ 'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
|
|
|
'position'=>$val['position'],
|
|
|
- 'help' => empty($val['help']) ? '' : $val['help']
|
|
|
+ 'help'=> isset($val['help']) ? $val['help'] : ''
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
@@ -127,6 +129,7 @@ $arrayfields['wug.fk_usergroup'] = array(
|
|
|
'help' => empty($val['help']) ? '' : $val['help']
|
|
|
);
|
|
|
|
|
|
+/* disabled because adding resources to workstation seems not yet available in GUI
|
|
|
$arrayfields['wr.fk_resource'] = array(
|
|
|
'label'=>$langs->trans('Resources'),
|
|
|
'checked'=>(($visible < 0) ? 0 : 1),
|
|
|
@@ -134,6 +137,7 @@ $arrayfields['wr.fk_resource'] = array(
|
|
|
'position'=>1001,
|
|
|
'help' => empty($val['help']) ? '' : $val['help']
|
|
|
);
|
|
|
+*/
|
|
|
|
|
|
// Extra fields
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
|
|
|
@@ -180,8 +184,8 @@ if (empty($reshook)) {
|
|
|
$search[$key.'_dtend'] = '';
|
|
|
}
|
|
|
}
|
|
|
- $groups=$resources=array();
|
|
|
- $toselect = '';
|
|
|
+ $groups = $resources=array();
|
|
|
+ $toselect = array();
|
|
|
$search_array_options = array();
|
|
|
}
|
|
|
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
|
|
|
@@ -207,8 +211,8 @@ $formresource = new FormResource($db);
|
|
|
|
|
|
$now = dol_now();
|
|
|
|
|
|
-$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Workstations"));
|
|
|
$help_url = 'EN:Module_Workstation';
|
|
|
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Workstations"));
|
|
|
$morejs = array();
|
|
|
$morecss = array();
|
|
|
|
|
|
@@ -220,7 +224,7 @@ $sql .= $object->getFieldList('t');
|
|
|
// Add fields from extrafields
|
|
|
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
|
|
|
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
|
|
|
- $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key.', ' : '');
|
|
|
+ $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
|
|
|
}
|
|
|
}
|
|
|
// Add fields from hooks
|
|
|
@@ -229,7 +233,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
|
|
|
$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
|
|
|
$sql = preg_replace('/,\s*$/', '', $sql);
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
|
|
|
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
|
|
|
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
|
|
|
}
|
|
|
if (!empty($groups)) {
|
|
|
@@ -260,17 +264,17 @@ foreach ($search as $key => $val) {
|
|
|
$mode_search = 2;
|
|
|
}
|
|
|
if ($search[$key] != '') {
|
|
|
- $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
|
|
|
+ $sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
|
|
|
}
|
|
|
} else {
|
|
|
if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
|
|
|
$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
|
|
|
if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
|
|
|
if (preg_match('/_dtstart$/', $key)) {
|
|
|
- $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
|
|
|
+ $sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
|
|
|
}
|
|
|
if (preg_match('/_dtend$/', $key)) {
|
|
|
- $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
|
|
|
+ $sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -300,47 +304,49 @@ $sql .= $hookmanager->resPrint;
|
|
|
|
|
|
$sql.= " GROUP BY ";
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
- $sql .= "t.".$key.", ";
|
|
|
+ $sql .= "t.".$db->escape($key).", ";
|
|
|
}
|
|
|
// Add fields from extrafields
|
|
|
if (! empty($extrafields->attributes[$object->table_element]['label'])) {
|
|
|
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
|
|
|
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
|
|
|
+ $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
|
|
|
+ }
|
|
|
}
|
|
|
// Add where from hooks
|
|
|
$parameters = array();
|
|
|
$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
$sql .= $hookmanager->resPrint;
|
|
|
$sql = preg_replace('/,\s*$/', '', $sql);
|
|
|
-$sql .= $db->order($sortfield, $sortorder);
|
|
|
-//print $sql;
|
|
|
|
|
|
// Count total nb of records
|
|
|
$nbtotalofrecords = '';
|
|
|
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
|
|
|
+ /* This old and fast method to get and count full list returns all record so use a high amount of memory. */
|
|
|
$resql = $db->query($sql);
|
|
|
$nbtotalofrecords = $db->num_rows($resql);
|
|
|
+
|
|
|
if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
|
|
|
$page = 0;
|
|
|
$offset = 0;
|
|
|
}
|
|
|
+ $db->free($resql);
|
|
|
}
|
|
|
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
|
|
|
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
|
|
|
- $num = $nbtotalofrecords;
|
|
|
-} else {
|
|
|
- if ($limit) {
|
|
|
- $sql .= $db->plimit($limit + 1, $offset);
|
|
|
- }
|
|
|
|
|
|
- $resql = $db->query($sql);
|
|
|
- if (!$resql) {
|
|
|
- dol_print_error($db);
|
|
|
- exit;
|
|
|
- }
|
|
|
+// Complete request and execute it with limit
|
|
|
+$sql .= $db->order($sortfield, $sortorder);
|
|
|
+if ($limit) {
|
|
|
+ $sql .= $db->plimit($limit + 1, $offset);
|
|
|
+}
|
|
|
|
|
|
- $num = $db->num_rows($resql);
|
|
|
+$resql = $db->query($sql);
|
|
|
+if (!$resql) {
|
|
|
+ dol_print_error($db);
|
|
|
+ exit;
|
|
|
}
|
|
|
|
|
|
+$num = $db->num_rows($resql);
|
|
|
+
|
|
|
+
|
|
|
// Direct jump if only one record found
|
|
|
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
|
|
|
$obj = $db->fetch_object($resql);
|
|
|
@@ -358,6 +364,9 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhoriz
|
|
|
$arrayofselected = is_array($toselect) ? $toselect : array();
|
|
|
|
|
|
$param = '';
|
|
|
+if (!empty($mode)) {
|
|
|
+ $param .= '&mode='.urlencode($mode);
|
|
|
+}
|
|
|
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
|
|
|
$param .= '&contextpage='.urlencode($contextpage);
|
|
|
}
|
|
|
@@ -367,9 +376,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
|
|
|
foreach ($search as $key => $val) {
|
|
|
if (is_array($search[$key]) && count($search[$key])) {
|
|
|
foreach ($search[$key] as $skey) {
|
|
|
- $param .= '&search_'.$key.'[]='.urlencode($skey);
|
|
|
+ if ($skey != '') {
|
|
|
+ $param .= '&search_'.$key.'[]='.urlencode($skey);
|
|
|
+ }
|
|
|
}
|
|
|
- } else {
|
|
|
+ } elseif ($search[$key] != '') {
|
|
|
$param .= '&search_'.$key.'='.urlencode($search[$key]);
|
|
|
}
|
|
|
}
|
|
|
@@ -407,9 +418,12 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
|
|
|
print '<input type="hidden" name="action" value="list">';
|
|
|
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
|
|
|
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
|
|
+print '<input type="hidden" name="page" value="'.$page.'">';
|
|
|
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
|
|
+print '<input type="hidden" name="mode" value="'.$mode.'">';
|
|
|
|
|
|
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/workstation/workstation_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
|
|
|
+$newcardbutton = '';
|
|
|
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/workstation/workstation_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
|
|
|
|
|
|
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
|
|
|
|
|
|
@@ -459,24 +473,22 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
|
|
|
|
|
|
print '<tr class="liste_titre">';
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
- $cssforfield = (empty($val['css']) ? '' : $val['css']);
|
|
|
+ $cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
if ($key == 'status') {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
} elseif (in_array($val['type'], array('timestamp'))) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
|
|
|
- } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
|
|
|
+ } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'right';
|
|
|
}
|
|
|
if (!empty($arrayfields['t.'.$key]['checked'])) {
|
|
|
print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
|
|
|
if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
|
|
|
- print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
|
|
|
- } elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
|
|
|
- print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
|
|
|
- } elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
|
|
|
- print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
|
|
|
+ print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
|
|
|
+ } elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
|
|
|
+ print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
|
|
|
} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
|
|
|
print '<div class="nowrap">';
|
|
|
print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
|
|
|
@@ -484,6 +496,12 @@ foreach ($object->fields as $key => $val) {
|
|
|
print '<div class="nowrap">';
|
|
|
print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
|
|
|
print '</div>';
|
|
|
+ } elseif ($key == 'lang') {
|
|
|
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
|
|
|
+ $formadmin = new FormAdmin($db);
|
|
|
+ print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
|
|
|
+ } else {
|
|
|
+ print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
|
|
|
}
|
|
|
print '</td>';
|
|
|
}
|
|
|
@@ -517,6 +535,8 @@ print $searchpicto;
|
|
|
print '</td>';
|
|
|
print '</tr>'."\n";
|
|
|
|
|
|
+$totalarray = array();
|
|
|
+$totalarray['nbfield'] = 0;
|
|
|
|
|
|
// Fields title label
|
|
|
// --------------------------------------------------------------------
|
|
|
@@ -529,11 +549,12 @@ foreach ($object->fields as $key => $val) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
} elseif (in_array($val['type'], array('timestamp'))) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
|
|
|
- } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
|
|
|
+ } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'right';
|
|
|
}
|
|
|
if (!empty($arrayfields['t.'.$key]['checked'])) {
|
|
|
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
|
|
|
+ $totalarray['nbfield']++;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -550,17 +571,18 @@ if (!empty($arrayfields['wr.fk_resource']['checked'])) {
|
|
|
// Extra fields
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
|
|
|
// Hook fields
|
|
|
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
|
|
|
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
|
|
|
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
print $hookmanager->resPrint;
|
|
|
// Action column
|
|
|
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
+print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
+$totalarray['nbfield']++;
|
|
|
print '</tr>'."\n";
|
|
|
|
|
|
|
|
|
// Detect if we need a fetch on each output line
|
|
|
$needToFetchEachLine = 0;
|
|
|
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
|
|
|
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
|
|
|
foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
|
|
|
if (preg_match('/\$object/', $val)) {
|
|
|
$needToFetchEachLine++; // There is at least one compute field that use $object
|
|
|
@@ -572,8 +594,10 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
|
|
|
// Loop on record
|
|
|
// --------------------------------------------------------------------
|
|
|
$i = 0;
|
|
|
-$totalarray = array();
|
|
|
-while ($i < ($limit ? min($num, $limit) : $num)) {
|
|
|
+$savnbfield = $totalarray['nbfield'];
|
|
|
+$totalarray['nbfield'] = 0;
|
|
|
+$imaxinloop = ($limit ? min($num, $limit) : $num);
|
|
|
+while ($i < $imaxinloop) {
|
|
|
$obj = $db->fetch_object($resql);
|
|
|
if (empty($obj)) {
|
|
|
break; // Should not happen
|
|
|
@@ -581,115 +605,132 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
|
|
|
|
|
|
// Store properties in $object
|
|
|
$object->setVarsFromFetchObj($obj);
|
|
|
+
|
|
|
$object->usergroups = WorkstationUserGroup::getAllGroupsOfWorkstation($obj->rowid);
|
|
|
$object->resources = WorkstationResource::getAllResourcesOfWorkstation($obj->rowid);
|
|
|
|
|
|
- // Show here line of result
|
|
|
- print '<tr class="oddeven">';
|
|
|
- foreach ($object->fields as $key => $val) {
|
|
|
- $cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
- if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
|
|
|
- $cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
- } elseif ($key == 'status') {
|
|
|
- $cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
+ if ($mode == 'kanban') {
|
|
|
+ if ($i == 0) {
|
|
|
+ print '<tr><td colspan="'.$savnbfield.'">';
|
|
|
+ print '<div class="box-flex-container">';
|
|
|
}
|
|
|
-
|
|
|
- if (in_array($val['type'], array('timestamp'))) {
|
|
|
- $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
|
|
|
- } elseif ($key == 'ref') {
|
|
|
- $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
|
|
|
+ // Output Kanban
|
|
|
+ print $object->getKanbanView('');
|
|
|
+ if ($i == ($imaxinloop - 1)) {
|
|
|
+ print '</div>';
|
|
|
+ print '</td></tr>';
|
|
|
}
|
|
|
+ } else {
|
|
|
+ // Show here line of result
|
|
|
+ $j = 0;
|
|
|
+ print '<tr data-rowid="'.$object->id.'" class="oddeven">';
|
|
|
+ foreach ($object->fields as $key => $val) {
|
|
|
+ $cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
+ if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
|
|
|
+ $cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
+ } elseif ($key == 'status') {
|
|
|
+ $cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
+ }
|
|
|
|
|
|
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
|
|
|
- $cssforfield .= ($cssforfield ? ' ' : '').'right';
|
|
|
- }
|
|
|
- //if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
|
|
|
-
|
|
|
- if (!empty($arrayfields['t.'.$key]['checked'])) {
|
|
|
- print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
|
|
|
- if ($key == 'status') {
|
|
|
- print $object->getLibStatut(5);
|
|
|
- } else {
|
|
|
- print $object->showOutputField($val, $key, $object->$key, '');
|
|
|
+ if (in_array($val['type'], array('timestamp'))) {
|
|
|
+ $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
|
|
|
+ } elseif ($key == 'ref') {
|
|
|
+ $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
|
|
|
}
|
|
|
- print '</td>';
|
|
|
- if (!$i) {
|
|
|
- $totalarray['nbfield']++;
|
|
|
+
|
|
|
+ if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
|
|
|
+ $cssforfield .= ($cssforfield ? ' ' : '').'right';
|
|
|
}
|
|
|
- if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
|
|
|
- if (!$i) {
|
|
|
- $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
|
|
|
+ //if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
|
|
|
+
|
|
|
+ if (!empty($arrayfields['t.'.$key]['checked'])) {
|
|
|
+ print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
|
|
|
+ if ($key == 'status') {
|
|
|
+ print $object->getLibStatut(5);
|
|
|
+ } elseif ($key == 'rowid') {
|
|
|
+ print $object->showOutputField($val, $key, $object->id, '');
|
|
|
+ } else {
|
|
|
+ print $object->showOutputField($val, $key, $object->$key, '');
|
|
|
}
|
|
|
- if (!isset($totalarray['val'])) {
|
|
|
- $totalarray['val'] = array();
|
|
|
+ print '</td>';
|
|
|
+ if (!$i) {
|
|
|
+ $totalarray['nbfield']++;
|
|
|
}
|
|
|
- if (!isset($totalarray['val']['t.'.$key])) {
|
|
|
- $totalarray['val']['t.'.$key] = 0;
|
|
|
+ if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
|
|
|
+ if (!$i) {
|
|
|
+ $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
|
|
|
+ }
|
|
|
+ if (!isset($totalarray['val'])) {
|
|
|
+ $totalarray['val'] = array();
|
|
|
+ }
|
|
|
+ if (!isset($totalarray['val']['t.'.$key])) {
|
|
|
+ $totalarray['val']['t.'.$key] = 0;
|
|
|
+ }
|
|
|
+ $totalarray['val']['t.'.$key] += $object->$key;
|
|
|
}
|
|
|
- $totalarray['val']['t.'.$key] += $object->$key;
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
|
|
|
- $toprint = array();
|
|
|
- $cssforli = '';
|
|
|
- if (count($object->usergroups) >= 4) {
|
|
|
- $cssforli = 'tdoverflowmax60';
|
|
|
- } elseif (count($object->usergroups) >= 2) {
|
|
|
- $cssforli = 'tdoverflowmax80';
|
|
|
- }
|
|
|
- foreach ($object->usergroups as $id_group) {
|
|
|
- $g = new UserGroup($db);
|
|
|
- $g->fetch($id_group);
|
|
|
- $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
|
|
|
+ if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
|
|
|
+ $toprint = array();
|
|
|
+ $cssforli = '';
|
|
|
+ if (count($object->usergroups) >= 4) {
|
|
|
+ $cssforli = 'tdoverflowmax60';
|
|
|
+ } elseif (count($object->usergroups) >= 2) {
|
|
|
+ $cssforli = 'tdoverflowmax80';
|
|
|
+ }
|
|
|
+ foreach ($object->usergroups as $id_group) {
|
|
|
+ $g = new UserGroup($db);
|
|
|
+ $g->fetch($id_group);
|
|
|
+ $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
|
|
|
+ }
|
|
|
+
|
|
|
+ print '<td>';
|
|
|
+ print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
|
|
|
+ print '</td>';
|
|
|
}
|
|
|
|
|
|
- print '<td>';
|
|
|
- print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
|
|
|
- print '</td>';
|
|
|
- }
|
|
|
+ if (!empty($arrayfields['wr.fk_resource']['checked'])) {
|
|
|
+ $toprint = array();
|
|
|
+ $cssforli = '';
|
|
|
+ if (count($object->resources) >= 4) {
|
|
|
+ $cssforli = 'tdoverflowmax60';
|
|
|
+ } elseif (count($object->resources) >= 2) {
|
|
|
+ $cssforli = 'tdoverflowmax80';
|
|
|
+ }
|
|
|
+ foreach ($object->resources as $id_resource) {
|
|
|
+ $r = new Dolresource($db);
|
|
|
+ $r->fetch($id_resource);
|
|
|
+ $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
|
|
|
+ }
|
|
|
|
|
|
- if (!empty($arrayfields['wr.fk_resource']['checked'])) {
|
|
|
- $toprint = array();
|
|
|
- $cssforli = '';
|
|
|
- if (count($object->resources) >= 4) {
|
|
|
- $cssforli = 'tdoverflowmax60';
|
|
|
- } elseif (count($object->resources) >= 2) {
|
|
|
- $cssforli = 'tdoverflowmax80';
|
|
|
- }
|
|
|
- foreach ($object->resources as $id_resource) {
|
|
|
- $r = new Dolresource($db);
|
|
|
- $r->fetch($id_resource);
|
|
|
- $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
|
|
|
+ print '<td>';
|
|
|
+ print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
|
|
|
+ print '</td>';
|
|
|
}
|
|
|
|
|
|
- print '<td>';
|
|
|
- print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
|
|
|
+ // Extra fields
|
|
|
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
|
|
|
+ // Fields from hook
|
|
|
+ $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
|
|
|
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
+ print $hookmanager->resPrint;
|
|
|
+ // Action column
|
|
|
+ print '<td class="nowrap center">';
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+ print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
|
|
+ }
|
|
|
print '</td>';
|
|
|
- }
|
|
|
-
|
|
|
- // Extra fields
|
|
|
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
|
|
|
- // Fields from hook
|
|
|
- $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
|
|
|
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
- print $hookmanager->resPrint;
|
|
|
- // Action column
|
|
|
- print '<td class="nowrap center">';
|
|
|
- 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;
|
|
|
+ if (!$i) {
|
|
|
+ $totalarray['nbfield']++;
|
|
|
}
|
|
|
- print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
|
|
- }
|
|
|
- print '</td>';
|
|
|
- if (!$i) {
|
|
|
- $totalarray['nbfield']++;
|
|
|
- }
|
|
|
|
|
|
- print '</tr>'."\n";
|
|
|
+ print '</tr>'."\n";
|
|
|
+ }
|
|
|
|
|
|
$i++;
|
|
|
}
|
|
|
@@ -705,7 +746,7 @@ if ($num == 0) {
|
|
|
$colspan++;
|
|
|
}
|
|
|
}
|
|
|
- print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
|
|
|
+ print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
|
|
|
}
|
|
|
|
|
|
|
Laurent Destailleur