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

FIX Report of date of task suggested only if there is tasks

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-10 11:23:18 +02:00
parent df27824249
commit 3f3e8a84ff
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/projet/card.php
View File

@ -1153,11 +1153,14 @@ if ($action == 'create' && $user->rights->projet->creer) {
print $form->selectDate($object->date_start ? $object->date_start : -1, 'projectstart', 0, 0, 0, '', 1, 0);
print ' <span class="opacitymedium"> '.$langs->trans("to").' </span> ';
print $form->selectDate($object->date_end ? $object->date_end : -1, 'projectend', 0, 0, 0, '', 1, 0);
print ' &nbsp; &nbsp; <input type="checkbox" class="valignmiddle" id="reportdate" name="reportdate" value="yes" ';
if ($comefromclone) {
print ' checked ';
$object->getLinesArray(null, 0);
if (!empty($object->usage_task) && !empty($object->lines)) {
print ' <span id="divreportdate" class="hidden">&nbsp; &nbsp; <input type="checkbox" class="valignmiddle" id="reportdate" name="reportdate" value="yes" ';
if ($comefromclone) {
print ' checked ';
}
print '/><label for="reportdate" class="opacitymedium">'.$langs->trans("ProjectReportDate").'</label></span>';
}
print '/><label for="reportdate" class="opacitymedium">'.$langs->trans("ProjectReportDate").'</label>';
print '</td></tr>';
if (isModEnabled('eventorganization')) {
@ -1379,6 +1382,11 @@ if ($action == 'create' && $user->rights->projet->creer) {
jQuery("#usage_task").prop("checked", true);
}
});
jQuery("#projectstart").change(function() {
console.log("We modify the start date");
jQuery("#divreportdate").show();
});
});
</script>';

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

@ -2305,11 +2305,11 @@ class Project extends CommonObject
/**
* Create an array of tasks of current project
* Create an array of tasks of current project
*
* @param User $user Object user we want project allowed to
* @param User $user Object user we want project allowed to
* @param int $loadRoleMode 1= will test Roles on task; 0 used in delete project action
* @return int >0 if OK, <0 if KO
* @return int >0 if OK, <0 if KO
*/
public function getLinesArray($user, $loadRoleMode = 1)
{