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

FIX avoid unnecessary multiple calculation (#22637)

Browse Source
This commit is contained in:
Regis Houssin 2022-10-20 14:47:55 +02:00
parent 69ca6c02d7
commit 765e619cee
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1226,13 +1226,14 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
print convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin'); print convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
$modeinput = 'hours'; // Comment for avoid unnecessary multiple calculation
/*$modeinput = 'hours';
print '<script type="text/javascript">'; print '<script type="text/javascript">';
print "jQuery(document).ready(function () {\n"; print "jQuery(document).ready(function () {\n";
print " jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });"; print " jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
print "})\n"; print "})\n";
print '</script>'; print '</script>';*/
print '</td>'; print '</td>';
@ -1613,13 +1614,14 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
//$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">'; //$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
print $tableCell; print $tableCell;
$modeinput = 'hours'; // Comment for avoid unnecessary multiple calculation
/*$modeinput = 'hours';
print '<script type="text/javascript">'; print '<script type="text/javascript">';
print "jQuery(document).ready(function () {\n"; print "jQuery(document).ready(function () {\n";
print " jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });"; print " jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
print "})\n"; print "})\n";
print '</script>'; print '</script>';*/
print '</td>'; print '</td>';

9
htdocs/projet/activity/perday.php
View File

@ -795,12 +795,12 @@ print '</div>';
print '</form>'; print '</form>';
$modeinput = 'hours'; if (!empty($conf->use_javascript_ajax)) {
$modeinput = 'hours';
if ($conf->use_javascript_ajax) {
print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n"; print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n";
print '<script type="text/javascript">'."\n"; print '<script type="text/javascript">'."\n";
print "jQuery(document).ready(function () {\n"; print "jQuery(document).ready(function () {\n";
print " updateTotal(0,\''.$modeinput.'\');\n";
print ' jQuery(".timesheetalreadyrecorded").tooltip({ print ' jQuery(".timesheetalreadyrecorded").tooltip({
show: { collision: "flipfit", effect:\'toggle\', delay:50 }, show: { collision: "flipfit", effect:\'toggle\', delay:50 },
hide: { effect:\'toggle\', delay: 50 }, hide: { effect:\'toggle\', delay: 50 },
@ -809,8 +809,7 @@ if ($conf->use_javascript_ajax) {
return \''.dol_escape_js($langs->trans("TimeAlreadyRecorded", $usertoprocess->getFullName($langs))).'\'; return \''.dol_escape_js($langs->trans("TimeAlreadyRecorded", $usertoprocess->getFullName($langs))).'\';
} }
});'."\n"; });'."\n";
print " jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
print ' updateTotal(0,\''.$modeinput.'\');';
print "\n});\n"; print "\n});\n";
print '</script>'; print '</script>';
} }