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

Merge pull request #23474 from lamrani002/kanbanForListIntervention

Browse Source 
NEW kanbanView for Intervention List
This commit is contained in:
Laurent Destailleur 2023-01-11 20:57:17 +01:00 committed by GitHub
commit ff2835167a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 231 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/fichinter/class/fichinter.class.php
View File

@ -1454,6 +1454,38 @@ class Fichinter extends CommonObject
return -1; return -1;
} }
} }
/**
* Return clicable link of object (with eventually picto)
*
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
* @return string HTML Code for Kanban thumb.
*/
public function getKanbanView($option = '')
{
global $langs;
$return = '<div class="box-flex-item box-flex-grow-zero">';
$return .= '<div class="info-box info-box-sm">';
$return .= '<span class="info-box-icon bg-infobox-action">';
$return .= img_picto('', $this->picto);
//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
$return .= '</span>';
$return .= '<div class="info-box-content">';
$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
if (property_exists($this, 'socid')) {
$return .= '<br><span class="info-box-label">'.$this->socid.'</span>';
}
if (property_exists($this, 'duration')) {
$return .= '<br><span class="info-box-label ">'.$langs->trans("Duration").' : '.convertSecondToTime($this->duration, 'allhourmin').'</span>';
}
if (method_exists($this, 'getLibStatut')) {
$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
}
$return .= '</div>';
$return .= '</div>';
$return .= '</div>';
return $return;
}
} }
/** /**

375
htdocs/fichinter/list.php
View File

@ -57,6 +57,7 @@ $show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha'); $confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array'); $toselect = GETPOST('toselect', 'array');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'interventionlist'; $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'interventionlist';
$mode = GETPOST('mode', 'alpha');
$search_ref = GETPOST('search_ref') ?GETPOST('search_ref', 'alpha') : GETPOST('search_inter', 'alpha'); $search_ref = GETPOST('search_ref') ?GETPOST('search_ref', 'alpha') : GETPOST('search_inter', 'alpha');
$search_ref_client = GETPOST('search_ref_client', 'alpha'); $search_ref_client = GETPOST('search_ref_client', 'alpha');
@ -460,7 +461,10 @@ $url = DOL_URL_ROOT.'/fichinter/card.php?action=create';
if (!empty($socid)) { if (!empty($socid)) {
$url .= '&socid='.$socid; $url .= '&socid='.$socid;
} }
$newcardbutton = dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer); $newcardbutton = '';
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
$newcardbutton .= dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer);
print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
@ -695,200 +699,219 @@ while ($i < $imaxinloop) {
$companystatic->email = $obj->email; $companystatic->email = $obj->email;
$companystatic->status = $obj->thirdpartystatus; $companystatic->status = $obj->thirdpartystatus;
print '<tr class="oddeven">'; //mode kanban
// Action column if ($mode == 'kanban') {
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { if ($i == 0) {
print '<td class="nowrap center">'; print '<tr><td colspan="12">';
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined print '<div class="box-flex-container">';
$selected = 0;
if (in_array($obj->rowid, $arrayofselected)) {
$selected = 1;
}
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
} }
print '</td>';
}
if (!empty($arrayfields['f.ref']['checked'])) {
print "<td>";
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; // Output Kanban
// Picto + Ref $objectstatic->duration = $obj->duree;
print '<td class="nobordernopadding nowraponall">'; $objectstatic->socid = $companystatic->getNomUrl(1, '', 44);
print $objectstatic->getNomUrl(1);
print '</td>';
// Warning print $objectstatic->getKanbanView('');
$warnornote = ''; if ($i == (min($num, $limit) - 1)) {
//if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->fichinter->warning_delay)) $warnornote.=img_warning($langs->trans("Late")); print '</div>';
if (!empty($obj->note_private)) { print '</td></tr>';
$warnornote .= ($warnornote ? ' ' : '');
$warnornote .= '<span class="note">';
$warnornote .= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
$warnornote .= '</span>';
} }
if ($warnornote) { } else {
print '<td style="min-width: 20px" class="nobordernopadding nowrap">'; print '<tr class="oddeven">';
print $warnornote; // Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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($obj->rowid, $arrayofselected)) {
$selected = 1;
}
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
}
print '</td>'; print '</td>';
} }
if (!empty($arrayfields['f.ref']['checked'])) {
print "<td>";
// Other picto tool print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="16" class="right nobordernopadding hideonsmartphone">'; // Picto + Ref
$filename = dol_sanitizeFileName($obj->ref); print '<td class="nobordernopadding nowraponall">';
$filedir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($obj->ref); print $objectstatic->getNomUrl(1);
$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid; print '</td>';
print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir); // Warning
print '</td></tr></table>'; $warnornote = '';
//if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->fichinter->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
if (!empty($obj->note_private)) {
$warnornote .= ($warnornote ? ' ' : '');
$warnornote .= '<span class="note">';
$warnornote .= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
$warnornote .= '</span>';
}
if ($warnornote) {
print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
print $warnornote;
print '</td>';
}
print "</td>\n"; // Other picto tool
if (!$i) { print '<td width="16" class="right nobordernopadding hideonsmartphone">';
$totalarray['nbfield']++; $filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($obj->ref);
$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
print '</td></tr></table>';
print "</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}
} }
} if (!empty($arrayfields['f.ref_client']['checked'])) {
if (!empty($arrayfields['f.ref_client']['checked'])) { // Customer ref
// Customer ref print '<td class="nowrap tdoverflowmax200">';
print '<td class="nowrap tdoverflowmax200">'; print dol_escape_htmltag($obj->ref_client);
print dol_escape_htmltag($obj->ref_client); print '</td>';
print '</td>'; if (!$i) {
if (!$i) { $totalarray['nbfield']++;
$totalarray['nbfield']++; }
} }
} if (!empty($arrayfields['s.nom']['checked'])) {
if (!empty($arrayfields['s.nom']['checked'])) { print '<td>';
print '<td>'; print $companystatic->getNomUrl(1, '', 44);
print $companystatic->getNomUrl(1, '', 44); print '</td>';
print '</td>'; if (!$i) {
if (!$i) { $totalarray['nbfield']++;
$totalarray['nbfield']++; }
} }
} if (!empty($arrayfields['pr.ref']['checked'])) {
if (!empty($arrayfields['pr.ref']['checked'])) { print '<td>';
print '<td>'; $projetstatic->id = $obj->projet_id;
$projetstatic->id = $obj->projet_id; $projetstatic->ref = $obj->projet_ref;
$projetstatic->ref = $obj->projet_ref; $projetstatic->title = $obj->projet_title;
$projetstatic->title = $obj->projet_title; if ($projetstatic->id > 0) {
if ($projetstatic->id > 0) { print $projetstatic->getNomUrl(1, '');
print $projetstatic->getNomUrl(1, ''); }
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
} }
print '</td>'; if (!empty($arrayfields['c.ref']['checked'])) {
if (!$i) { print '<td>';
$totalarray['nbfield']++; $contratstatic->id = $obj->contrat_id;
$contratstatic->ref = $obj->contrat_ref;
$contratstatic->ref_customer = $obj->contrat_ref_customer;
$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
if ($contratstatic->id > 0) {
print $contratstatic->getNomUrl(1, '');
print '</td>';
}
if (!$i) {
$totalarray['nbfield']++;
}
} }
} if (!empty($arrayfields['f.description']['checked'])) {
if (!empty($arrayfields['c.ref']['checked'])) { print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1)), 48).'</td>';
print '<td>'; if (!$i) {
$contratstatic->id = $obj->contrat_id; $totalarray['nbfield']++;
$contratstatic->ref = $obj->contrat_ref; }
$contratstatic->ref_customer = $obj->contrat_ref_customer; }
$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
if ($contratstatic->id > 0) { // Extra fields
print $contratstatic->getNomUrl(1, ''); 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
print $hookmanager->resPrint;
// Date creation
if (!empty($arrayfields['f.datec']['checked'])) {
print '<td class="center">';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Date modification
if (!empty($arrayfields['f.tms']['checked'])) {
print '<td class="center">';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Note public
if (!empty($arrayfields['f.note_public']['checked'])) {
print '<td class="center">';
print dol_string_nohtmltag($obj->note_public);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Note private
if (!empty($arrayfields['f.note_private']['checked'])) {
print '<td class="center">';
print dol_string_nohtmltag($obj->note_private);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Status
if (!empty($arrayfields['f.fk_statut']['checked'])) {
print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Fields of detail of line
if (!empty($arrayfields['fd.description']['checked'])) {
print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->descriptiondetail, 1)), 48).'</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields['fd.date']['checked'])) {
print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields['fd.duree']['checked'])) {
print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
if (!$i) {
$totalarray['nbfield']++;
}
if (!$i) {
$totalarray['type'][$totalarray['nbfield']] = 'duration';
}
if (!$i) {
$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
}
$totalarray['val']['fd.duree'] += $obj->duree;
}
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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($obj->rowid, $arrayofselected)) {
$selected = 1;
}
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
}
print '</td>'; print '</td>';
} }
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
}
if (!empty($arrayfields['f.description']['checked'])) {
print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1)), 48).'</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Extra fields print '</tr>'."\n";
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
print $hookmanager->resPrint;
// Date creation
if (!empty($arrayfields['f.datec']['checked'])) {
print '<td class="center">';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Date modification
if (!empty($arrayfields['f.tms']['checked'])) {
print '<td class="center">';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Note public
if (!empty($arrayfields['f.note_public']['checked'])) {
print '<td class="center">';
print dol_string_nohtmltag($obj->note_public);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Note private
if (!empty($arrayfields['f.note_private']['checked'])) {
print '<td class="center">';
print dol_string_nohtmltag($obj->note_private);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Status
if (!empty($arrayfields['f.fk_statut']['checked'])) {
print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Fields of detail of line
if (!empty($arrayfields['fd.description']['checked'])) {
print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->descriptiondetail, 1)), 48).'</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields['fd.date']['checked'])) {
print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields['fd.duree']['checked'])) {
print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
if (!$i) {
$totalarray['nbfield']++;
}
if (!$i) {
$totalarray['type'][$totalarray['nbfield']] = 'duration';
}
if (!$i) {
$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
}
$totalarray['val']['fd.duree'] += $obj->duree;
}
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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($obj->rowid, $arrayofselected)) {
$selected = 1;
}
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
}
print '</td>';
}
if (!$i) {
$totalarray['nbfield']++;
}
print '</tr>'."\n"; $total += $obj->duree;
}
$total += $obj->duree;
$i++; $i++;
} }