From 92509c43c452daea115a4f6e99d94bda5538c8f0 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 8 Feb 2015 16:13:05 -0500 Subject: Add user calendar view on the dashboard and in the user management section --- app/Controller/App.php | 3 +- app/Controller/Calendar.php | 30 ++++++++++-- app/Controller/User.php | 14 ++++++ app/Core/Helper.php | 1 + app/Locale/da_DK/translations.php | 2 + app/Locale/de_DE/translations.php | 2 + app/Locale/es_ES/translations.php | 2 + app/Locale/fi_FI/translations.php | 2 + app/Locale/fr_FR/translations.php | 2 + app/Locale/hu_HU/translations.php | 2 + app/Locale/it_IT/translations.php | 2 + app/Locale/ja_JP/translations.php | 2 + app/Locale/pl_PL/translations.php | 2 + app/Locale/pt_BR/translations.php | 2 + app/Locale/ru_RU/translations.php | 2 + app/Locale/sv_SE/translations.php | 2 + app/Locale/th_TH/translations.php | 2 + app/Locale/zh_CN/translations.php | 2 + app/Model/Acl.php | 2 +- app/Template/app/dashboard.php | 10 ++++ app/Template/user/calendar.php | 5 ++ app/Template/user/sidebar.php | 3 ++ assets/css/app.css | 5 +- assets/css/src/dashboard.css | 4 ++ assets/js/app.js | 19 ++++---- assets/js/src/calendar.js | 99 ++++++++++++++++++++++++++++----------- 26 files changed, 181 insertions(+), 42 deletions(-) create mode 100644 app/Template/user/calendar.php diff --git a/app/Controller/App.php b/app/Controller/App.php index c4ed0fb8..ef0a08a9 100644 --- a/app/Controller/App.php +++ b/app/Controller/App.php @@ -68,10 +68,11 @@ class App extends Base $this->response->html($this->template->layout('app/dashboard', array( 'title' => t('Dashboard'), 'board_selector' => $this->projectPermission->getAllowedProjects($user_id), - 'events' => $this->projectActivity->getProjects($project_ids, 10), + 'events' => $this->projectActivity->getProjects($project_ids, 5), 'task_paginator' => $task_paginator, 'subtask_paginator' => $subtask_paginator, 'project_paginator' => $project_paginator, + 'user_id' => $user_id, ))); } diff --git a/app/Controller/Calendar.php b/app/Controller/Calendar.php index 6b0c8619..abbcab7f 100644 --- a/app/Controller/Calendar.php +++ b/app/Controller/Calendar.php @@ -2,6 +2,8 @@ namespace Controller; +use Model\Task; + /** * Project Calendar controller * @@ -35,7 +37,7 @@ class Calendar extends Base } /** - * Get tasks to display on the calendar + * Get tasks to display on the calendar (project view) * * @access public */ @@ -52,8 +54,30 @@ class Calendar extends Base ->filterByColor($this->request->getStringParam('color_id')) ->filterByStatus($this->request->getIntegerParam('is_active', -1)) ->filterByDueDateRange( - $this->request->getStringParam('start'), - $this->request->getStringParam('end') + $this->request->getStringParam('start'), + $this->request->getStringParam('end') + ) + ->toCalendarEvents() + ); + } + + /** + * Get tasks to display on the calendar (user view) + * + * @access public + */ + public function user() + { + $user_id = $this->request->getIntegerParam('user_id'); + + $this->response->json( + $this->taskFilter + ->create() + ->filterByOwner($user_id) + ->filterByStatus(Task::STATUS_OPEN) + ->filterByDueDateRange( + $this->request->getStringParam('start'), + $this->request->getStringParam('end') ) ->toCalendarEvents() ); diff --git a/app/Controller/User.php b/app/Controller/User.php index 91141241..3736f20e 100644 --- a/app/Controller/User.php +++ b/app/Controller/User.php @@ -189,6 +189,20 @@ class User extends Base ))); } + /** + * Display user calendar + * + * @access public + */ + public function calendar() + { + $user = $this->getUser(); + + $this->response->html($this->layout('user/calendar', array( + 'user' => $user, + ))); + } + /** * Display timesheet * diff --git a/app/Core/Helper.php b/app/Core/Helper.php index 25d580e9..c3ffe95a 100644 --- a/app/Core/Helper.php +++ b/app/Core/Helper.php @@ -12,6 +12,7 @@ use Pimple\Container; * * @property \Core\Session $session * @property \Model\Acl $acl + * @property \Model\Config $config * @property \Model\User $user * @property \Model\UserSession $userSession */ diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index b312e29d..07c05b89 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index bd388342..af15c6b2 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index ec42cc9c..b39e9793 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index c5f45e2d..9adc19e4 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index 8148361c..2542a6fe 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -678,4 +678,6 @@ return array( 'Show/hide subtasks' => 'Afficher/cacher les sous-tâches', 'Show/hide tasks' => 'Afficher/cacher les tâches', 'Disable login form' => 'Désactiver le formulaire d\'authentification', + 'Show/hide calendar' => 'Afficher/cacher le calendrier', + 'User calendar' => 'Calendrier de l\'utilisateur', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index 25e330a2..8cbe6d8d 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index ff8ac1cb..98ed4a91 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index 12dfb953..229622c5 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 53e9e550..e2cc3ab8 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index 368ce0e6..db640901 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 134133ca..513436af 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index c0babf5a..4958189f 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 3455739c..962971f4 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index ed9ab82b..4c76d7ab 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -676,4 +676,6 @@ return array( // 'Show/hide subtasks' => '', // 'Show/hide tasks' => '', // 'Disable login form' => '', + // 'Show/hide calendar' => '', + // 'User calendar' => '', ); diff --git a/app/Model/Acl.php b/app/Model/Acl.php index 56f2980b..b6c0e6b8 100644 --- a/app/Model/Acl.php +++ b/app/Model/Acl.php @@ -38,7 +38,7 @@ class Acl extends Base 'project' => array('show', 'tasks', 'search', 'activity'), 'subtask' => '*', 'task' => '*', - 'calendar' => '*', + 'calendar' => array('show', 'events', 'save'), ); /** diff --git a/app/Template/app/dashboard.php b/app/Template/app/dashboard.php index c29ae02e..80f32fee 100644 --- a/app/Template/app/dashboard.php +++ b/app/Template/app/dashboard.php @@ -24,6 +24,9 @@
    • +
  • + +
    • @@ -40,6 +43,13 @@
    render('app/subtasks', array('paginator' => $subtask_paginator)) ?>
    +
    +
    +
    +

    render('project/events', array('events' => $events)) ?> diff --git a/app/Template/user/calendar.php b/app/Template/user/calendar.php new file mode 100644 index 00000000..ab7d05a2 --- /dev/null +++ b/app/Template/user/calendar.php @@ -0,0 +1,5 @@ +
    +
    \ No newline at end of file diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php index 05be2e84..e41851a9 100644 --- a/app/Template/user/sidebar.php +++ b/app/Template/user/sidebar.php @@ -37,6 +37,9 @@
  • a(t('User dashboard'), 'app', 'dashboard', array('user_id' => $user['id'])) ?>
    • +
  • + a(t('User calendar'), 'user', 'calendar', array('user_id' => $user['id'])) ?> +
    • userSession->isAdmin() && ! $this->userSession->isCurrentUser($user['id'])): ?> diff --git a/assets/css/app.css b/assets/css/app.css index 679d3fbc..f9720b3c 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -1866,7 +1866,10 @@ a.task-board-nobody { .dashboard-table-link:hover { color: #999; } -/* datepicker */ + +#dashboard-calendar { + font-size: 0.85em; +}/* datepicker */ #ui-datepicker-div { font-size: 0.8em; } diff --git a/assets/css/src/dashboard.css b/assets/css/src/dashboard.css index 9044aa43..dd997c62 100644 --- a/assets/css/src/dashboard.css +++ b/assets/css/src/dashboard.css @@ -44,3 +44,7 @@ .dashboard-table-link:hover { color: #999; } + +#dashboard-calendar { + font-size: 0.85em; +} \ No newline at end of file diff --git a/assets/js/app.js b/assets/js/app.js index ef6221f0..ce22131f 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -139,15 +139,16 @@ $("body").data("login-url")}}})},Init:function(){$("#board-selector").chosen({wi InitAfterAjax:function(){$(".form-date").datepicker({showOtherMonths:!0,selectOtherMonths:!0,dateFormat:"yy-mm-dd",constrainInput:!1});$("#markdown-preview").click(Kanboard.MarkdownPreview);$("#markdown-write").click(Kanboard.MarkdownWriter);$(".auto-select").focus(function(){$(this).select()});$(".dropit-submenu").hide();$(".dropdown").not(".dropit").dropit()}}}(); Kanboard.Board=function(){function a(a){Kanboard.Popover(a,Kanboard.InitAfterAjax)}function c(){Mousetrap.bind("n",function(){Kanboard.OpenPopover($(".task-creation-popover").attr("href"),Kanboard.InitAfterAjax)})}function b(){$(".column").sortable({delay:300,distance:5,connectWith:".column",placeholder:"draggable-placeholder",stop:function(a,b){e(b.item.attr("data-task-id"),b.item.parent().attr("data-column-id"),b.item.index()+1,b.item.parent().attr("data-swimlane-id"))}});$(".assignee-popover").click(a); $(".category-popover").click(a);$(".task-edit-popover").click(a);$(".task-creation-popover").click(a);$(".task-description-popover").click(a);$(".column-tooltip").tooltip({content:function(a){return $(this).attr("title")}});$(".task-board-tooltip").tooltip({track:!1,position:{my:"left-20 top",at:"center bottom+9",using:function(a,b){$(this).css(a);var c=b.target.left+b.target.width/2-b.element.left-20;$("
    ").addClass("tooltip-arrow").addClass(b.vertical).addClass(0==c?"align-left":"align-right").appendTo(this)}}, -content:function(a){if(a=$(this).attr("data-href")){var b=this;$.get(a,function k(a){$(".ui-tooltip-content:visible").html(a);a=$(".ui-tooltip:visible");a.css({top:"",left:""});a.children(".tooltip-arrow").remove();var c=$(b).tooltip("option","position");c.of=$(b);a.position(c);$("#tooltip-subtasks a").click(function(a){a.preventDefault();a.stopPropagation();$(this).hasClass("popover-subtask-restriction")?(Kanboard.OpenPopover($(this).attr("href")),$(b).tooltip("close")):$.get($(this).attr("href"), -k)})});return''}}}).on("mouseenter",function(){var a=this;$(this).tooltip("open");$(".ui-tooltip").on("mouseleave",function(){$(a).tooltip("close")})}).on("mouseleave focusout",function(a){a.stopImmediatePropagation();var b=this;setTimeout(function(){$(".ui-tooltip:hover").length||$(b).tooltip("close")},100)});$("[data-task-url]").each(function(){$(this).click(function(){window.location=$(this).attr("data-task-url")})});var b=parseInt($("#board").attr("data-check-interval")); -0'}}}).on("mouseenter",function(){var a=this;$(this).tooltip("open");$(".ui-tooltip").on("mouseleave",function(){$(a).tooltip("close")})}).on("mouseleave focusout",function(a){a.stopImmediatePropagation();var b=this;setTimeout(function(){$(".ui-tooltip:hover").length||$(b).tooltip("close")},100)});$("[data-task-url]").each(function(){$(this).click(function(){window.location=$(this).attr("data-task-url")})});var b=parseInt($("#board").attr("data-check-interval")); +0