JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
StudioTem committed 2025-04-30 16:04:39 +02:00
1 parent ecd7891894
commit 8bb0ddb962
1 file changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files
be/app/Services/Office365/Office365Service.php
+11 -11
View File
@@ -86,8 +86,8 @@ class Office365Service
$blockerToInsert['user_id'] = $user->id; $blockerToInsert['user_id'] = $user->id;
$blockerToInsert['name'] = $blocker['subject']; $blockerToInsert['name'] = $blocker['subject'];
$blockerToInsert['type'] = "office365_blocker"; $blockerToInsert['type'] = "office365_blocker";
$blockerToInsert['start'] = $blocker['start']['dateTime']; $blockerToInsert['start'] = Carbon::parse($blocker['start']['dateTime'])->setTimezone('Europe/Bratislava');
$blockerToInsert['end'] = $blocker['end']['dateTime']; $blockerToInsert['end'] = Carbon::parse($blocker['end']['dateTime'])->setTimezone('Europe/Bratislava');
$blockerToInsert['approved'] = 1; $blockerToInsert['approved'] = 1;
$blockerToInsert['created_at'] = Carbon::now()->toDateTimeString(); $blockerToInsert['created_at'] = Carbon::now()->toDateTimeString();
$blockerToInsert['updated_at'] = Carbon::now()->toDateTimeString(); $blockerToInsert['updated_at'] = Carbon::now()->toDateTimeString();
@@ -168,8 +168,8 @@ class Office365Service
'user_id' => $user->id, 'user_id' => $user->id,
'name' => $editedBlocker['subject'], 'name' => $editedBlocker['subject'],
'type' => "office365_blocker", 'type' => "office365_blocker",
'start' => $editedBlocker['start']['dateTime'], 'start' => Carbon::parse($editedBlocker['start']['dateTime'])->setTimezone('Europe/Bratislava'),
'end' => $editedBlocker['end']['dateTime'], 'end' => Carbon::parse($editedBlocker['end']['dateTime'])->setTimezone('Europe/Bratislava'),
'approved' => 1, 'approved' => 1,
'created_at' => Carbon::now()->toDateTimeString(), 'created_at' => Carbon::now()->toDateTimeString(),
'updated_at' => Carbon::now()->toDateTimeString() 'updated_at' => Carbon::now()->toDateTimeString()
@@ -179,8 +179,8 @@ class Office365Service
$blocker->update([ $blocker->update([
'office365_change_key' => $editedBlocker['changeKey'], 'office365_change_key' => $editedBlocker['changeKey'],
'name' => $editedBlocker['subject'], 'name' => $editedBlocker['subject'],
'start' => $editedBlocker['start']['dateTime'], 'start' => Carbon::parse($editedBlocker['start']['dateTime'])->setTimezone('Europe/Bratislava'),
'end' => $editedBlocker['end']['dateTime'], 'end' => Carbon::parse($editedBlocker['end']['dateTime'])->setTimezone('Europe/Bratislava'),
'updated_at' => Carbon::now()->toDateTimeString(), 'updated_at' => Carbon::now()->toDateTimeString(),
]); ]);
} }
@@ -259,8 +259,8 @@ class Office365Service
$subtask->syncTimeblocks([ $subtask->syncTimeblocks([
[ [
'sub_task_id' => $subtask->id, 'sub_task_id' => $subtask->id,
'start' => $newSubtask['start']['dateTime'], 'start' => Carbon::parse($newSubtask['start']['dateTime'])->setTimezone('Europe/Bratislava'),
'end' => $newSubtask['end']['dateTime'], 'end' => Carbon::parse($newSubtask['end']['dateTime'])->setTimezone('Europe/Bratislava'),
'is_finished' => 0, 'is_finished' => 0,
] ]
]); ]);
@@ -347,12 +347,12 @@ class Office365Service
$oldTimeblock = $subtask->timeblocks->first(); $oldTimeblock = $subtask->timeblocks->first();
// ak sa zmenilo trvanie alebo casy subtasku, tak sa updatne aj timeblock // ak sa zmenilo trvanie alebo casy subtasku, tak sa updatne aj timeblock
if ($oldTimeblock['start'] != $editedSubtask['start']['dateTime'] || $oldTimeblock['end'] != $editedSubtask['end']['dateTime']) { if ($oldTimeblock['start'] != Carbon::parse($editedSubtask['start']['dateTime'])->setTimezone('Europe/Bratislava') || $oldTimeblock['end'] != Carbon::parse($editedSubtask['end']['dateTime'])->setTimezone('Europe/Bratislava')) {
$subtask->syncTimeblocks([ $subtask->syncTimeblocks([
[ [
'sub_task_id' => $subtask->id, 'sub_task_id' => $subtask->id,
'start' => $editedSubtask['start']['dateTime'], 'start' => Carbon::parse($editedSubtask['start']['dateTime'])->setTimezone('Europe/Bratislava'),
'end' => $editedSubtask['end']['dateTime'], 'end' => Carbon::parse($editedSubtask['end']['dateTime'])->setTimezone('Europe/Bratislava'),
'is_finished' => 0, 'is_finished' => 0,
] ]
]); ]);