--- /tmp/dsg/dolibarr/htdocs/fichinter/github_card-rec.php +++ /tmp/dsg/dolibarr/htdocs/fichinter/client_card-rec.php @@ -51,7 +51,7 @@ // Security check $id = (GETPOST('fichinterid', 'int') ?GETPOST('fichinterid', 'int') : GETPOST('id', 'int')); -$action = GETPOST('action', 'aZ09'); +$action = GETPOST('action', 'alpha'); if ($user->socid) $socid = $user->socid; $objecttype = 'fichinter_rec'; if ($action == "create" || $action == "add") $objecttype = ''; @@ -131,7 +131,7 @@ if (!$error) { $object->id_origin = $id; $object->title = GETPOST('titre', 'alpha'); - $object->description = GETPOST('description', 'restricthtml'); + $object->description = GETPOST('description', 'alpha'); $object->socid = GETPOST('socid', 'alpha'); $object->fk_project = GETPOST('projectid', 'int'); $object->fk_contract = GETPOST('contractid', 'int'); @@ -256,7 +256,7 @@ print ''; print ''; - print dol_get_fiche_head(); + dol_fiche_head(); $rowspan = 4; if (!empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++; @@ -277,7 +277,7 @@ // Title print '
'; print " |
---|
'.$langs->trans("TotalDuration").' | '; + print ''.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' | '; + print '
'.$langs->trans("TotalDuration").' | '; - print ''.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' | '; - print '
'; - } - print ' | '.$langs->trans('Description').' | '; print ''.$langs->trans('Date').' | '; print ''.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').' | '; @@ -1372,18 +1397,15 @@ print ''; print " | ||||||||||
'.($i + 1).' | '; - } - print ''; print ''; // ancre pour retourner sur la ligne print dol_htmlentitiesbr($objp->description); @@ -1396,7 +1418,8 @@ print " | \n"; - // Icon to edit and delete + + // Econ to edit and delete if ($object->statut == 0 && $user->rights->ficheinter->creer) { print ''; @@ -1423,7 +1446,9 @@ } } print ' | '; - } else { + } + else + { print ''; } @@ -1443,12 +1468,6 @@ if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id', 'int') == $objp->rowid) { print ' | |||||||||||
'.($i + 1).' | '; - } - print ''; print ''; // ancre pour retourner sur la ligne @@ -1460,26 +1479,26 @@ // Date d'intervention print ' | '; - if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) { - print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention"); - } else { - print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention"); - } + if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) { + print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention"); + } else { + print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention"); + } print ' | '; - // Duration - print ''; - if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) { - $selectmode = 'select'; - if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) - $selectmode = 'text'; - $form->select_duration('duration', $objp->duree, 0, $selectmode); - } - print ' | '; - - print ''; - print ''; - print ' | '; + // Duration + print ''; + if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) { + $selectmode = 'select'; + if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) + $selectmode = 'text'; + $form->select_duration('duration', $objp->duree, 0, $selectmode); + } + print ' | '; + + print ''; + print ''; + print ' | '; print '
'; - } - - print ' | '; - print ''; // ancre - print $langs->trans('Description').' | '; - print ''.$langs->trans('Date').' | '; - print ''.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').' | '; - print ''; - print " |
'.$langs->trans("NbOfAttachedFiles").' | '.count($filearray).' | ||
'.$langs->trans("TotalSizeOfAttachedFiles").' | '.dol_print_size($totalsize, 1, 1).' |
'.$langs->trans("NbOfAttachedFiles").' | '.count($filearray).' | ||
'.$langs->trans("TotalSizeOfAttachedFiles").' | '.dol_print_size($totalsize, 1, 1).' |
'.$langs->trans("Search").' | ||
'; - print $langs->trans("Intervention").': |
'.$langs->trans("Search").' | ||
'; + print $langs->trans("Intervention").': |
'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").' | |
---|---|
'; - - include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; - $dolgraph = new DolGraph(); - $dolgraph->SetData($dataseries); - $dolgraph->SetDataColor(array_values($colorseries)); - $dolgraph->setShowLegend(2); - $dolgraph->setShowPercent(1); - $dolgraph->SetType(array('pie')); - $dolgraph->setHeight('200'); - $dolgraph->draw('idgraphstatus'); - print $dolgraph->show($total ? 0 : 1); - - print ' | |
'.$fichinterstatic->LibStatut($status, $bool, 0).' | '; - print ''.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' '; - print $fichinterstatic->LibStatut($status, $bool, 3); - print ''; - print ' | '; - print "
'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").') | '.$totalinprocess.' |
'.$langs->trans("Total").' | '.$total.' |
'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").' | |
---|---|
'; + + include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; + $dolgraph = new DolGraph(); + $dolgraph->SetData($dataseries); + $dolgraph->SetDataColor(array_values($colorseries)); + $dolgraph->setShowLegend(2); + $dolgraph->setShowPercent(1); + $dolgraph->SetType(array('pie')); + $dolgraph->setHeight('200'); + $dolgraph->draw('idgraphstatus'); + print $dolgraph->show($total ? 0 : 1); + + print ' | |
'.$fichinterstatic->LibStatut($status, $bool, 0).' | '; + print ''.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' '; + print $fichinterstatic->LibStatut($status, $bool, 3); + print ''; + print ' | '; + print "
'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").') | '.$totalinprocess.' |
'.$langs->trans("Total").' | '.$total.' |
'.$langs->trans("DraftFichinter").' |
---|
'.$langs->trans("LastModifiedInterventions", $max).' |
---|
'.$langs->trans("FichinterToProcess").' '.$num.' |
---|