X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/8f7f616dc5fafe49038c6eaff25f6fe6f55ca635..6c92bed7b97ace08101baa84c8aa171e5d127c28:/profile_edit.php

diff --git a/profile_edit.php b/profile_edit.php
index eaa9b2ae..7ce14f66 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -62,6 +62,7 @@ if ($request->isPost()) {
     $cl_project_required = $request->getParameter('project_required');
     $cl_task_required = $request->getParameter('task_required');
     $cl_record_type = $request->getParameter('record_type');
+    $cl_allow_overlap = $request->getParameter('allow_overlap');
     $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
     $cl_bcc_email = trim($request->getParameter('bcc_email'));
 
@@ -96,6 +97,7 @@ if ($request->isPost()) {
     $cl_project_required = $user->project_required;
     $cl_task_required = $user->task_required;
     $cl_record_type = $user->record_type;
+    $cl_allow_overlap = $user->allow_overlap;
     $cl_uncompleted_indicators = $user->uncompleted_indicators;
     $cl_bcc_email = $user->bcc_email;
 
@@ -189,11 +191,11 @@ if ($user->canManageTeam()) {
   $record_type_options[TYPE_DURATION] = $i18n->getKey('form.profile.type_duration');
   $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
 
-  // Prepare uncompleted indicators choices.
-  $uncompleted_indicators_options = array();
-  $uncompleted_indicators_options[UNCOMPLETED_INDICATORS_NONE] = $i18n->getKey('form.profile.uncompleted_indicators_none');
-  $uncompleted_indicators_options[UNCOMPLETED_INDICATORS] = $i18n->getKey('form.profile.uncompleted_indicators_show');
-  $form->addInput(array('type'=>'combobox','name'=>'uncompleted_indicators','style'=>'width: 150px;','data'=>$uncompleted_indicators_options,'value'=>$cl_uncompleted_indicators));
+  // Allow overlap checkbox.
+  $form->addInput(array('type'=>'checkbox','name'=>'allow_overlap','value'=>$cl_allow_overlap));
+
+  // Uncompleted indicators checkbox.
+  $form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value'=>$cl_uncompleted_indicators));
 
   // Add bcc email control, for manager only.
   if ($user->isManager()) {
@@ -283,9 +285,13 @@ if ($request->isPost()) {
 
       $plugins = trim($plugins, ',');
 
-      // Prepare config string. At this time we only handle show_holidays here.
+      // Prepare config string.
       if ($cl_show_holidays)
         $config .= ',show_holidays';
+      if ($cl_allow_overlap)
+        $config .= ',allow_overlap';
+      if ($cl_uncompleted_indicators)
+        $config .= ',uncompleted_indicators';
       $config = trim($config, ',');
 
       $update_result = ttTeamHelper::update($user->team_id, array(