diff --git a/htdocs/includes/modules/modProjet.class.php b/htdocs/includes/modules/modProjet.class.php index 8027ace0d8b..7b87c95dfaa 100644 --- a/htdocs/includes/modules/modProjet.class.php +++ b/htdocs/includes/modules/modProjet.class.php @@ -60,14 +60,14 @@ class modProjet extends DolibarrModules $this->special = 0; $this->picto='email'; - // Dļæ½pendances + // Dependancies $this->depends = array(); $this->requiredby = array(); - // Constantes + // Constants $this->const = array(); - // Boites + // Boxes $this->boxes = array(); // Permissions diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index cef1ecafcc1..d400b885dba 100755 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -5,9 +5,11 @@ Myprojects=My projects ProjectsArea=Projects area NewProject=New project AddProject=Add project -DeleteAProject=Supprimer un projet -OfficerProject=Officer project +DeleteAProject=Delete a project +DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? +ConfirmDeleteATask=Are you sure you want to delete this task ? +OfficerProject=Officer project LastProjects=Last %s projects AllProjects=All projects ProjectsList=List of projects diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 2a1d09ee49a..ab676c6276a 100755 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -6,8 +6,10 @@ ProjectsArea=Espace projet NewProject=Nouveau projet AddProject=Créer projet DeleteAProject=Supprimer un projet -OfficerProject=Responsable du projet +DeleteATask=Supprimer une tāche ConfirmDeleteAProject=Źtes-vous sūr de vouloir supprimer ce projet ? +ConfirmDeleteATask=Źtes-vous sūr de vouloir supprimer cette tāche ? +OfficerProject=Responsable du projet LastProjects=Les %s derniers projets AllProjects=Tous les projets ProjectsList=Liste des projets diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index 86870e08f6b..97c9f1005dd 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -188,7 +188,7 @@ else if ($_GET["action"] == 'delete') { - $html->form_confirm("fiche.php?id=".$_GET["id"],$langs->trans("DeleteAProject"),$langs->trans("ConfirmDeleteAProject"),"confirm_delete"); + $html->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"],$langs->trans("DeleteAProject"),$langs->trans("ConfirmDeleteAProject"),"confirm_delete"); print "
"; } diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index d7d3b384a7f..26695e46ae6 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -119,8 +119,7 @@ if ($_GET["id"]) if ($_GET["action"] == 'create' && $user->rights->projet->creer) { - print_titre($langs->trans("NewTask")); - print '
'; + print_fiche_titre($langs->trans("NewTask")); $tasksarray=$projet->getTasksArray(); @@ -171,11 +170,12 @@ else print ''.$langs->trans("Ref").''.$projet->ref.''; print ''.$langs->trans("Label").''.$projet->title.''; - print ''.$langs->trans("Company").''; if (! empty($projet->societe->id)) print $projet->societe->getNomUrl(1); else print ' '; - print ''; + print ''; + //print ' '; + print ''; $tasksarray=$projet->getTasksArray(); @@ -191,6 +191,7 @@ else print ''.$langs->trans("RefTask").''; print ''.$langs->trans("LabelTask").''; print ''.$langs->trans("TimeSpent").''; + print "\n"; $j=0; PLines($j, 0, $tasksarray, $level, true); @@ -205,7 +206,12 @@ else * Actions */ print '
'; - print ''.$langs->trans('AddTask').''; + + if ($user->rights->projet->creer) + { + print ''.$langs->trans('AddTask').''; + } + print '
'; } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 69740a6d1f8..7f17e9171e7 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -29,6 +29,35 @@ require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); if (!$user->rights->projet->lire) accessforbidden(); +/* + * Actions + */ + +if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->projet->creer) +{ + $task = new Task($db); + if ($task->fetch($_GET["id"]) >= 0 ) + { + $projet = new Project($db); + $result=$projet->fetch($task->fk_projet); + if (! empty($projet->socid)) + { + $projet->societe->fetch($projet->socid); + } + + if ($task->delete($user) >= 0) + { + Header("Location: index.php"); + exit; + } + else + { + $mesg=$task->error; + $_POST["action"]=''; + } + } +} + /* * View @@ -36,6 +65,8 @@ if (!$user->rights->projet->lire) accessforbidden(); llxHeader("",$langs->trans("Task")); +$html = new Form($db); + $projectstatic = new Project($db); @@ -63,6 +94,12 @@ if ($_GET["id"] > 0) dolibarr_fiche_head($head, 'tasks', $langs->trans("Tasks")); + if ($_GET["action"] == 'delete') + { + $html->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"],$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete"); + print "
"; + } + print '
'; print ''; print ''; @@ -78,7 +115,7 @@ if ($_GET["id"] > 0) /* Liste des tāches */ - $sql = "SELECT t.task_date, t.task_duration, t.fk_user, u.login"; + $sql = "SELECT t.task_date, t.task_duration, t.fk_user, u.login, u.rowid"; $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t"; $sql .= " , ".MAIN_DB_PREFIX."user as u"; $sql .= " WHERE t.fk_task =".$task->id; @@ -113,8 +150,8 @@ if ($_GET["id"] > 0) print '
'; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print "\n"; foreach ($tasks as $task_time) @@ -122,13 +159,27 @@ if ($_GET["id"] > 0) $var=!$var; print ""; print ''; - print ''; - print ''; + print ''; + $user->id=$task_time[4]; + $user->nom=$task_time[3]; + print ''; print "\n"; } print "
'.$langs->trans("Date").''.$langs->trans("TimeSpent").''.$langs->trans("User").''.$langs->trans("TimeSpent").''.$langs->trans("User").'
'.dolibarr_print_date($task_time[0],'day').''.$task_time[1].''.$task_time[3].''.$task_time[1].''.$user->getNomUrl(1).'
"; print ''; + + /* + * Actions + */ + print '
'; + + if ($user->rights->projet->creer) + { + print ''.$langs->trans('Delete').''; + } + + print '
'; } }