]+>/gi;
+ var htmlAttribsRegex = /\s?[a-z:]+(?:=['"][^'">]+['"])*/gi;
+ var matches = html.match(htmlRegex);
+ if (matches && matches.length) {
+ matches = matches[0].match(htmlAttribsRegex);
+ if (matches.length) {
+ matches.shift();
+ matches.forEach(function (htmlAttrib) {
+ var attr = htmlAttrib.trim().split("=");
+ if (attr.length === 1) {
+ tmpEl.documentElement.setAttribute(attr[0], true);
+ } else {
+ tmpEl.documentElement.setAttribute(attr[0], attr[1].slice(1, -1));
+ }
+ });
}
+ }
+ tmpEl.documentElement.innerHTML = html;
+ this.log("load content", tmpEl.documentElement.attributes, tmpEl.documentElement.innerHTML.length);
+
+ // Clear out any focused controls before inserting new page contents.
+ if (document.activeElement && contains(document, this.options.selectors, document.activeElement)) {
+ try {
+ document.activeElement.blur();
+ } catch (e) {} // eslint-disable-line no-empty
+ }
+
+ this.switchSelectors(this.options.selectors, tmpEl, document, options);
+ },
+ abortRequest: abortRequest,
+ doRequest: sendRequest,
+ handleResponse: handleResponse,
+ loadUrl: function (href, options) {
+ options = typeof options === "object" ? extend({}, this.options, options) : clone(this.options);
+ this.log("load href", href, options);
+
+ // Abort any previous request
+ this.abortRequest(this.request);
+ trigger(document, "pjax:send", options);
+
+ // Do the request
+ this.request = this.doRequest(href, options, this.handleResponse.bind(this));
+ },
+ afterAllSwitches: function () {
+ // FF bug: Won’t autofocus fields that are inserted via JS.
+ // This behavior is incorrect. So if theres no current focus, autofocus
+ // the last field.
+ //
+ // http://www.w3.org/html/wg/drafts/html/master/forms.html
+ var autofocusEl = Array.prototype.slice.call(document.querySelectorAll("[autofocus]")).pop();
+ if (autofocusEl && document.activeElement !== autofocusEl) {
+ autofocusEl.focus();
+ }
+
+ // execute scripts when DOM have been completely updated
+ this.options.selectors.forEach(function (selector) {
+ foreachEls(document.querySelectorAll(selector), function (el) {
+ executeScripts(el);
+ });
});
+ var state = this.state;
+ if (state.options.history) {
+ if (!window.history.state) {
+ this.lastUid = this.maxUid = uniqueid();
+ window.history.replaceState({
+ url: window.location.href,
+ title: document.title,
+ uid: this.maxUid,
+ scrollPos: [0, 0]
+ }, document.title);
+ }
+
+ // Update browser history
+ this.lastUid = this.maxUid = uniqueid();
+ window.history.pushState({
+ url: state.href,
+ title: state.options.title,
+ uid: this.maxUid,
+ scrollPos: [0, 0]
+ }, state.options.title, state.href);
+ }
+ this.forEachSelectors(function (el) {
+ this.parseDOM(el);
+ }, this);
+
+ // Fire Events
+ trigger(document, "pjax:complete pjax:success", state.options);
+ if (typeof state.options.analytics === "function") {
+ state.options.analytics();
+ }
+ if (state.options.history) {
+ // First parse url and check for hash to override scroll
+ var a = document.createElement("a");
+ a.href = this.state.href;
+ if (a.hash) {
+ var name = a.hash.slice(1);
+ name = decodeURIComponent(name);
+ var curtop = 0;
+ var target = document.getElementById(name) || document.getElementsByName(name)[0];
+ if (target) {
+ // http://stackoverflow.com/questions/8111094/cross-browser-javascript-function-to-find-actual-position-of-an-element-in-page
+ if (target.offsetParent) {
+ do {
+ curtop += target.offsetTop;
+ target = target.offsetParent;
+ } while (target);
+ }
+ }
+ window.scrollTo(0, curtop);
+ } else if (state.options.scrollTo !== false) {
+ // Scroll page to top on new page load
+ if (state.options.scrollTo.length > 1) {
+ window.scrollTo(state.options.scrollTo[0], state.options.scrollTo[1]);
+ } else {
+ window.scrollTo(0, state.options.scrollTo);
+ }
+ }
+ } else if (state.options.scrollRestoration && state.options.scrollPos) {
+ window.scrollTo(state.options.scrollPos[0], state.options.scrollPos[1]);
+ }
+ this.state = {
+ numPendingSwitches: 0,
+ href: null,
+ options: null
+ };
}
+ };
+ Pjax.isSupported = isSupported;
+
+ // arguably could do `if( require("./lib/is-supported")()) {` but that might be a little to simple
+ if (Pjax.isSupported()) {
+ module.exports = Pjax;
}
- function getBus() {
- if (typeof window.OC !== 'undefined' && window.OC._eventBus && typeof window._nc_event_bus === 'undefined') {
- console.warn('found old event bus instance at OC._eventBus. Update your version!');
- window._nc_event_bus = window.OC._eventBus;
- }
- // Either use an existing event bus instance or create one
- if (typeof window._nc_event_bus !== 'undefined') {
- return new ProxyBus(window._nc_event_bus);
- } else {
- return window._nc_event_bus = new SimpleBus();
+ // if there isn’t required browser functions, returning stupid api
+ else {
+ var stupidPjax = noop;
+ for (var key in Pjax.prototype) {
+ if (Pjax.prototype.hasOwnProperty(key) && typeof Pjax.prototype[key] === "function") {
+ stupidPjax[key] = noop;
+ }
}
+ module.exports = stupidPjax;
}
- const bus = getBus();
- /**
- * Register an event listener
- *
- * @param name name of the event
- * @param handler callback invoked for every matching event emitted on the bus
- */
- function subscribe(name, handler) {
- bus.subscribe(name, handler);
- }
+ });
- const tokenElement = document.getElementsByTagName('head')[0];
- let token$1 = tokenElement ? tokenElement.getAttribute('data-requesttoken') : null;
- const observers = [];
- function getRequestToken() {
- return token$1;
- }
- // Listen to server event and keep token in sync
- subscribe('csrf-token-update', e => {
- token$1 = e.token;
- observers.forEach(observer => {
- try {
- observer(e.token);
- } catch (e) {
- console.error('error updating CSRF token observer', e);
+ var PagePjax = /*#__PURE__*/_createClass$1(function PagePjax(reload) {
+ _classCallCheck$1(this, PagePjax);
+ /**
+ * Enable seamless page navigation with pjax.
+ */
+ this.pjaxInstance = new pjax$1({
+ elements: [".timemanager-pjax-link"],
+ selectors: [".app-timemanager #app-navigation ul", ".app-timemanager #app-content .container"],
+ cacheBust: false,
+ scrollTo: true
+ });
+ document.addEventListener("pjax:send", function () {
+ document.body.classList.add("loading");
+ document.body.classList.remove("loading-error");
+ document.body.classList.remove("tm_ready");
+ });
+ document.addEventListener("pjax:success", function () {
+ setTimeout(function () {
+ document.body.classList.remove("loading");
+ reload();
+ }, 300);
+ });
+ document.addEventListener("pjax:error", function (error) {
+ // Catch session timeout and redirect to login
+ if (error && error.request && error.request.status === 401) {
+ document.location.href = "".concat(dist_4("login"), "?redirect_url=").concat(dist_4("timemanager", "index"));
}
+ document.body.classList.remove("loading");
+ document.body.classList.add("loading-error");
});
});
- ///
- const getAttribute = (el, attribute) => {
- if (el) {
- return el.getAttribute(attribute);
- }
- return null;
- };
- const head = document.getElementsByTagName('head')[0];
- getAttribute(head, 'data-user');
- getAttribute(head, 'data-user-displayname');
- typeof OC === 'undefined' ? false : OC.isUserAdmin();
-
var token = getRequestToken();
var components = [];
var pjax = [];
@@ -38933,17 +38961,6 @@
requestToken: token
})
}));
-
- // components.push(
- // new Settings({
- // target: Helpers.replaceNode(document.querySelector("#content.app-timemanager [data-svelte='Settings.svelte']")),
- // props: {
- // ...store,
- // requestToken: token,
- // },
- // })
- // );
-
var dateTimeElements = document.querySelectorAll("[data-datetime]");
if (dateTimeElements && dateTimeElements.length > 0) {
dateTimeElements.forEach(function (element) {
diff --git a/js/main.js b/js/main.js
index 915ac22..c0765fd 100644
--- a/js/main.js
+++ b/js/main.js
@@ -14,7 +14,6 @@ import Timerange from "./views/Timerange.svelte";
import PrintButton from "./views/PrintButton.svelte";
import Import from "./views/Import.svelte";
import UserFilterButton from "./views/UserFilterButton.svelte";
-// import Settings from "./views/Settings.svelte";
import { Helpers } from "./lib/helpers";
import { PagePjax } from "./lib/pjax";
import { translate } from "@nextcloud/l10n";
@@ -265,16 +264,6 @@ const init = () => {
})
);
- // components.push(
- // new Settings({
- // target: Helpers.replaceNode(document.querySelector("#content.app-timemanager [data-svelte='Settings.svelte']")),
- // props: {
- // ...store,
- // requestToken: token,
- // },
- // })
- // );
-
const dateTimeElements = document.querySelectorAll("[data-datetime]");
if (dateTimeElements && dateTimeElements.length > 0) {
dateTimeElements.forEach((element) => {
diff --git a/js/settings.js b/js/settings.js
new file mode 100644
index 0000000..6df32b1
--- /dev/null
+++ b/js/settings.js
@@ -0,0 +1,38 @@
+async function tmSaveSettings(body) {
+ try {
+ const response = await fetch(OC.generateUrl("/apps/timemanager/api/settings"), {
+ method: "POST",
+ headers: {
+ requesttoken: OC.requestToken,
+ "content-type": "application/json"
+ },
+ body: JSON.stringify(body)
+ });
+
+ const result = await response.json();
+ } catch (error) {
+ console.error(`Cannot save setting: ${error.message}`);
+ }
+}
+
+document.getElementById("tm-reporter").addEventListener("change", async (e) => {
+ let value = e.target.value;
+ const loading = document.getElementById("tm-reporter-loading");
+
+ loading.classList.add("icon-loading");
+ await tmSaveSettings({
+ reporter: value
+ });
+ loading.classList.remove("icon-loading");
+});
+
+document.getElementById("tm-handle-conflicts").addEventListener("change", async (e) => {
+ let value = e.target.checked;
+ const loading = document.getElementById("tm-handle-conflicts-loading");
+
+ loading.classList.add("icon-loading");
+ await tmSaveSettings({
+ handle_conflicts: value
+ });
+ loading.classList.remove("icon-loading");
+});
diff --git a/js/views/Settings.svelte b/js/views/Settings.svelte
deleted file mode 100644
index e0b7834..0000000
--- a/js/views/Settings.svelte
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
- {
- handleConflicts = e.target.checked;
- save();
- }} />
-
-
-
diff --git a/js/views/ShareDialog.svelte b/js/views/ShareDialog.svelte
index 6e7976a..0e12f33 100644
--- a/js/views/ShareDialog.svelte
+++ b/js/views/ShareDialog.svelte
@@ -59,12 +59,14 @@
if (response.ok) {
const { users, exact, groups } = (await response.json()).ocs.data;
- const existing_users = sharees.filter(s => s.recipient_type == 'user').map((share) => share.recipient_id);
- const existing_groups = sharees.filter(s => s.recipient_type == 'group').map((share) => share.recipient_id);
+ const existing_users = sharees.filter(s => s.recipient_type === 'user').map((share) => share.recipient_id);
+ const existing_groups = sharees.filter(s => s.recipient_type === 'group').map((share) => share.recipient_id);
return [...users, ...exact.users, ...groups, ...exact.groups].filter(
(user) => !existing_users.includes(user.value.shareWith) && user.value.shareWith !== userId
).filter(
(group) => !existing_groups.includes(group.value.shareWith)
+ ).sort(
+ (a, b) => a.label.localeCompare(b.label)
);
}
};
diff --git a/js/views/Statistics.svelte b/js/views/Statistics.svelte
index 90a412a..a17dd6d 100644
--- a/js/views/Statistics.svelte
+++ b/js/views/Statistics.svelte
@@ -3,6 +3,7 @@
export let requestToken;
export let controls = true;
export let includeShared = false;
+ export let includeReporter = false;
import { onMount } from "svelte";
import {
@@ -136,7 +137,7 @@
const loadStats = async () => {
const start = format(Helpers.toUTC(startOfDay(startCursor)), apiDateFormat);
const end = format(Helpers.toUTC(endOfDay(endCursor)), apiDateFormat);
- let statUrl = `${statsApiUrl}?start=${start}&end=${end}&group_by=${scale}&shared=${includeShared ? 1 : 0}`;
+ let statUrl = `${statsApiUrl}?start=${start}&end=${end}&group_by=${scale}&shared=${includeShared ? 1 : 0}&reporter=${includeReporter ? 1 : 0}`;
// Parse current URL for filters
const urlParts = document.location.href.split("?");
diff --git a/js/views/UserFilterSelect.svelte b/js/views/UserFilterSelect.svelte
index 7306c9a..283da21 100644
--- a/js/views/UserFilterSelect.svelte
+++ b/js/views/UserFilterSelect.svelte
@@ -3,6 +3,7 @@
export let isVisible = true;
import Select from "svelte-select";
+ import { getCurrentUser } from "@nextcloud/auth"
import { translate } from "@nextcloud/l10n";
import { generateOcsUrl } from "@nextcloud/router";
import { onMount } from "svelte";
@@ -51,11 +52,17 @@
}
);
+ const current = getCurrentUser();
+ let currentUser = [];
+ if (current.uid.toLowerCase().includes(query.toLowerCase()) || current.displayName.toLowerCase().includes(query.toLowerCase())) {
+ currentUser = [{ value: { shareWith: current.uid }, label: current.displayName }];
+ }
+
loading = false;
if (response.ok) {
const { users, exact } = (await response.json()).ocs.data;
- return [...users, ...exact.users];
+ return [...users, ...exact.users, ...currentUser].sort((a, b) => a.label.localeCompare(b.label));
}
};
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
new file mode 100644
index 0000000..073b3d8
--- /dev/null
+++ b/lib/AppInfo/Application.php
@@ -0,0 +1,26 @@
+ $this->urlGenerator->linkToRoute("timemanager.page.times"),
"statsApiUrl" => $this->urlGenerator->linkToRoute("timemanager.t_api.getHoursInPeriodStats"),
- "settingsAction" => $this->urlGenerator->linkToRoute("timemanager.page.updateSettings"),
- "settings" => [
- "handle_conflicts" =>
- $this->config->getAppValue("timemanager", "sync_mode", "force_skip_conflict_handling") ===
- "handle_conflicts",
- "fullDateFormat" => $this->fullDateFormat,
- ],
"requestToken" => $this->requestToken,
"isServer" => true,
"latestSearchEntries" => array_map(function ($latestSearchEntry) {
@@ -215,14 +208,23 @@ function reports(
$end = $end_of_month->format("Y-m-d");
}
- $all_clients = $this->clientMapper->findActiveForCurrentUser("name", true);
- $all_projects = $this->projectMapper->findActiveForCurrentUser("name", true);
- $all_tasks = $this->taskMapper->findActiveForCurrentUser("name", true);
+ // check if user is reporter or admin
+ $reporterGroup = $this->config->getAppValue('timemanager', 'reporter_group');
+ $isReporterOrAdmin = $this->groupManager->isAdmin($this->userId) || $this->groupManager->isInGroup($this->userId, $reporterGroup);
+ if ($isReporterOrAdmin) {
+ $all_clients = $this->clientMapper->findActiveForReporter("name");
+ $all_projects = $this->projectMapper->findActiveForReporter("name");
+ $all_tasks = $this->taskMapper->findActiveForReporter("name");
+ } else {
+ $all_clients = $this->clientMapper->findActiveForCurrentUser("name", true);
+ $all_projects = $this->projectMapper->findActiveForCurrentUser("name", true);
+ $all_tasks = $this->taskMapper->findActiveForCurrentUser("name", true);
+ }
// Get possible task ids to filters for
- $filter_tasks = $this->storageHelper->getTaskListFromFilters($clients, $projects, $tasks, true);
+ $filter_tasks = $this->storageHelper->getTaskListFromFilters($clients, $projects, $tasks, true, $isReporterOrAdmin);
- $times = $this->timeMapper->findForReport($start, $end, $status, $filter_tasks, true);
+ $times = $this->timeMapper->findForReport($start, $end, $status, $filter_tasks, true, $isReporterOrAdmin);
$includedAuthors = $userFilter && strlen($userFilter) > 0 ? explode(",", $userFilter) : [];
@@ -234,15 +236,15 @@ function reports(
$times = $this->storageHelper->resolveAuthorDisplayNamesForTimes($times, $this->userManager);
foreach ($times as $time) {
// Find details for parents of time entry
- $task = $this->taskMapper->getActiveObjectById($time->getTaskUuid(), true);
+ $task = $this->taskMapper->getActiveObjectById($time->getTaskUuid(), true, $isReporterOrAdmin);
if (!$task) {
continue;
}
- $project = $this->projectMapper->getActiveObjectById($task->getProjectUuid(), true);
+ $project = $this->projectMapper->getActiveObjectById($task->getProjectUuid(), true, $isReporterOrAdmin);
if (!$project) {
continue;
}
- $client = $this->clientMapper->getActiveObjectById($project->getClientUuid(), true);
+ $client = $this->clientMapper->getActiveObjectById($project->getClientUuid(), true, $isReporterOrAdmin);
if (!$client) {
continue;
}
@@ -321,14 +323,8 @@ function reports(
"start" => $start,
"end" => $end,
"controls" => false,
- "settingsAction" => $this->urlGenerator->linkToRoute("timemanager.page.updateSettings"),
- "settings" => [
- "handle_conflicts" =>
- $this->config->getAppValue("timemanager", "sync_mode", "force_skip_conflict_handling") ===
- "handle_conflicts",
- "fullDateFormat" => $this->fullDateFormat,
- ],
"includeShared" => true,
+ "includeReporter" => true,
];
return new TemplateResponse("timemanager", "reports", [
@@ -383,12 +379,6 @@ function clients() {
$form_props = [
"action" => $this->urlGenerator->linkToRoute("timemanager.page.clients"),
- "settingsAction" => $this->urlGenerator->linkToRoute("timemanager.page.updateSettings"),
- "settings" => [
- "handle_conflicts" =>
- $this->config->getAppValue("timemanager", "sync_mode", "force_skip_conflict_handling") === "handle_conflicts",
- "fullDateFormat" => $this->fullDateFormat,
- ],
"clientEditorButtonCaption" => $this->l->t("Add client"),
"clientEditorCaption" => $this->l->t("New client"),
];
@@ -557,8 +547,10 @@ function projects($client = null) {
}
}
- $client_uuid = isset($client_data) && count($client_data) > 0 ? $client_data[0]->getUuid() : "";
- $client_name = isset($client_data) && count($client_data) > 0 ? $client_data[0]->getName() : "";
+
+ $client_uuid = $client_data[0]?->getUuid() ?? "";
+ $client_name = $client_data[0]?->getName() ?? "";
+ $canEdit = ($client_data[0]?->getUserId() ?? "") === $this->userId;
$sharees = array_map(function ($share) {
$shareArray = $share->toArray($this->userManager, $this->groupManager);
@@ -575,12 +567,6 @@ function projects($client = null) {
$form_props = [
"action" => $this->urlGenerator->linkToRoute("timemanager.page.projects") . "?client=" . $client_uuid,
"editAction" => $this->urlGenerator->linkToRoute("timemanager.page.clients"),
- "settingsAction" => $this->urlGenerator->linkToRoute("timemanager.page.updateSettings"),
- "settings" => [
- "handle_conflicts" =>
- $this->config->getAppValue("timemanager", "sync_mode", "force_skip_conflict_handling") === "handle_conflicts",
- "fullDateFormat" => $this->fullDateFormat,
- ],
"requestToken" => $this->requestToken,
"clientName" => $client_name,
"clientEditorButtonCaption" => $this->l->t("Edit client"),
@@ -603,7 +589,7 @@ function projects($client = null) {
"deleteShareAction" => $this->urlGenerator->linkToRoute("timemanager.page.clients") . "/share/delete",
"sharees" => $sharees,
"sharedBy" => $sharedBy,
- "canEdit" => $sharedBy === null,
+ "canEdit" => $canEdit,
"userId" => $this->userId,
"isServer" => true,
];
@@ -621,7 +607,7 @@ function projects($client = null) {
"ShareStatus.svelte" => PHP_Svelte::render_template("ShareStatus.svelte", $form_props),
],
"page" => "projects",
- "canEdit" => $sharedBy === null,
+ "canEdit" => $canEdit,
]);
}
@@ -766,18 +752,13 @@ function tasks($project) {
}
}
- $project_uuid = isset($project_data) && count($project_data) > 0 ? $project_data[0]->getUuid() : "";
- $project_name = isset($project_data) && count($project_data) > 0 ? $project_data[0]->getName() : "";
+ $project_uuid = $project_data[0]?->getUuid() ?? "";
+ $project_name = $project_data[0]?->getName() ?? "";
+ $canEdit = ($project_data[0]?->getUserId() ?? "") === $this->userId;
$form_props = [
"action" => $this->urlGenerator->linkToRoute("timemanager.page.tasks") . "?project=" . $project_uuid,
"editAction" => $this->urlGenerator->linkToRoute("timemanager.page.projects"),
- "settingsAction" => $this->urlGenerator->linkToRoute("timemanager.page.updateSettings"),
- "settings" => [
- "handle_conflicts" =>
- $this->config->getAppValue("timemanager", "sync_mode", "force_skip_conflict_handling") === "handle_conflicts",
- "fullDateFormat" => $this->fullDateFormat,
- ],
"requestToken" => $this->requestToken,
"clientName" => isset($client_data) && count($client_data) > 0 ? $client_data[0]->getName() : "",
"projectName" => $project_name,
@@ -797,7 +778,7 @@ function tasks($project) {
],
"sharedBy" => $sharedBy,
"sharees" => $sharees,
- "canEdit" => $sharedBy === null,
+ "canEdit" => $canEdit,
"isServer" => true,
];
@@ -815,7 +796,7 @@ function tasks($project) {
"ShareStatus.svelte" => PHP_Svelte::render_template("ShareStatus.svelte", $form_props),
],
"page" => "tasks",
- "canEdit" => $sharedBy === null,
+ "canEdit" => $canEdit,
]);
}
@@ -943,18 +924,13 @@ function times($task, string $userFilter = "") {
});
$hasSharedTimeEntries = count($sharedTimeEntries) > 0;
- $task_uuid = isset($task_data) && count($task_data) > 0 ? $task_data[0]->getUuid() : "";
- $task_name = isset($task_data) && count($task_data) > 0 ? $task_data[0]->getName() : "";
+ $task_uuid = $task_data[0]?->getUuid() ?? "";
+ $task_name = $task_data[0]?->getName() ?? "";
+ $canEdit = ($task_data[0]?->getUserId() ?? "") === $this->userId;
$form_props = [
"action" => $this->urlGenerator->linkToRoute("timemanager.page.times") . "?task=" . $task_uuid,
"editAction" => $this->urlGenerator->linkToRoute("timemanager.page.tasks"),
- "settingsAction" => $this->urlGenerator->linkToRoute("timemanager.page.updateSettings"),
- "settings" => [
- "handle_conflicts" =>
- $this->config->getAppValue("timemanager", "sync_mode", "force_skip_conflict_handling") === "handle_conflicts",
- "fullDateFormat" => $this->fullDateFormat,
- ],
"requestToken" => $this->requestToken,
"clientName" => isset($client_data) && count($client_data) > 0 ? $client_data[0]->getName() : "",
"projectName" => isset($project_data) && count($project_data) > 0 ? $project_data[0]->getName() : "",
@@ -975,7 +951,7 @@ function times($task, string $userFilter = "") {
"editTimeEntryAction" => $this->urlGenerator->linkToRoute("timemanager.page.times") . "?task=" . $task_uuid,
"sharedBy" => $sharedBy,
"sharees" => $sharees,
- "canEdit" => $sharedBy === null,
+ "canEdit" => $canEdit,
"isServer" => true,
];
@@ -995,7 +971,7 @@ function times($task, string $userFilter = "") {
"ShareStatus.svelte" => PHP_Svelte::render_template("ShareStatus.svelte", $form_props),
],
"page" => "times",
- "canEdit" => $sharedBy === null,
+ "canEdit" => $canEdit,
"latestEntries" => $latestEntries,
"hasSharedTimeEntries" => $hasSharedTimeEntries,
]);
@@ -1133,18 +1109,6 @@ function unpayTime($uuid) {
return new NotFoundException("Time entry could not be found");
}
- /**
- * @NoAdminRequired
- */
- function updateSettings($handle_conflicts) {
- $this->config->setAppValue(
- "timemanager",
- "sync_mode",
- (bool) $handle_conflicts ? "handle_conflicts" : "force_skip_conflict_handling"
- );
- return new RedirectResponse($this->urlGenerator->linkToRoute("timemanager.page.index"));
- }
-
/**
* @NoAdminRequired
* @NoCSRFRequired
@@ -1164,12 +1128,6 @@ function tools() {
"syncApiUrl" => $this->urlGenerator->linkToRoute("timemanager.t_api.updateObjectsFromWeb"),
"requestToken" => $this->requestToken,
"isServer" => true,
- // "settingsAction" => $this->urlGenerator->linkToRoute("timemanager.page.updateSettings"),
- // "settings" => [
- // "handle_conflicts" =>
- // $this->config->getAppValue("timemanager", "sync_mode", "force_skip_conflict_handling") ===
- // "handle_conflicts",
- // ],
];
return new TemplateResponse("timemanager", "tools", [
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
new file mode 100644
index 0000000..3f9a54f
--- /dev/null
+++ b/lib/Controller/SettingsController.php
@@ -0,0 +1,40 @@
+config->setAppValue('timemanager', 'reporter_group', $reporter);
+ }
+
+ if ($handle_conflicts !== null) {
+ $this->config->setAppValue(
+ "timemanager",
+ "sync_mode",
+ $handle_conflicts ? "handle_conflicts" : "force_skip_conflict_handling"
+ );
+ }
+
+ return new JSONResponse([]);
+ }
+}
diff --git a/lib/Controller/TApiController.php b/lib/Controller/TApiController.php
index e2f85b6..6d3f69b 100644
--- a/lib/Controller/TApiController.php
+++ b/lib/Controller/TApiController.php
@@ -15,6 +15,7 @@
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http;
+use OCP\IGroupManager;
use OCP\IRequest;
use OCP\IConfig;
use Psr\Log\LoggerInterface;
@@ -40,6 +41,8 @@ class TApiController extends ApiController {
private $config;
/** @var LoggerInterface logger */
private $logger;
+ /** @var IGroupManager */
+ private $groupManager;
/**
* constructor of the controller
@@ -64,6 +67,7 @@ function __construct(
ShareMapper $shareMapper,
IConfig $config,
LoggerInterface $logger,
+ IGroupManager $groupManager,
) {
parent::__construct($appName, $request);
$this->clientMapper = $clientMapper;
@@ -75,6 +79,7 @@ function __construct(
$this->config = $config;
$this->userId = $userId;
$this->logger = $logger;
+ $this->groupManager = $groupManager;
$this->storageHelper = new StorageHelper(
$this->clientMapper,
$this->projectMapper,
@@ -238,19 +243,24 @@ function getHoursInPeriodStats(
string $projects = null,
string $tasks = null,
string $status = null,
- $shared = false,
- string $userFilter = ""
+ string $userFilter = "",
+ bool $shared = false,
+ bool $reporter = false,
) {
+ // check if user is reporter or admin
+ $reporterGroup = $this->config->getAppValue('timemanager', 'reporter_group');
+ $isReporterOrAdmin = $reporter && ($this->groupManager->isAdmin($this->userId) || $this->groupManager->isInGroup($this->userId, $reporterGroup));
+
// Get possible task ids to filters for
- $filter_tasks = $this->storageHelper->getTaskListFromFilters($clients, $projects, $tasks, $shared);
+ $filter_tasks = $this->storageHelper->getTaskListFromFilters($clients, $projects, $tasks, $shared, $isReporterOrAdmin);
$includedAuthors = $userFilter && strlen($userFilter) > 0 ? explode(",", $userFilter) : [];
// Get all time entries for time period
- $times = $this->timeMapper->findForReport($start, $end, $status, $filter_tasks, $shared);
- $times = array_filter($times, function ($time) use ($includedAuthors) {
+ $times = $this->timeMapper->findForReport($start, $end, $status, $filter_tasks, $shared, $isReporterOrAdmin);
+ $times = array_filter($times, function ($time) use ($includedAuthors, $isReporterOrAdmin) {
// Find details for parents of time entry. If it doesn't exist, we should filter out time entry
- $task = $this->taskMapper->getActiveObjectById($time->getTaskUuid(), true);
+ $task = $this->taskMapper->getActiveObjectById($time->getTaskUuid(), true, $isReporterOrAdmin);
if (!$task) {
return false;
diff --git a/lib/Db/ClientMapper.php b/lib/Db/ClientMapper.php
index 90a7255..b1c6c3d 100644
--- a/lib/Db/ClientMapper.php
+++ b/lib/Db/ClientMapper.php
@@ -2,7 +2,10 @@
namespace OCA\TimeManager\Db;
+use OCP\IConfig;
use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
/**
* Class ItemMapper
@@ -11,24 +14,25 @@
* @method Client insert(Client $entity)
*/
class ClientMapper extends ObjectMapper {
- protected $projectMapper;
+ protected ProjectMapper $projectMapper;
- public function __construct(IDBConnection $db, CommitMapper $commitMapper, ProjectMapper $projectMapper) {
- parent::__construct($db, $commitMapper, "timemanager_client");
+ public function __construct(IDBConnection $db, IConfig $config, IUserManager $userManager, IGroupManager $groupManager, CommitMapper $commitMapper, ProjectMapper $projectMapper) {
+ parent::__construct($db, $config, $userManager, $groupManager, $commitMapper, "timemanager_client");
$this->projectMapper = $projectMapper;
}
- public function deleteChildrenForEntityById($uuid, $commit) {
+ public function deleteChildrenForEntityById(string $uuid, string $commit): void {
$this->projectMapper->deleteWithChildrenByClientId($uuid, $commit);
}
- /**
- * Gets the number of projects for a given object.
- *
- * @param string $userId the user id to filter
- * @return Client[] list if matching items
- */
- public function countProjects($uuid) {
+ /**
+ * Gets the number of projects for a given object.
+ *
+ * @param string $uuid
+ * @return int number of matching items
+ */
+ public function countProjects(string $uuid): int
+ {
$projects = $this->projectMapper->getActiveObjectsByAttributeValue("client_uuid", $uuid, "created", true);
return count($projects);
}
diff --git a/lib/Db/CommitMapper.php b/lib/Db/CommitMapper.php
index abd78e3..167219c 100644
--- a/lib/Db/CommitMapper.php
+++ b/lib/Db/CommitMapper.php
@@ -11,21 +11,20 @@
* @package OCA\TimeManager\Db
* @method Commit insert(Commit $entity)
*/
-class CommitMapper extends QBMapper {
- protected $userId;
- protected IDBConnection $connection;
+class CommitMapper extends QBMapper implements ICurrentUser {
+ protected string $userId;
- public function __construct(IDBConnection $connection) {
- $this->connection = $connection;
- parent::__construct($connection, "timemanager_commit");
+ public function __construct(IDBConnection $db) {
+ parent::__construct($db, "timemanager_commit");
}
- function setCurrentUser($userId) {
+ function setCurrentUser(string $userId): void
+ {
$this->userId = $userId;
}
function getLatestCommit() {
- $sql = $this->connection->getQueryBuilder();
+ $sql = $this->db->getQueryBuilder();
$sql
->select("*")
->from($this->tableName)
@@ -44,7 +43,7 @@ function getLatestCommit() {
function getCommitsAfter($commit) {
// Find the given commit first, see if we have it.
- $sql = $this->connection->getQueryBuilder();
+ $sql = $this->db->getQueryBuilder();
$sql
->select("commit")
->from($this->tableName)
@@ -54,7 +53,7 @@ function getCommitsAfter($commit) {
$sql->setParameters([$this->userId, $commit]);
$givenCommit = $this->findEntities($sql);
- $sql = $this->connection->getQueryBuilder();
+ $sql = $this->db->getQueryBuilder();
// The given commit is found, all fine.
if (count($givenCommit) > 0) {
diff --git a/lib/Db/ICurrentUser.php b/lib/Db/ICurrentUser.php
new file mode 100644
index 0000000..0c6811e
--- /dev/null
+++ b/lib/Db/ICurrentUser.php
@@ -0,0 +1,8 @@
+db = $db;
- $this->commitMapper = $commitMapper;
+abstract class ObjectMapper extends QBMapper implements ICurrentUser {
+ protected string $userId;
+
+ abstract public function deleteChildrenForEntityById(string $uuid, string $commit): void;
+
+ public function __construct(
+ IDBConnection $db,
+ protected IConfig $config,
+ protected IUserManager $userManager,
+ protected IGroupManager $groupManager,
+ protected CommitMapper $commitMapper,
+ $dbname) {
parent::__construct($db, $dbname);
}
- function setCurrentUser($userId) {
+ function setCurrentUser(string $userId): void
+ {
$this->userId = $userId;
$this->commitMapper->setCurrentUser($this->userId);
}
- function getActiveObjects($orderby = "created", $sort = "ASC"): array {
+ /**
+ * Get all groups of user
+ *
+ * @return string[]
+ */
+ function getUserGroups(): array
+ {
+ $user = $this->userManager->get($this->userId);
+ return array_unique($this->groupManager->getUserGroupIds($user));
+ }
+
+ function userIsAdminOrReporter(): bool
+ {
+ return $this->groupManager->isAdmin($this->userId)
+ || $this->groupManager->isInGroup($this->userId, $this->config->getAppValue(Application::APP_ID, 'reporter_group'));
+ }
+
+ /**
+ * Fetch all items that are associated to the current user
+ * with a given attribute-value-combination and not deleted
+ *
+ * @param string $attr the attribute name
+ * @param string $value the attribute value
+ * @return Object[] list if matching items
+ * @throws Exception
+ */
+ function getActiveObjectsByAttributeValue(
+ string $attr,
+ string $value,
+ string $orderBy = "created",
+ bool $shared = false,
+ bool $isReporterOrAdmin = false,
+ ): array {
$sql = $this->db->getQueryBuilder();
- $sql
- ->select("*")
- ->from($this->tableName)
- ->where("`user_id` = ?")
- ->andWhere("`status` != ?")
- ->orderBy(\strtolower($orderby), $sort);
-
- $sql->setParameters([$this->userId, "deleted"]);
-
- return $this->findEntities($sql);
- }
-
- /**
- * Fetch all items that are associated to the current user
- * with a given attribute-value-combination and not deleted
- *
- * @param string $attr the attribute name
- * @param string $value the attribute value
- * @return Object[] list if matching items
- */
- function getActiveObjectsByAttributeValue(string $attr, string $value, $orderby = "created", $shared = false): array {
- $sql = $this->db->getQueryBuilder();
- if ($shared && strpos($this->tableName, "_client") > -1) {
- $sql
- ->selectDistinct("client.*")
- ->from($this->tableName, "client")
- ->leftJoin("client", "*PREFIX*timemanager_share", "share", "client.`uuid` = share.`object_uuid`")
- ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
-
- $expr = $sql->expr()->orX(
+ if ($isReporterOrAdmin) {
+ $shared = false;
+ }
+
+ $sql->selectDistinct("base.*")
+ ->from($this->tableName, "base")
+ ->where("base.`status` != :status")
+ ->andWhere("base.`$attr` = :attr")
+ ->orderBy(\strtolower($orderBy), "ASC")
+ ->setParameters([
+ "userid" => $this->userId,
+ "status" => "deleted",
+ "attr" => $value,
+ "reporter_or_admin" => $isReporterOrAdmin,
+ ]);
+
+ if ($shared) {
+ $expr = [
"share.`recipient_id` = :userid AND share.`recipient_type` = 'user'",
- "group_user.`uid` = :userid AND share.`recipient_type` = 'group'",
- "client.`user_id` = :userid",
- );
-
- $sql
- ->where($expr)
- ->andWhere("client.`status` != :status")
- ->andWhere("client.`$attr` = :attr")
- ->orderBy(\strtolower($orderby), "ASC");
-
- $sql->setParameters(["userid" => $this->userId, "status" => "deleted", "attr" => $value]);
-
- } elseif ($shared && strpos($this->tableName, "_project") > -1) {
- $sql
- ->selectDistinct("project.*")
- ->from($this->tableName, "project")
- ->leftJoin(
- "project",
- "*PREFIX*timemanager_share",
- "share",
- "project.`client_uuid` = share.`object_uuid` AND share.`author_user_id` != :userid"
- )
- ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
-
- $expr = $sql->expr()->orX(
- "share.`recipient_id` = :userid AND share.`recipient_type` = 'user'",
- "group_user.`uid` = :userid AND share.`recipient_type` = 'group'",
- "project.`user_id` = :userid"
- );
-
- $sql
- ->where($expr)
- ->andWhere("project.`status` != :status")
- ->andWhere("project.`$attr` = :attr")
- ->orderBy(\strtolower($orderby), "ASC");
-
- $sql->setParameters(["userid" => $this->userId, "status" => "deleted", "attr" => $value]);
-
- } elseif ($shared && strpos($this->tableName, "_task") > -1) {
- $sql
- ->selectDistinct("task.*")
- ->from($this->tableName, "task")
- ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.`project_uuid` = project.`uuid`")
- ->leftJoin(
- "project",
- "*PREFIX*timemanager_share",
- "share",
- "project.`client_uuid` = share.`object_uuid` AND share.`author_user_id` != :userid"
- )
- ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
-
- $expr = $sql->expr()->orX(
- "share.`recipient_id` = :userid AND share.`recipient_type` = 'user'",
- "group_user.`uid` = :userid AND share.`recipient_type` = 'group'",
- "task.`user_id` = :userid"
- );
-
- $sql
- ->where($expr)
- ->andWhere("task.`status` != :status")
- ->andWhere("task.`$attr` = :attr")
- ->orderBy(\strtolower($orderby), "ASC");
-
- $sql->setParameters(["userid" => $this->userId, "status" => "deleted", "attr" => $value]);
-
- } elseif ($shared && strpos($this->tableName, "_time") > -1) {
- $sql
- ->selectDistinct("time.*")
- ->from($this->tableName, "time")
- ->innerJoin("time", "*PREFIX*timemanager_task", "task", "time.`task_uuid` = task.`uuid`")
- ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.`project_uuid` = project.`uuid`")
- ->leftJoin(
- "project",
- "*PREFIX*timemanager_share",
- "share",
- "project.`client_uuid` = share.`object_uuid` AND share.`author_user_id` = :userid"
- );
-
- $expr = $sql->expr()->orX("share.`author_user_id` = :userid", "time.`user_id` = :userid");
-
- $sql
- ->where($expr)
- ->andWhere("time.`status` != :status")
- ->andWhere("time.`$attr` = :attr")
- ->orderBy(\strtolower($orderby), "ASC");
-
- $sql->setParameters(["userid" => $this->userId, "status" => "deleted", "attr" => $value]);
-
- } else {
- $sql = $this->db->getQueryBuilder();
- $sql
- ->select("*")
- ->from($this->tableName)
- ->where("`user_id` = ?")
- ->andWhere("`status` != ?")
- ->andWhere("`$attr` = ?")
- ->orderBy(\strtolower($orderby), "ASC");
-
- $sql->setParameters([$this->userId, "deleted", $value]);
-
- }
-
- return $this->findEntities($sql);
- }
-
- /**
- * Fetch all items that are associated to the current user
- * within a given timerange, not deleted and with applied filters
- *
- * @param string $date_start the range start
- * @param string $date_end the range end
- * @param ?string $status the status
- * @return Object[] list if matching items
- */
- function getActiveObjectsByDateRangeAndFilters(
- string $date_start,
- string $date_end,
- string $status = null,
- array $filter_tasks = [],
- string $orderby = "start",
- $shared = false
- ): array {
- $params = [
- "userid" => $this->userId,
- "deleted" => "deleted",
- "date_start" =>$date_start,
- "date_end" => $date_end,
- ];
- $sql = $this->db->getQueryBuilder();
- // Range can be one day as well
- if ($date_start === $date_end) {
- array_pop($params);
- if ($shared) {
- $sql
- ->selectDistinct("current.*")
- ->from($this->tableName, "current")
- ->innerJoin("current", "*PREFIX*timemanager_task", "task", "current.`task_uuid` = task.`uuid`")
- ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.`project_uuid` = project.`uuid`")
- ->leftJoin(
- "project",
- "*PREFIX*timemanager_share",
- "share",
- "project.`client_uuid` = share.`object_uuid` AND share.`author_user_id` = :userid"
- )
- ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
-
- $expr = $sql->expr()->orX("share.`author_user_id` = :userid", "current.`user_id` = :userid");
-
- $sql
- ->where($expr)
- ->andWhere("current.`status` != :deleted")
- ->andWhere("date(current.`start`) = :date_start");
- } else {
- $sql
- ->select("*")
- ->from($this->tableName)
- ->where("`user_id` = :userid")
- ->andWhere("`status` != :deleted")
- ->andWhere("date(start) = :date_start");
- }
- } else {
- if ($shared) {
- $sql
- ->selectDistinct("current.*")
- ->from($this->tableName, "current")
- ->innerJoin("current", "*PREFIX*timemanager_task", "task", "current.`task_uuid` = task.`uuid`")
- ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.`project_uuid` = project.`uuid`")
- ->leftJoin(
- "project",
- "*PREFIX*timemanager_share",
- "share",
- "project.`client_uuid` = share.`object_uuid` AND share.`author_user_id` = :userid"
- )
- ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
-
- $expr = $sql->expr()->orX("share.`author_user_id` = :userid", "current.`user_id` = :userid");
-
- $sql
- ->where($expr)
- ->andWhere("current.`status` != :deleted")
- ->andWhere("date(current.`start`) >= :date_start")
- ->andWhere("date(current.`start`) <= :date_end");
- } else {
- $sql
- ->select("*")
- ->from($this->tableName)
- ->where("`user_id` = :userid")
- ->andWhere("`status` != :deleted")
- ->andWhere("date(start) >= :date_start")
- ->andWhere("date(start) <= :date_end");
- }
- }
- if (isset($status) && $status) {
- if ($status === "paid") {
- $sql->andWhere("LOWER(`payment_status`) = :status");
- $params["status"] = strtolower($status);
- } else {
- $expr = $sql->expr()->orX("`payment_status` IS NULL", "LOWER(`payment_status`) <> :status");
- $sql->andWhere($expr);
- $params["status"] = "paid";
- }
- }
- if (count($filter_tasks) > 0) {
- $sql->andWhere("`task_uuid` IN ('" . implode("','", $filter_tasks) . "')");
+ "share.`recipient_id` IN ('".implode("','", $this->getUserGroups())."') AND share.`recipient_type` = 'group'",
+ "base.`user_id` = :userid",
+ ":admin_or_reporter",
+ ];
+
+ $sql->setParameter("admin_or_reporter", $this->userIsAdminOrReporter());
+
+ if (strpos($this->tableName, "_client") > -1) {
+ $sql->leftJoin("base", "*PREFIX*timemanager_share", "share", "base.`uuid` = share.`object_uuid`");
+ } elseif (strpos($this->tableName, "_project") > -1) {
+ $sql->leftJoin("base", "*PREFIX*timemanager_share", "share", "base.`client_uuid` = share.`object_uuid`");
+ } elseif (strpos($this->tableName, "_task") > -1) {
+ $sql->innerJoin("base", "*PREFIX*timemanager_project", "project", "base.`project_uuid` = project.`uuid`")
+ ->leftJoin("project", "*PREFIX*timemanager_share", "share", "project.`client_uuid` = share.`object_uuid`");
+ } elseif (strpos($this->tableName, "_time") > -1) {
+ $sql->innerJoin("base", "*PREFIX*timemanager_task", "task", "base.`task_uuid` = task.`uuid`")
+ ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.`project_uuid` = project.`uuid`")
+ ->leftJoin("project", "*PREFIX*timemanager_share", "share", "project.`client_uuid` = share.`object_uuid`");
+
+ $expr = [
+ "share.`author_user_id` = :userid",
+ "base.`user_id` = :userid",
+ ":admin_or_reporter",
+ ];
+ }
+
+ $sql->andWhere($sql->expr()->orX(...$expr));
+ } else {
+ if (!$isReporterOrAdmin) {
+ $sql->where("base.`user_id` = :userid");
+ }
}
- $sql->orderBy(\strtolower($orderby), "ASC");
- $sql->setParameters($params);
-
return $this->findEntities($sql);
}
@@ -289,8 +143,8 @@ function getObjectById(string $uuid): ?\OCP\AppFramework\Db\Entity {
}
}
- function getActiveObjectById(string $uuid, $shared = false): ?\OCP\AppFramework\Db\Entity {
- $objects = $this->getActiveObjectsByAttributeValue("uuid", $uuid, "created", $shared);
+ function getActiveObjectById(string $uuid, bool $shared = false, bool $isReporterOrAdmin = false): ?\OCP\AppFramework\Db\Entity {
+ $objects = $this->getActiveObjectsByAttributeValue("uuid", $uuid, "created", $shared, $isReporterOrAdmin);
if (count($objects) > 0) {
return $objects[0];
} else {
@@ -357,97 +211,78 @@ function getDeletedObjectsAfterCommit($sql) {
*
* @return Object[] list if matching items
*/
- function findActiveForCurrentUser($orderby = "created", $shared = false, $sort = "ASC") {
+ function findActiveForCurrentUser($orderBy = "created", $shared = false, $sort = "ASC"): array
+ {
$sql = $this->db->getQueryBuilder();
- if ($shared && strpos($this->tableName, "_client") > -1) {
- $sql
- ->selectDistinct("client.*")
- ->from($this->tableName, "client")
- ->leftJoin("client", "*PREFIX*timemanager_share", "share", "client.uuid = share.object_uuid")
- ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
+ $sql->selectDistinct("base.*")
+ ->from($this->tableName, "base");
- $expr = $sql->expr()->orX(
- "share.`recipient_id` = :userid AND share.`recipient_type` = 'user'",
- "group_user.`uid` = :userid AND share.`recipient_type` = 'group'",
- "client.user_id = :userid",
- );
- $sql->where($expr)->andWhere("client.status != :status");
-
- $sql->orderBy(\strtolower($orderby), $sort);
- $sql->setParameters(["userid" => $this->userId, "status" => "deleted"]);
-
- } elseif ($shared && strpos($this->tableName, "_project") > -1) {
- $sql
- ->selectDistinct("project.*")
- ->from($this->tableName, "project")
- ->leftJoin("project", "*PREFIX*timemanager_share", "share", "project.client_uuid = share.object_uuid")
- ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
-
- $expr = $sql->expr()->orX(
- "share.`recipient_id` = :userid AND share.`recipient_type` = 'user'",
- "group_user.`uid` = :userid AND share.`recipient_type` = 'group'",
- "project.user_id = :userid",
- );
- $sql->where($expr)->andWhere("project.status != :status");
+ $sql->where("base.status != :status")
+ ->orderBy(\strtolower($orderBy), $sort);;
- $sql->orderBy(\strtolower($orderby), $sort);
- $sql->setParameters(["userid" => $this->userId, "status" => "deleted"]);
+ $sql->setParameters([
+ "userid" => $this->userId,
+ "status" => "deleted",
+ ]);
- } elseif ($shared && strpos($this->tableName, "_task") > -1) {
- $sql
- ->selectDistinct("task.*")
- ->from($this->tableName, "task")
- ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.project_uuid = project.uuid")
- ->leftJoin(
- "project",
- "*PREFIX*timemanager_share",
- "share",
- "project.client_uuid = share.object_uuid AND share.author_user_id != :userid"
- )
- ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
-
- $expr = $sql->expr()->orX(
+ if ($shared) {
+ $expr = [
"share.`recipient_id` = :userid AND share.`recipient_type` = 'user'",
- "group_user.`uid` = :userid AND share.`recipient_type` = 'group'",
- "task.user_id = :userid",
- );
- $sql->where($expr)->andWhere("task.status != :status");
-
- $sql->orderBy(\strtolower($orderby), $sort);
- $sql->setParameters(["userid" => $this->userId, "status" => "deleted"]);
-
- } elseif ($shared && strpos($this->tableName, "_time") > -1) {
- $sql
- ->selectDistinct("time.*")
- ->from($this->tableName, "time")
- ->innerJoin("time", "*PREFIX*timemanager_task", "task", "time.task_uuid = task.uuid")
- ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.project_uuid = project.uuid")
- ->leftJoin(
- "project",
- "*PREFIX*timemanager_share",
- "share",
- "project.client_uuid = share.object_uuid AND share.author_user_id = :userid"
- );
-
- $expr = $sql->expr()->orX("share.author_user_id = :userid", "time.user_id = :userid");
- $sql->where($expr)->andWhere("time.status != :status");
-
- $sql->orderBy(\strtolower($orderby), $sort);
- $sql->setParameters(["userid" => $this->userId, "status" => "deleted"]);
-
+ "share.`recipient_id` IN ('".implode("','", $this->getUserGroups())."') AND share.`recipient_type` = 'group'",
+ "base.user_id = :userid",
+ ":admin_or_reporter"
+ ];
+
+ $sql->setParameter("admin_or_reporter", $this->userIsAdminOrReporter());
+
+ if (strpos($this->tableName, "_client") > -1) {
+ $sql->leftJoin("base", "*PREFIX*timemanager_share", "share", "base.uuid = share.object_uuid");
+ } elseif (strpos($this->tableName, "_project") > -1) {
+ $sql->leftJoin("base", "*PREFIX*timemanager_share", "share", "base.client_uuid = share.object_uuid");
+ } elseif (strpos($this->tableName, "_task") > -1) {
+ $sql->innerJoin("base", "*PREFIX*timemanager_project", "project", "base.project_uuid = project.uuid")
+ ->leftJoin("project", "*PREFIX*timemanager_share","share","project.client_uuid = share.object_uuid");
+ } elseif (strpos($this->tableName, "_time") > -1) {
+ $sql->innerJoin("base", "*PREFIX*timemanager_task", "task", "base.task_uuid = task.uuid")
+ ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.project_uuid = project.uuid")
+ ->leftJoin(
+ "project",
+ "*PREFIX*timemanager_share",
+ "share",
+ "project.client_uuid = share.object_uuid"
+ );
+
+ $expr = [
+ "share.author_user_id = :userid",
+ "base.user_id = :userid",
+ ":admin_or_reporter",
+ ];
+ }
+
+ $sql->andWhere($sql->expr()->orX(...$expr));
} else {
- $sql = $this->db->getQueryBuilder();
- $sql
- ->select("*")
- ->from($this->tableName)
- ->where("user_id = ?")
- ->andWhere("status != ?")
- ->orderBy(\strtolower($orderby), $sort);
-
- $sql->setParameters([$this->userId, "deleted"]);
-
+ $sql->andWhere("base.user_id = :userid");
}
return $this->findEntities($sql);
}
+
+ /**
+ * Fetch all items that are not deleted
+ *
+ * @return Object[] list if matching items
+ */
+ function findActiveForReporter($orderby = "created", $sort = "ASC"): array
+ {
+ $sql = $this->db->getQueryBuilder();
+
+ $sql
+ ->selectDistinct("base.*")
+ ->from($this->tableName, "base")
+ ->andWhere("base.status != :status")
+ ->orderBy(\strtolower($orderby), $sort)
+ ->setParameter("status", "deleted");
+
+ return $this->findEntities($sql);
+ }
}
diff --git a/lib/Db/ProjectMapper.php b/lib/Db/ProjectMapper.php
index b2426e8..0648324 100644
--- a/lib/Db/ProjectMapper.php
+++ b/lib/Db/ProjectMapper.php
@@ -2,7 +2,10 @@
namespace OCA\TimeManager\Db;
+use OCP\IConfig;
use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
/**
* Class ProjectMapper
@@ -11,14 +14,14 @@
* @method Project insert(Project $entity)
*/
class ProjectMapper extends ObjectMapper {
- private $taskMapper;
+ private TaskMapper $taskMapper;
- public function __construct(IDBConnection $db, CommitMapper $commitMapper, TaskMapper $taskMapper) {
- parent::__construct($db, $commitMapper, "timemanager_project");
+ public function __construct(IDBConnection $db, IConfig $config, IUserManager $userManager, IGroupManager $groupManager, CommitMapper $commitMapper, TaskMapper $taskMapper) {
+ parent::__construct($db, $config, $userManager, $groupManager, $commitMapper, "timemanager_project");
$this->taskMapper = $taskMapper;
}
- public function deleteWithChildrenByClientId($uuid, $commit) {
+ public function deleteWithChildrenByClientId(string $uuid, string $commit): void {
$projects = $this->getActiveObjectsByAttributeValue("client_uuid", $uuid);
foreach ($projects as $project) {
$project->setCommit($commit);
@@ -29,17 +32,19 @@ public function deleteWithChildrenByClientId($uuid, $commit) {
}
}
- public function deleteChildrenForEntityById($uuid, $commit) {
+ public function deleteChildrenForEntityById(string $uuid, string $commit): void
+ {
$this->taskMapper->deleteWithChildrenByProjectId($uuid, $commit);
}
- /**
- * Gets the number of tasks for a given object.
- *
- * @param string $userId the user id to filter
- * @return Client[] list if matching items
- */
- public function countTasks($uuid) {
+ /**
+ * Gets the number of tasks for a given object.
+ *
+ * @param string $uuid
+ * @return int list if matching items
+ */
+ public function countTasks(string $uuid): int
+ {
$tasks = $this->taskMapper->getActiveObjectsByAttributeValue("project_uuid", $uuid, "created", true);
return count($tasks);
}
diff --git a/lib/Db/ShareMapper.php b/lib/Db/ShareMapper.php
index 351f3da..eed5aa7 100644
--- a/lib/Db/ShareMapper.php
+++ b/lib/Db/ShareMapper.php
@@ -2,7 +2,10 @@
namespace OCA\TimeManager\Db;
+use OCP\IConfig;
use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
/**
* Class ItemMapper
@@ -10,15 +13,14 @@
* @package OCA\TimeManager\Db
*/
class ShareMapper extends ObjectMapper {
- protected IDBConnection $connection;
- public function __construct(IDBConnection $connection, CommitMapper $commitMapper) {
- $this->connection = $connection;
- parent::__construct($connection, $commitMapper, "timemanager_share");
+ public function __construct(IDBConnection $db, IConfig $config, IUserManager $userManager, IGroupManager $groupManager, CommitMapper $commitMapper) {
+ parent::__construct($db, $config, $userManager, $groupManager, $commitMapper, "timemanager_share");
}
public function findShareesForClient($client_uuid): array {
- $sql = $this->connection->getQueryBuilder();
+ $sql = $this->db->getQueryBuilder();
+
$sql
->select("*")
->from($this->tableName)
@@ -26,11 +28,12 @@ public function findShareesForClient($client_uuid): array {
->andWhere("`object_uuid` = ?")
->andWhere("`entity_type` = 'client'");
$sql->setParameters([$this->userId, $client_uuid]);
+
return $this->findEntities($sql);
}
public function findSharerForClient($client_uuid): array {
- $sql = $this->connection->getQueryBuilder();
+ $sql = $this->db->getQueryBuilder();
$expr = $sql->expr()->orX(
"share.`recipient_id` = :userid AND share.`recipient_type` = 'user'",
@@ -45,11 +48,12 @@ public function findSharerForClient($client_uuid): array {
->andWhere("`object_uuid` = :client_uuid")
->andWhere("`entity_type` = 'client'");
$sql->setParameters(["userid" => $this->userId, "client_uuid" => $client_uuid]);
+
return $this->findEntities($sql);
}
public function findByUuid($uuid): array {
- $sql = $this->connection->getQueryBuilder();
+ $sql = $this->db->getQueryBuilder();
$sql
->select("*")
->from($this->tableName)
@@ -57,6 +61,12 @@ public function findByUuid($uuid): array {
->andWhere("`uuid` = ?")
->andWhere("`entity_type` = 'client'");
$sql->setParameters([$this->userId, $uuid]);
+
return $this->findEntities($sql);
}
+
+ public function deleteChildrenForEntityById(string $uuid, string $commit): void
+ {
+ // Do nothing here, because shares have no children.
+ }
}
diff --git a/lib/Db/StorageHelper.php b/lib/Db/StorageHelper.php
index 8946772..ce89a39 100644
--- a/lib/Db/StorageHelper.php
+++ b/lib/Db/StorageHelper.php
@@ -309,20 +309,27 @@ function prepareObjectForInsert(array $object): array {
* @param string|null $clients A comma-separated list of client uuids
* @param string|null $projects A comma-separated list of project uuids
* @param string|null $tasks A comma-separated list of task uuids
- * @return array A comma-separated list of task uuids
+ * @return ?array A comma-separated list of task uuids
*/
function getTaskListFromFilters(
string $clients = null,
string $projects = null,
string $tasks = null,
- $shared = false
- ): array {
- $all_projects = $this->projectMapper->findActiveForCurrentUser("name", $shared);
- $all_tasks = $this->taskMapper->findActiveForCurrentUser("name", $shared);
+ bool $shared = false,
+ bool $isReporterOrAdmin = false,
+ ): ?array {
+ if ($isReporterOrAdmin) {
+ $all_projects = $this->projectMapper->findActiveForReporter("name");
+ $all_tasks = $this->taskMapper->findActiveForReporter("name");
+ } else {
+ $all_projects = $this->projectMapper->findActiveForCurrentUser("name", $shared);
+ $all_tasks = $this->taskMapper->findActiveForCurrentUser("name", $shared);
+ }
// Get task uuids related to filters.
// Filters are exclusive from finer to coarse.
// That is, finer filters override more coarse filters.
+ // If this filter_tasks array stays empty, there is no entry shown
// Example: If a task filter is set, project and client filters will be ignored
$filter_tasks = [];
if (isset($tasks) && strlen($tasks) > 0) {
@@ -352,10 +359,12 @@ function getTaskListFromFilters(
}
}
}
- }
- $filter_tasks = array_unique($filter_tasks);
+ } else {
+ // in case there is no task filtered use null
+ return null;
+ }
- return $filter_tasks;
+ return array_unique($filter_tasks);
}
/**
diff --git a/lib/Db/TaskMapper.php b/lib/Db/TaskMapper.php
index 6928319..9913257 100644
--- a/lib/Db/TaskMapper.php
+++ b/lib/Db/TaskMapper.php
@@ -2,7 +2,10 @@
namespace OCA\TimeManager\Db;
+use OCP\IConfig;
use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
/**
* Class TaskMapper
@@ -11,14 +14,15 @@
* @method Task insert(Task $entity)
*/
class TaskMapper extends ObjectMapper {
- private $timeMapper;
+ private TimeMapper $timeMapper;
- public function __construct(IDBConnection $db, CommitMapper $commitMapper, TimeMapper $timeMapper) {
- parent::__construct($db, $commitMapper, "timemanager_task");
+ public function __construct(IDBConnection $db, IConfig $config, IUserManager $userManager, IGroupManager $groupManager, CommitMapper $commitMapper, TimeMapper $timeMapper) {
+ parent::__construct($db, $config, $userManager, $groupManager, $commitMapper, "timemanager_task");
$this->timeMapper = $timeMapper;
}
- public function deleteWithChildrenByProjectId($uuid, $commit) {
+ public function deleteWithChildrenByProjectId($uuid, $commit): void
+ {
$tasks = $this->getActiveObjectsByAttributeValue("project_uuid", $uuid);
foreach ($tasks as $task) {
$task->setChanged(date("Y-m-d H:i:s"));
@@ -29,7 +33,8 @@ public function deleteWithChildrenByProjectId($uuid, $commit) {
}
}
- public function deleteChildrenForEntityById($uuid, $commit) {
+ public function deleteChildrenForEntityById(string $uuid, string $commit): void
+ {
$this->timeMapper->deleteByTaskId($uuid, $commit);
}
diff --git a/lib/Db/TimeMapper.php b/lib/Db/TimeMapper.php
index abe6589..942be1f 100644
--- a/lib/Db/TimeMapper.php
+++ b/lib/Db/TimeMapper.php
@@ -2,7 +2,10 @@
namespace OCA\TimeManager\Db;
+use OCP\IConfig;
use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
/**
* Class TimeMapper
@@ -10,32 +13,110 @@
* @package OCA\TimeManager\Db
* @method Time insert(Time $entity)
*/
-class TimeMapper extends ObjectMapper {
- public function __construct(IDBConnection $db, CommitMapper $commitMapper) {
- parent::__construct($db, $commitMapper, "timemanager_time");
- }
-
- public function deleteByTaskId($uuid, $commit) {
- $times = $this->getActiveObjectsByAttributeValue("task_uuid", $uuid);
- foreach ($times as $time) {
- $time->setCommit($commit);
- $time->setChanged(date("Y-m-d H:i:s"));
- $time->setStatus("deleted");
- $this->update($time);
- }
- }
-
- public function deleteChildrenForEntityById($uuid, $commit) {
- // Do nothing here, because times have no children.
- }
-
- public function findForReport(
- string $start,
- string $end,
- string $status = null,
- array $filter_tasks = [],
- $shared = false
- ) {
- return $this->getActiveObjectsByDateRangeAndFilters($start, $end, $status, $filter_tasks, "start", $shared);
- }
+class TimeMapper extends ObjectMapper
+{
+ public function __construct(IDBConnection $db, IConfig $config, IUserManager $userManager, IGroupManager $groupManager, CommitMapper $commitMapper)
+ {
+ parent::__construct($db, $config, $userManager, $groupManager, $commitMapper, "timemanager_time");
+ }
+
+ public function deleteByTaskId($uuid, $commit): void
+ {
+ $times = $this->getActiveObjectsByAttributeValue("task_uuid", $uuid);
+ foreach ($times as $time) {
+ $time->setCommit($commit);
+ $time->setChanged(date("Y-m-d H:i:s"));
+ $time->setStatus("deleted");
+ $this->update($time);
+ }
+ }
+
+ public function deleteChildrenForEntityById($uuid, $commit): void
+ {
+ // Do nothing here, because times have no children.
+ }
+
+ /**
+ *
+ * Fetch all time items that are associated to the current user
+ * within a given timerange, not deleted and with applied filters
+ *
+ * @param string $date_start
+ * @param string $date_end
+ * @param string|null $status
+ * @param array|null $filter_tasks
+ * @param bool $shared
+ * @param bool $isReporterOrAdmin
+ * @return array
+ * @throws \OCP\DB\Exception
+ */
+ public function findForReport(
+ string $date_start,
+ string $date_end,
+ string $status = null,
+ ?array $filter_tasks = [],
+ bool $shared = false,
+ bool $isReporterOrAdmin = false,
+ ): array {
+ $params = [
+ "userid" => $this->userId,
+ "deleted" => "deleted",
+ "date_start" => $date_start,
+ "date_end" => $date_end,
+ ];
+ $sql = $this->db->getQueryBuilder();
+ if ($isReporterOrAdmin) {
+ $shared = false;
+ }
+
+ $sql->selectDistinct("current.*")
+ ->from($this->tableName, "current")
+ ->where("current.`status` != :deleted");
+
+ if ($shared) {
+ $sql->innerJoin("current", "*PREFIX*timemanager_task", "task", "current.`task_uuid` = task.`uuid`")
+ ->innerJoin("task", "*PREFIX*timemanager_project", "project", "task.`project_uuid` = project.`uuid`")
+ ->leftJoin(
+ "project",
+ "*PREFIX*timemanager_share",
+ "share",
+ "project.`client_uuid` = share.`object_uuid` AND share.`author_user_id` = :userid"
+ )
+ ->leftJoin("share", "*PREFIX*group_user", "group_user", "share.recipient_id = group_user.gid");
+
+ $expr = $sql->expr()
+ ->orX("share.`author_user_id` = :userid", "current.`user_id` = :userid");
+
+ $sql->andWhere($expr);
+ } elseif (!$isReporterOrAdmin) {
+ $sql->andWhere("current.`user_id` = :userid");
+ }
+
+ // Range can be one day as well
+ if ($date_start === $date_end) {
+ $sql->andWhere("date(current.`start`) = :date_start");
+ } else {
+ $sql->andWhere("date(current.`start`) >= :date_start")
+ ->andWhere("date(current.`start`) <= :date_end");
+ }
+ if (isset($status) && $status) {
+ if ($status === "paid") {
+ $sql->andWhere("LOWER(`payment_status`) = :status");
+ $params["status"] = strtolower($status);
+ } else {
+ $expr = $sql->expr()
+ ->orX("`payment_status` IS NULL", "LOWER(`payment_status`) <> :status");
+ $sql->andWhere($expr);
+ $params["status"] = "paid";
+ }
+ }
+ if (is_array($filter_tasks)) {
+ $sql->andWhere("`task_uuid` IN ('" . implode("','", $filter_tasks) . "')");
+ }
+
+ $sql->orderBy("start", "ASC");
+ $sql->setParameters($params);
+
+ return $this->findEntities($sql);
+ }
}
diff --git a/lib/Sections/TimeManagerAdmin.php b/lib/Sections/TimeManagerAdmin.php
new file mode 100644
index 0000000..a33e7c1
--- /dev/null
+++ b/lib/Sections/TimeManagerAdmin.php
@@ -0,0 +1,38 @@
+l->t("TimeManager");
+ }
+
+ public function getPriority(): int
+ {
+ return 98;
+ }
+
+ public function getIcon(): string
+ {
+ return $this->urlGenerator->imagePath(Application::APP_ID, 'timemanager-dark.svg');
+ }
+}
diff --git a/lib/Settings/TimeManagerAdmin.php b/lib/Settings/TimeManagerAdmin.php
new file mode 100644
index 0000000..b93ff2d
--- /dev/null
+++ b/lib/Settings/TimeManagerAdmin.php
@@ -0,0 +1,48 @@
+groupManager->getBackends() as $backend) {
+ $groups = array_merge($groups, $backend->getGroups());
+ }
+
+ $parameters = [
+ 'groups' => array_unique($groups),
+ 'reporter_group' => $this->config->getAppValue(Application::APP_ID, 'reporter_group'),
+ 'sync_mode' => $this->config->getAppValue(Application::APP_ID, 'sync_mode', 'force_skip_conflict_handling'),
+ ];
+
+ Util::addScript(Application::APP_ID, 'settings');
+
+ return new TemplateResponse(Application::APP_ID, 'settings/admin', $parameters);
+ }
+
+ public function getSection(): string
+ {
+ return Application::APP_ID;
+ }
+
+ public function getPriority(): int
+ {
+ return 10;
+ }
+}
diff --git a/package-lock.json b/package-lock.json
index eacefb3..7ad7455 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
- "@nextcloud/browserslist-config": "^2.0.0",
+ "@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/l10n": "^2.1.0",
"@popperjs/core": "^2.11.8",
"csv-parse": "^5.4.0",
@@ -28,7 +28,7 @@
"@babel/preset-env": "^7.22.6",
"@nextcloud/auth": "^2.0.0",
"@nextcloud/router": "^2.0.1",
- "@prettier/plugin-php": "^0.19.6",
+ "@prettier/plugin-php": "^0.20.1",
"babel-eslint": "^10.1.0",
"core-js": "^3.31.0",
"eslint": "^8.44.0",
@@ -1839,9 +1839,9 @@
}
},
"node_modules/@eslint-community/regexpp": {
- "version": "4.9.1",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
- "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.0.tgz",
+ "integrity": "sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==",
"dev": true,
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -2744,9 +2744,13 @@
}
},
"node_modules/@nextcloud/browserslist-config": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.0.0.tgz",
- "integrity": "sha512-tWs+OGgA1Oaq/LKUQxFUpPwnLW5Q2ZsjqeHT/v1ABG39bTlXakyg7lFRLtQ3Zj8ErjXl73WyTsF20d9o5BhmEg=="
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.3.0.tgz",
+ "integrity": "sha512-1Tpkof2e9Q0UicHWahQnXXrubJoqyiaqsH9G52v3cjGeVeH3BCfa1FOa41eBwBSFe2/Jxj/wCH2YVLgIXpWbBg==",
+ "engines": {
+ "node": "^16.0.0",
+ "npm": "^7.0.0 || ^8.0.0"
+ }
},
"node_modules/@nextcloud/event-bus": {
"version": "3.0.2",
@@ -2762,9 +2766,9 @@
}
},
"node_modules/@nextcloud/event-bus/node_modules/semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -2858,9 +2862,9 @@
}
},
"node_modules/@npmcli/fs/node_modules/semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -2895,17 +2899,17 @@
}
},
"node_modules/@prettier/plugin-php": {
- "version": "0.19.6",
- "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.19.6.tgz",
- "integrity": "sha512-MFaBfdxfTbGNwClJ/EZd2ROTa/Bd7EV+ff2KG769I9RsmNcVWcHARIYlSlJqFGgSbumOm+Ylm6RIXdxb5kG+OA==",
+ "version": "0.20.1",
+ "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.20.1.tgz",
+ "integrity": "sha512-CFn+NH44jb0buvg8D/DvLjeetadmNBMRq3yrgL8I+tXioDZlhQ+eBLLRILPEBIQ6jBmOjzm/Q7Qin8KD7raiFw==",
"dev": true,
"dependencies": {
"linguist-languages": "^7.21.0",
- "mem": "^8.0.0",
+ "mem": "^9.0.2",
"php-parser": "^3.1.5"
},
"peerDependencies": {
- "prettier": "^1.15.0 || ^2.0.0"
+ "prettier": "^3.0.0"
}
},
"node_modules/@rollup/pluginutils": {
@@ -4492,9 +4496,9 @@
}
},
"node_modules/eslint-plugin-n": {
- "version": "16.2.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.2.0.tgz",
- "integrity": "sha512-AQER2jEyQOt1LG6JkGJCCIFotzmlcCZFur2wdKrp1JX2cNotC7Ae0BcD/4lLv3lUAArM9uNS8z/fsvXTd0L71g==",
+ "version": "16.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.1.0.tgz",
+ "integrity": "sha512-3wv/TooBst0N4ND+pnvffHuz9gNPmk/NkLwAxOt2JykTl/hcuECe6yhTtLJcZjIxtZwN+GX92ACp/QTLpHA3Hg==",
"dev": true,
"peer": true,
"dependencies": {
@@ -7814,16 +7818,16 @@
}
},
"node_modules/mem": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
- "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-9.0.2.tgz",
+ "integrity": "sha512-F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A==",
"dev": true,
"dependencies": {
"map-age-cleaner": "^0.1.3",
- "mimic-fn": "^3.1.0"
+ "mimic-fn": "^4.0.0"
},
"engines": {
- "node": ">=10"
+ "node": ">=12.20"
},
"funding": {
"url": "https://github.com/sindresorhus/mem?sponsor=1"
@@ -7896,12 +7900,15 @@
}
},
"node_modules/mimic-fn": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
- "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
"dev": true,
"engines": {
- "node": ">=8"
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/min-indent": {
@@ -8154,9 +8161,9 @@
}
},
"node_modules/node-gyp/node_modules/semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -8440,9 +8447,9 @@
}
},
"node_modules/node-sass/node_modules/semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -8559,9 +8566,9 @@
}
},
"node_modules/normalize-package-data/node_modules/semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -8700,7 +8707,7 @@
"node_modules/p-defer": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
- "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+ "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
"dev": true,
"engines": {
"node": ">=4"
@@ -9197,9 +9204,9 @@
}
},
"node_modules/read-pkg/node_modules/semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"dev": true,
"bin": {
"semver": "bin/semver"
@@ -9350,9 +9357,9 @@
}
},
"node_modules/resolve": {
- "version": "1.22.8",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
- "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+ "version": "1.22.6",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
+ "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
"dev": true,
"dependencies": {
"is-core-module": "^2.13.0",
@@ -9653,9 +9660,9 @@
}
},
"node_modules/semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@@ -11820,9 +11827,9 @@
}
},
"@eslint-community/regexpp": {
- "version": "4.9.1",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
- "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.0.tgz",
+ "integrity": "sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==",
"dev": true
},
"@eslint/eslintrc": {
@@ -12506,9 +12513,9 @@
}
},
"@nextcloud/browserslist-config": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.0.0.tgz",
- "integrity": "sha512-tWs+OGgA1Oaq/LKUQxFUpPwnLW5Q2ZsjqeHT/v1ABG39bTlXakyg7lFRLtQ3Zj8ErjXl73WyTsF20d9o5BhmEg=="
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.3.0.tgz",
+ "integrity": "sha512-1Tpkof2e9Q0UicHWahQnXXrubJoqyiaqsH9G52v3cjGeVeH3BCfa1FOa41eBwBSFe2/Jxj/wCH2YVLgIXpWbBg=="
},
"@nextcloud/event-bus": {
"version": "3.0.2",
@@ -12520,9 +12527,9 @@
},
"dependencies": {
"semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -12592,9 +12599,9 @@
},
"dependencies": {
"semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -12618,13 +12625,13 @@
"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="
},
"@prettier/plugin-php": {
- "version": "0.19.6",
- "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.19.6.tgz",
- "integrity": "sha512-MFaBfdxfTbGNwClJ/EZd2ROTa/Bd7EV+ff2KG769I9RsmNcVWcHARIYlSlJqFGgSbumOm+Ylm6RIXdxb5kG+OA==",
+ "version": "0.20.1",
+ "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.20.1.tgz",
+ "integrity": "sha512-CFn+NH44jb0buvg8D/DvLjeetadmNBMRq3yrgL8I+tXioDZlhQ+eBLLRILPEBIQ6jBmOjzm/Q7Qin8KD7raiFw==",
"dev": true,
"requires": {
"linguist-languages": "^7.21.0",
- "mem": "^8.0.0",
+ "mem": "^9.0.2",
"php-parser": "^3.1.5"
}
},
@@ -13921,9 +13928,9 @@
}
},
"eslint-plugin-n": {
- "version": "16.2.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.2.0.tgz",
- "integrity": "sha512-AQER2jEyQOt1LG6JkGJCCIFotzmlcCZFur2wdKrp1JX2cNotC7Ae0BcD/4lLv3lUAArM9uNS8z/fsvXTd0L71g==",
+ "version": "16.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.1.0.tgz",
+ "integrity": "sha512-3wv/TooBst0N4ND+pnvffHuz9gNPmk/NkLwAxOt2JykTl/hcuECe6yhTtLJcZjIxtZwN+GX92ACp/QTLpHA3Hg==",
"dev": true,
"peer": true,
"requires": {
@@ -16266,13 +16273,13 @@
"dev": true
},
"mem": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
- "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-9.0.2.tgz",
+ "integrity": "sha512-F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A==",
"dev": true,
"requires": {
"map-age-cleaner": "^0.1.3",
- "mimic-fn": "^3.1.0"
+ "mimic-fn": "^4.0.0"
}
},
"meow": {
@@ -16326,9 +16333,9 @@
}
},
"mimic-fn": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
- "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
"dev": true
},
"min-indent": {
@@ -16525,9 +16532,9 @@
}
},
"semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -16748,9 +16755,9 @@
}
},
"semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -16838,9 +16845,9 @@
},
"dependencies": {
"semver": {
- "version": "7.3.8",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
- "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -16941,7 +16948,7 @@
"p-defer": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
- "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+ "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
"dev": true
},
"p-limit": {
@@ -17232,9 +17239,9 @@
}
},
"semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"dev": true
},
"type-fest": {
@@ -17406,9 +17413,9 @@
"dev": true
},
"resolve": {
- "version": "1.22.8",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
- "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+ "version": "1.22.6",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
+ "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
"dev": true,
"requires": {
"is-core-module": "^2.13.0",
@@ -17624,9 +17631,9 @@
}
},
"semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true
},
"set-blocking": {
diff --git a/package.json b/package.json
index e337794..92a0bd6 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"@babel/preset-env": "^7.22.6",
"@nextcloud/auth": "^2.0.0",
"@nextcloud/router": "^2.0.1",
- "@prettier/plugin-php": "^0.19.6",
+ "@prettier/plugin-php": "^0.20.1",
"babel-eslint": "^10.1.0",
"core-js": "^3.31.0",
"eslint": "^8.44.0",
@@ -49,7 +49,7 @@
"svelte": "^3.58.0"
},
"dependencies": {
- "@nextcloud/browserslist-config": "^2.0.0",
+ "@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/l10n": "^2.1.0",
"@popperjs/core": "^2.11.8",
"csv-parse": "^5.4.0",
diff --git a/templates/partials/navigation.php b/templates/partials/navigation.php
index 86c6036..a0d7165 100644
--- a/templates/partials/navigation.php
+++ b/templates/partials/navigation.php
@@ -72,15 +72,4 @@ class="timemanager-pjax-link
-
-
-
\ No newline at end of file
+
diff --git a/templates/settings/admin.php b/templates/settings/admin.php
new file mode 100644
index 0000000..ec798b9
--- /dev/null
+++ b/templates/settings/admin.php
@@ -0,0 +1,32 @@
+
+
+