Optional timer session comments

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.1
+
+- Make timer session comments optional
+
 # 0.1.1
 
 - Add feedback for overlapping time entries.

app/components/timer_session_entry_component.html.erb

@@ -5,7 +5,13 @@
       <br>
     <% end %>
   </td>
-  <td class="w-20"><%= timer_session_entry.comments %></td>
+  <td class="w-20">
+    <% if timer_session_entry.comments.present? %>
+      <%= timer_session_entry.comments %>
+    <% else %>
+      <i><%= t(:no_comment) %></i>
+    <% end %>
+  </td>
   <td><%= timer_session_entry.formated_session_time %></td>
   <td><%= format_worked_hours(timer_session_entry.recorded_hours) %></td>
   <td class="timer-session-table-actions">

app/models/finished_timer_session_validator.rb

@@ -7,7 +7,6 @@ def validate(record)
     @record = record
 
     validate_start_and_end_present
-    validate_comment_present
     validate_minimal_duration
     validate_day_limit
     validate_session_limit
@@ -25,10 +24,6 @@ def validate_start_and_end_present
     @record.errors.add(:timer_end, :blank) if @record.timer_end.blank?
   end
 
-  def validate_comment_present
-    @record.errors.add(:comments, :blank) if @record.comments.blank?
-  end
-
   def validate_issues_selected
     @record.errors.add(:issue_id, :no_selection) if @record.issues.count.zero?
   end

config/locales/de.yml

@@ -25,6 +25,7 @@ de:
               no_selection: mindestens ein Issue muss gewählt sein
               invalid: ein oder mehrere Issues müssen gewählt sein
   button_continue: Weitermachen
+  no_comment: Kein Kommentar
   timer_sessions:
     filters:
       filter: Filter

config/locales/en.yml

@@ -30,6 +30,7 @@ en:
               no_selection: at least one issue must be selected
               invalid: one or more issues do not exist
   button_continue: Continue
+  no_comment: No comment
   timer_sessions:
     filters:
       filter: Filter

test/functional/time_tracker_controller_test.rb

@@ -166,7 +166,7 @@ def setup
       timer_start: Time.zone.now,
       timer_end: Time.zone.now + 1.hours,
       comments: nil,
-      issue_ids: ['1']
+      issue_ids: []
     } }, xhr: true
     assert_response 422
   end

test/system/timer_sessions_management_test.rb

@@ -14,17 +14,17 @@ class TimerSessionsManagementTest < ApplicationSystemTestCase
     login_user('admin', 'admin')
     User.current = User.find(1)
     # User.current.preference.update(time_zone: 'Tijuana')
-    @timer_sessions = FactoryBot.create_list(:timer_session, 3,
-                                             :with_issues,
-                                             :with_time_entries,
-                                             user: User.current)
+    @timer_sessions = FactoryBot.create_list(:timer_session, 3, :with_issues, :with_time_entries, user: User.current)
+    @timer_sessions.first.update!(comments: nil)
     visit timer_sessions_path
   end
 
   test 'index' do
     @timer_sessions.each do |timer_session|
       assert has_content?(timer_session.comments)
     end
+
+    assert has_content?(I18n.t(:no_comment))
   end
 
   test 'index - does not raise error when rendering time entries on same date' do

test/unit/timer_session_test.rb

@@ -37,7 +37,7 @@ class TimerSessionTest < ActiveSupport::TestCase
   test 'comment_present' do
     assert @timer_session.valid?
     @timer_session.comments = nil
-    assert_not @timer_session.valid?
+    assert @timer_session.valid?
   end
 
   test 'issues_selected' do