Merge branch 'main' of https://framagit.org/isUnknown/pdc-b2b-project-management-platform into main
This commit is contained in:
commit
542991d688
3 changed files with 7 additions and 6 deletions
|
|
@ -16,6 +16,9 @@ return [
|
||||||
'isValidated' => 'true'
|
'isValidated' => 'true'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
$timezone = new DateTimeZone('Europe/Paris');
|
||||||
|
$dateTime = new DateTime('now', $timezone);
|
||||||
|
|
||||||
$notification = [
|
$notification = [
|
||||||
'location' => [
|
'location' => [
|
||||||
'href' => (string) $href,
|
'href' => (string) $href,
|
||||||
|
|
@ -24,7 +27,7 @@ return [
|
||||||
'uri' => (string) $project->url()
|
'uri' => (string) $project->url()
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
'date' => $newPage->modified('YYYY-MM-DD'),
|
'date' => $dateTime->format('Y-m-d\TH:i:sP'),
|
||||||
'author' => [
|
'author' => [
|
||||||
'name' => (string) kirby()->user()->name(),
|
'name' => (string) kirby()->user()->name(),
|
||||||
'email' => (string) kirby()->user()->email(),
|
'email' => (string) kirby()->user()->email(),
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ class ProjectPage extends Page {
|
||||||
'slug' => $child->slug(),
|
'slug' => $child->slug(),
|
||||||
'index' => intval($child->stepIndex()->value()),
|
'index' => intval($child->stepIndex()->value()),
|
||||||
'modified' => $child->modified('Y-MM-dd'),
|
'modified' => $child->modified('Y-MM-dd'),
|
||||||
'isValidated' => (bool) $child->isValidated()->value() ?? false,
|
'isValidated' => $child->isValidated() == 'true' ? true : false,
|
||||||
'uri' => $uri,
|
'uri' => $uri,
|
||||||
'files' => $files,
|
'files' => $files,
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -137,11 +137,9 @@ const tabs = computed(() => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const sortedNotifications = computed(() => {
|
const sortedNotifications = computed(() => {
|
||||||
const sortedNotifications = notifications.value.sort((a, b) => {
|
return [...notifications.value].sort((a, b) => {
|
||||||
dayjs(b.date).diff(dayjs(a.date));
|
return dayjs(b.date).diff(dayjs(a.date));
|
||||||
});
|
});
|
||||||
|
|
||||||
return sortedNotifications;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function changeTab(newValue) {
|
function changeTab(newValue) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue