feat: add date of creation in journal (#4949)

monicahq · Mar 27, 2021 · be85cad · be85cad
1 parent 5728c6e
commit be85cad
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 6 deletions.
diff --git a/app/Models/Journal/Entry.php b/app/Models/Journal/Entry.php
@@ -75,6 +75,7 @@ public function getInfoForJournalEntry()
             'month_name' => mb_convert_case(DateHelper::getShortMonth($this->date), MB_CASE_UPPER, 'UTF-8'),
             'year' => $this->date->year,
             'date' => $this->date,
+            'created_at' => DateHelper::getShortDateWithTime($this->created_at),
         ];
     }
 }
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/langs/en.json b/public/js/langs/en.json
diff --git a/public/js/vendor.js b/public/js/vendor.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
     "/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
-    "/js/vendor.js": "/js/vendor.js?id=fd5e7244487d0ac13457",
-    "/js/app.js": "/js/app.js?id=e6753772c0d5e75b2524",
+    "/js/vendor.js": "/js/vendor.js?id=e5787b0380465869eedc",
+    "/js/app.js": "/js/app.js?id=1713cb83bf4ebdae1960",
     "/css/app-ltr.css": "/css/app-ltr.css?id=f8d44053a6b962b984b6",
     "/css/app-rtl.css": "/css/app-rtl.css?id=f10bd01fc3967dbbe2ed",
     "/css/stripe.css": "/css/stripe.css?id=04066fb482310d18299c",

diff --git a/resources/js/components/journal/partials/JournalContentEntry.vue b/resources/js/components/journal/partials/JournalContentEntry.vue
@@ -8,7 +8,9 @@
 
     <!-- Right column: showing logs -->
     <div :class="[ dirltr ? 'fl' : 'fr' ]" class="journal-calendar-content">
-      <div class="br3 ba b--gray-monica bg-white pr3 pb3 pt3 mb3 journal-line">
+      <div v-tooltip.top="$t('journal.journal_created_at', { date: entry.created_at })"
+           class="br3 ba b--gray-monica bg-white pr3 pb3 pt3 mb3 journal-line"
+      >
         <div class="flex">
           <!-- Day -->
           <div class="flex-none w-10 tc">

diff --git a/resources/lang/en/journal.php b/resources/lang/en/journal.php
@@ -13,6 +13,7 @@
     'journal_add' => 'Add a journal entry',
     'journal_edit' => 'Edit a journal entry',
     'journal_empty' => 'Empty journal',
+    'journal_created_at' => 'Created at {date}',
     'journal_created_automatically' => 'Created automatically',
     'journal_entry_type_journal' => 'Journal entry',
     'journal_entry_type_activity' => 'Activity',

diff --git a/tests/Unit/Models/EntryTest.php b/tests/Unit/Models/EntryTest.php
@@ -31,6 +31,7 @@ public function get_info_for_journal_entry()
             'month_name' => 'JAN',
             'year' => 2017,
             'date' => '2017-01-01 00:00:00',
+            'created_at' => 'Jan 01, 2017 00:00',
         ];
 
         $this->assertEquals(