summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Controller/App.php3
-rw-r--r--app/Controller/Calendar.php30
-rw-r--r--app/Controller/User.php14
-rw-r--r--app/Core/Helper.php1
-rw-r--r--app/Locale/da_DK/translations.php2
-rw-r--r--app/Locale/de_DE/translations.php2
-rw-r--r--app/Locale/es_ES/translations.php2
-rw-r--r--app/Locale/fi_FI/translations.php2
-rw-r--r--app/Locale/fr_FR/translations.php2
-rw-r--r--app/Locale/hu_HU/translations.php2
-rw-r--r--app/Locale/it_IT/translations.php2
-rw-r--r--app/Locale/ja_JP/translations.php2
-rw-r--r--app/Locale/pl_PL/translations.php2
-rw-r--r--app/Locale/pt_BR/translations.php2
-rw-r--r--app/Locale/ru_RU/translations.php2
-rw-r--r--app/Locale/sv_SE/translations.php2
-rw-r--r--app/Locale/th_TH/translations.php2
-rw-r--r--app/Locale/zh_CN/translations.php2
-rw-r--r--app/Model/Acl.php2
-rw-r--r--app/Template/app/dashboard.php10
-rw-r--r--app/Template/user/calendar.php5
-rw-r--r--app/Template/user/sidebar.php3
22 files changed, 91 insertions, 5 deletions
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
@@ -190,6 +190,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
*
* @access public
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
@@ -25,6 +25,9 @@
<a href="#" class="dashboard-toggle" data-toggle="subtasks"><?= t('Show/hide subtasks') ?></a>
</li>
<li>
+ <a href="#" class="dashboard-toggle" data-toggle="calendar"><?= t('Show/hide calendar') ?></a>
+ </li>
+ <li>
<a href="#" class="dashboard-toggle" data-toggle="activities"><?= t('Show/hide activities') ?></a>
</li>
</ul>
@@ -40,6 +43,13 @@
<div id="dashboard-subtasks"><?= $this->render('app/subtasks', array('paginator' => $subtask_paginator)) ?></div>
</div>
<div class="dashboard-right-column">
+ <div id="dashboard-calendar">
+ <div id="user-calendar"
+ data-check-url="<?= $this->u('calendar', 'user') ?>"
+ data-user-id="<?= $user_id ?>"
+ >
+ </div>
+ </div>
<div id="dashboard-activities">
<h2><?= t('Activity stream') ?></h2>
<?= $this->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 @@
+<div id="user-calendar"
+ data-check-url="<?= $this->u('calendar', 'user') ?>"
+ data-user-id="<?= $user['id'] ?>"
+>
+</div> \ 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 @@
<li>
<?= $this->a(t('User dashboard'), 'app', 'dashboard', array('user_id' => $user['id'])) ?>
</li>
+ <li>
+ <?= $this->a(t('User calendar'), 'user', 'calendar', array('user_id' => $user['id'])) ?>
+ </li>
<?php endif ?>
<?php if ($this->userSession->isAdmin() && ! $this->userSession->isCurrentUser($user['id'])): ?>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-27 11:06:30 +0000