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

Look and feel v13

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-28 01:14:45 +01:00
parent 1685b5396c
commit 7c4599a5c5
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/project.lib.php
View File

@ -483,7 +483,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
$taskstatic->projectstatus = $lines[$i]->projectstatus; $taskstatic->projectstatus = $lines[$i]->projectstatus;
$taskstatic->progress = $lines[$i]->progress; $taskstatic->progress = $lines[$i]->progress;
$taskstatic->fk_statut = $lines[$i]->status; $taskstatic->fk_statut = $lines[$i]->status;
$taskstatic->datee = $lines[$i]->date_end; $taskstatic->date_start = $lines[$i]->date_start;
$taskstatic->date_end = $lines[$i]->date_end;
$taskstatic->datee = $lines[$i]->date_end; // deprecated
$taskstatic->planned_workload = $lines[$i]->planned_workload; $taskstatic->planned_workload = $lines[$i]->planned_workload;
$taskstatic->duration_effective = $lines[$i]->duration; $taskstatic->duration_effective = $lines[$i]->duration;

1
htdocs/langs/en_US/main.lang
View File

@ -258,6 +258,7 @@ Cards=Cards
Card=Card Card=Card
Now=Now Now=Now
HourStart=Start hour HourStart=Start hour
Deadline=Deadline
Date=Date Date=Date
DateAndHour=Date and hour DateAndHour=Date and hour
DateToday=Today's date DateToday=Today's date

6
htdocs/projet/class/task.class.php
View File

@ -50,9 +50,9 @@ class Task extends CommonObject
public $fk_element = 'fk_task'; public $fk_element = 'fk_task';
/** /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png * @var string String with name of icon for myobject.
*/ */
public $picto = 'task'; public $picto = 'projecttask';
/** /**
* @var array List of child tables. To test if we can delete object. * @var array List of child tables. To test if we can delete object.
@ -648,7 +648,7 @@ class Task extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = ''; $result = '';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowTask").'</u>'; $label = img_picto('', $this->picto).' <u>'.$langs->trans("Task").'</u>';
if (!empty($this->ref)) if (!empty($this->ref))
$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref; $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
if (!empty($this->label)) if (!empty($this->label))

10
htdocs/projet/tasks.php
View File

@ -106,7 +106,7 @@ $arrayfields = array(
't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>2), 't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>2),
't.description'=>array('label'=>$langs->trans("Description"), 'checked'=>0, 'position'=>3), 't.description'=>array('label'=>$langs->trans("Description"), 'checked'=>0, 'position'=>3),
't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>4), 't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>4),
't.datee'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>5), 't.datee'=>array('label'=>$langs->trans("Deadline"), 'checked'=>1, 'position'=>5),
't.planned_workload'=>array('label'=>$langs->trans("PlannedWorkload"), 'checked'=>1, 'position'=>6), 't.planned_workload'=>array('label'=>$langs->trans("PlannedWorkload"), 'checked'=>1, 'position'=>6),
't.duration_effective'=>array('label'=>$langs->trans("TimeSpent"), 'checked'=>1, 'position'=>7), 't.duration_effective'=>array('label'=>$langs->trans("TimeSpent"), 'checked'=>1, 'position'=>7),
't.progress_calculated'=>array('label'=>$langs->trans("ProgressCalculated"), 'checked'=>1, 'position'=>8), 't.progress_calculated'=>array('label'=>$langs->trans("ProgressCalculated"), 'checked'=>1, 'position'=>8),
@ -220,8 +220,8 @@ if ($action == 'createtask' && $user->rights->projet->creer)
// If we use user timezone, we must change also view/list to use user timezone everywhere // If we use user timezone, we must change also view/list to use user timezone everywhere
//$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user'); //$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
//$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user'); //$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
$date_start = dol_mktime($_POST['dateohour'], $_POST['dateomin'], 0, $_POST['dateomonth'], $_POST['dateoday'], $_POST['dateoyear']); $date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
$date_end = dol_mktime($_POST['dateehour'], $_POST['dateemin'], 0, $_POST['dateemonth'], $_POST['dateeday'], $_POST['dateeyear']); $date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
if (!$cancel) if (!$cancel)
{ {
@ -245,7 +245,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
if (!$error) if (!$error)
{ {
$tmparray = explode('_', $_POST['task_parent']); $tmparray = explode('_', GETPOST('task_parent'));
$projectid = $tmparray[0]; $projectid = $tmparray[0];
if (empty($projectid)) $projectid = $id; // If projectid is '' if (empty($projectid)) $projectid = $id; // If projectid is ''
$task_parent = $tmparray[1]; $task_parent = $tmparray[1];
@ -345,7 +345,7 @@ if ($id > 0 || !empty($ref))
//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete; //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
$tab = GETPOST('tab') ?GETPOST('tab') : 'tasks'; $tab = (GETPOSTISSET('tab') ? GETPOST('tab') : 'tasks');
$head = project_prepare_head($object); $head = project_prepare_head($object);
print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));

4
htdocs/projet/tasks/list.php
View File

@ -119,7 +119,7 @@ $arrayfields = array(
't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>80), 't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>80),
't.description'=>array('label'=>$langs->trans("Description"), 'checked'=>0, 'position'=>80), 't.description'=>array('label'=>$langs->trans("Description"), 'checked'=>0, 'position'=>80),
't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>100), 't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>100),
't.datee'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>101), 't.datee'=>array('label'=>$langs->trans("Deadline"), 'checked'=>1, 'position'=>101),
'p.ref'=>array('label'=>$langs->trans("ProjectRef"), 'checked'=>1), 'p.ref'=>array('label'=>$langs->trans("ProjectRef"), 'checked'=>1),
'p.title'=>array('label'=>$langs->trans("ProjectLabel"), 'checked'=>0), 'p.title'=>array('label'=>$langs->trans("ProjectLabel"), 'checked'=>0),
's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>0), 's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>0),
@ -654,7 +654,7 @@ while ($i < min($num, $limit))
$object->description = $obj->description; $object->description = $obj->description;
$object->fk_statut = $obj->fk_statut; $object->fk_statut = $obj->fk_statut;
$object->progress = $obj->progress; $object->progress = $obj->progress;
$object->datee = $db->jdate($obj->date_end); // deprecated $object->date_start = $db->jdate($obj->date_start);
$object->date_end = $db->jdate($obj->date_end); $object->date_end = $db->jdate($obj->date_end);
$object->planned_workload = $obj->planned_workload; $object->planned_workload = $obj->planned_workload;
$object->duration_effective = $obj->duration_effective; $object->duration_effective = $obj->duration_effective;

4
htdocs/projet/tasks/task.php
View File

@ -417,7 +417,7 @@ if ($id > 0 || !empty($ref))
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("Deadline").'</td><td>';
print $form->selectDate($object->date_end ? $object->date_end : -1, 'datee', 1, 1, 0, '', 1, 0); print $form->selectDate($object->date_end ? $object->date_end : -1, 'datee', 1, 1, 0, '', 1, 0);
print '</td></tr>'; print '</td></tr>';
@ -513,7 +513,7 @@ if ($id > 0 || !empty($ref))
print '</td></tr>'; print '</td></tr>';
// Date start - Date end // Date start - Date end
print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">'; print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("Deadline").'</td><td colspan="3">';
$start = dol_print_date($object->date_start, 'dayhour'); $start = dol_print_date($object->date_start, 'dayhour');
print ($start ? $start : '?'); print ($start ? $start : '?');
$end = dol_print_date($object->date_end, 'dayhour'); $end = dol_print_date($object->date_end, 'dayhour');