amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

feat: refactor how activities are managed and displayed (#2299)

Browse Source
This commit is contained in:
Regis Freyd
2019-12-16 20:42:02 -05:00
committed by GitHub
parent 44fa4871a4
commit 161ffcdc1f
64 changed files with 2114 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Unit/Models/JournalEntryTest.php
+6 -6
View File
@@ -52,7 +52,7 @@ class JournalEntryTest extends TestCase
public function test_get_add_adds_data_of_the_right_type()
{
$activity = factory(Activity::class)->create();
$date = $activity->date_it_happened;
$date = $activity->happened_at;
$journalEntry = JournalEntry::add($activity);
@@ -76,11 +76,11 @@ class JournalEntryTest extends TestCase
'activity_type' => (! is_null($activity->type) ? $activity->type->name : null),
'summary' => $activity->summary,
'description' => $activity->description,
'day' => $activity->date_it_happened->day,
'day_name' => $activity->date_it_happened->format('D'),
'month' => $activity->date_it_happened->month,
'month_name' => strtoupper($activity->date_it_happened->format('M')),
'year' => $activity->date_it_happened->year,
'day' => $activity->happened_at->day,
'day_name' => $activity->happened_at->format('D'),
'month' => $activity->happened_at->month,
'month_name' => strtoupper($activity->happened_at->format('M')),
'year' => $activity->happened_at->year,
'attendees' => $activity->getContactsForAPI(),
];