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

update with html5 compliant code

Browse Source
This commit is contained in:
Philippe GRAND 2019-03-14 14:18:44 +01:00
parent 6984cd25d8
commit 38822a9bb1
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -489,12 +489,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print "</td>\n"; print "</td>\n";
// Date start // Date start
print '<td align="center">'; print '<td class="center">';
print dol_print_date($lines[$i]->date_start, 'dayhour'); print dol_print_date($lines[$i]->date_start, 'dayhour');
print '</td>'; print '</td>';
// Date end // Date end
print '<td align="center">'; print '<td class="center">';
$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;
@ -509,7 +509,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT; if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
// Planned Workload (in working hours) // Planned Workload (in working hours)
print '<td align="right">'; print '<td class="right">';
$fullhour=convertSecondToTime($lines[$i]->planned_workload, $plannedworkloadoutputformat); $fullhour=convertSecondToTime($lines[$i]->planned_workload, $plannedworkloadoutputformat);
$workingdelay=convertSecondToTime($lines[$i]->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks $workingdelay=convertSecondToTime($lines[$i]->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
if ($lines[$i]->planned_workload != '') if ($lines[$i]->planned_workload != '')
@ -522,7 +522,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print '</td>'; print '</td>';
// Time spent // Time spent
print '<td align="right">'; print '<td class="right">';
if ($showlineingray) print '<i>'; if ($showlineingray) print '<i>';
else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">'; else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration, $timespentoutputformat); if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration, $timespentoutputformat);
@ -532,7 +532,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print '</td>'; print '</td>';
// Progress calculated (Note: ->duration is time spent) // Progress calculated (Note: ->duration is time spent)
print '<td align="right">'; print '<td class="right">';
if ($lines[$i]->planned_workload || $lines[$i]->duration) if ($lines[$i]->planned_workload || $lines[$i]->duration)
{ {
if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %'; if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';
@ -541,7 +541,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print '</td>'; print '</td>';
// Progress declared // Progress declared
print '<td align="right">'; print '<td class="right">';
if ($lines[$i]->progress != '') if ($lines[$i]->progress != '')
{ {
print $lines[$i]->progress.' %'; print $lines[$i]->progress.' %';
@ -572,7 +572,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
// Tick to drag and drop // Tick to drag and drop
if ($addordertick) if ($addordertick)
{ {
print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>'; print '<td class="tdlineupdown hideonsmartphone center">&nbsp;</td>';
} }
print "</tr>\n"; print "</tr>\n";
@ -605,15 +605,15 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
print '<td align="right" class="nowrap liste_total">'; print '<td class="nowrap liste_total right">';
print convertSecondToTime($total_projectlinesa_planned, 'allhourmin'); print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
print '</td>'; print '</td>';
print '<td align="right" class="nowrap liste_total">'; print '<td class="nowrap liste_total right">';
if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">'; if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
print convertSecondToTime($total_projectlinesa_spent, 'allhourmin'); print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
if ($projectidfortotallink > 0) print '</a>'; if ($projectidfortotallink > 0) print '</a>';
print '</td>'; print '</td>';
print '<td align="right" class="nowrap liste_total">'; print '<td class="nowrap liste_total right">';
if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2).' %'; if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2).' %';
print '</td>'; print '</td>';
print '<td></td>'; print '<td></td>';
@ -773,7 +773,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
print "</td>\n"; print "</td>\n";
// Date // Date
print '<td align="center">'; print '<td class="center">';
print dol_print_date($lines[$i]->timespent_datehour, 'day'); print dol_print_date($lines[$i]->timespent_datehour, 'day');
print '</td>'; print '</td>';
@ -794,7 +794,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
} }
// Hour // Hour
print '<td class="nowrap" align="center">'; print '<td class="nowrap center">';
print dol_print_date($lines[$i]->timespent_datehour, 'hour'); print dol_print_date($lines[$i]->timespent_datehour, 'hour');
print '</td>'; print '</td>';
@ -804,7 +804,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon '; elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
// Duration // Duration
print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">'; print '<td class="duration'.($cssonholiday?' '.$cssonholiday:'').' center">';
$dayWorkLoad = $lines[$i]->timespent_duration; $dayWorkLoad = $lines[$i]->timespent_duration;
$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration; $totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
@ -825,14 +825,14 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
print '</td>'; print '</td>';
// Note // Note
print '<td align="center">'; print '<td class="center">';
print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>'; print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
print $lines[$i]->timespent_note; print $lines[$i]->timespent_note;
print '</textarea>'; print '</textarea>';
print '</td>'; print '</td>';
// Warning // Warning
print '<td align="right">'; print '<td class="right">';
/*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject")); /*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
else if ($disabledtask) else if ($disabledtask)
{ {
@ -1001,18 +1001,18 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print "</td>\n"; print "</td>\n";
// Planned Workload // Planned Workload
print '<td align="right" class="leftborder plannedworkload">'; print '<td class="leftborder plannedworkload right">';
if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin'); if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
else print '--:--'; else print '--:--';
print '</td>'; print '</td>';
// Progress declared % // Progress declared %
print '<td align="right">'; print '<td class="right">';
print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress'); print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
print '</td>'; print '</td>';
// Time spent by everybody // Time spent by everybody
print '<td align="right">'; print '<td class="right">';
// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
if ($lines[$i]->duration) if ($lines[$i]->duration)
{ {
@ -1024,7 +1024,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print "</td>\n"; print "</td>\n";
// Time spent by user // Time spent by user
print '<td align="right">'; print '<td class="right">';
$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id); $tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin'); if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
else print '--:--'; else print '--:--';
@ -1047,7 +1047,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
} }
// Form to add new time // Form to add new time
print '<td class="nowrap leftborder" align="center">'; print '<td class="nowrap leftborder center">';
$tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask); $tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
print $tableCell; print $tableCell;
print '</td>'; print '</td>';
@ -1097,13 +1097,13 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print '</td>'; print '</td>';
// Note // Note
print '<td align="center">'; print '<td class="center">';
print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>'; print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
print '</textarea>'; print '</textarea>';
print '</td>'; print '</td>';
// Warning // Warning
print '<td align="right">'; print '<td class="right">';
if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject")); if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
elseif ($disabledtask) elseif ($disabledtask)
{ {
@ -1291,18 +1291,18 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
print "</td>\n"; print "</td>\n";
// Planned Workload // Planned Workload
print '<td align="right" class="leftborder plannedworkload">'; print '<td class="leftborder plannedworkload right">';
if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin'); if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
else print '--:--'; else print '--:--';
print '</td>'; print '</td>';
// Progress declared % // Progress declared %
print '<td align="right">'; print '<td class="right">';
print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress'); print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
print '</td>'; print '</td>';
// Time spent by everybody // Time spent by everybody
print '<td align="right">'; print '<td class="right">';
// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
if ($lines[$i]->duration) if ($lines[$i]->duration)
{ {
@ -1314,7 +1314,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
print "</td>\n"; print "</td>\n";
// Time spent by user // Time spent by user
print '<td align="right">'; print '<td class="right">';
$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id); $tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin'); if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
else print '--:--'; else print '--:--';
@ -1381,7 +1381,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
} }
// Warning // Warning
print '<td align="right">'; print '<td class="right">';
if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject")); if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
elseif ($disabledtask) elseif ($disabledtask)
{ {
@ -1629,36 +1629,36 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
print '</td>'; print '</td>';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{ {
print '<td align="right">'; print '<td class="right">';
if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency); if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
print '</td>'; print '</td>';
print '<td align="right">'; print '<td class="right">';
$code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code'); $code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
if ($code) print $langs->trans("OppStatus".$code); if ($code) print $langs->trans("OppStatus".$code);
print '</td>'; print '</td>';
} }
if (empty($conf->global->PROJECT_HIDE_TASKS)) if (empty($conf->global->PROJECT_HIDE_TASKS))
{ {
print '<td align="right">'.$objp->nb.'</td>'; print '<td class="right">'.$objp->nb.'</td>';
$plannedworkload=$objp->planned_workload; $plannedworkload=$objp->planned_workload;
$total_plannedworkload+=$plannedworkload; $total_plannedworkload+=$plannedworkload;
if (! in_array('plannedworkload', $hiddenfields)) if (! in_array('plannedworkload', $hiddenfields))
{ {
print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>'; print '<td class="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
} }
if (! in_array('declaredprogress', $hiddenfields)) if (! in_array('declaredprogress', $hiddenfields))
{ {
$declaredprogressworkload=$objp->declared_progess_workload; $declaredprogressworkload=$objp->declared_progess_workload;
$total_declaredprogressworkload+=$declaredprogressworkload; $total_declaredprogressworkload+=$declaredprogressworkload;
print '<td align="right">'; print '<td class="right">';
//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>"; //print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload, 0).'%':''); print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload, 0).'%':'');
print '</td>'; print '</td>';
} }
} }
print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>'; print '<td class="right">'.$projectstatic->getLibStatut(3).'</td>';
print "</tr>\n"; print "</tr>\n";
$total_task = $total_task + $objp->nb; $total_task = $total_task + $objp->nb;
@ -1673,14 +1673,14 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
print '<td colspan="2">'.$langs->trans("Total")."</td>"; print '<td colspan="2">'.$langs->trans("Total")."</td>";
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{ {
print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>'; print '<td class="liste_total right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>'; print '<td class="liste_total right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
} }
if (empty($conf->global->PROJECT_HIDE_TASKS)) if (empty($conf->global->PROJECT_HIDE_TASKS))
{ {
print '<td class="liste_total" align="right">'.$total_task.'</td>'; print '<td class="liste_total right">'.$total_task.'</td>';
if (! in_array('plannedworkload', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>'; if (! in_array('plannedworkload', $hiddenfields)) print '<td class="liste_total right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload, 0).'%':'').'</td>'; if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload, 0).'%':'').'</td>';
} }
print '<td class="liste_total"></td>'; print '<td class="liste_total"></td>';
print '</tr>'; print '</tr>';
@ -1702,7 +1702,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
print '<table width="100%">'; print '<table width="100%">';
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans("Year").'</td>'; print '<td>'.$langs->trans("Year").'</td>';
print '<td style="text-align:right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>'; print '<td class="right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';
print "</tr>\n"; print "</tr>\n";
print '</table></form>'; print '</table></form>';
} }