Merge branch 'main' into depfu/batch_all/assets.src/npm/2025-04-05

Author: shindi-renuo

app/helpers/timer_sessions_helper.rb

@@ -64,7 +64,7 @@ def issue_information(issue)
   end
 
   def issue_identifier(issue)
-    "[#{issue.project.name}] #{issue.id}"
+    "#{issue.id} #{issue.project.name}"
   end
 
   def truncated_subject(subject)

app/models/timer_session.rb

@@ -14,6 +14,7 @@ class TimerSession < RedmineTrackyApplicationRecord
 
   validates :timer_start, presence: true
   before_save :set_recorded_hours
+  before_save :round_timer_to_nearest_minute
 
   scope :active, -> { where(finished: false) }
   scope :finished, -> { where(finished: true) }
@@ -44,7 +45,7 @@ def relevant_issues
   end
 
   def overlaps?(other_session)
-    return false unless timer_end.present? && other_session.timer_start.present?
+    return false unless can_overlap?(other_session)
 
     this_start = round_to_nearest_minute(timer_start)
     this_end = round_to_nearest_minute(timer_end)
@@ -56,6 +57,18 @@ def overlaps?(other_session)
 
   private
 
+  def can_overlap?(other_session)
+    return false if other_session.nil?
+    return false if timer_start.nil? || timer_end.nil? || other_session.timer_start.nil? || other_session.timer_end.nil?
+
+    true
+  end
+
+  def round_timer_to_nearest_minute
+    self.timer_start = round_to_nearest_minute(timer_start) if timer_end.present?
+    self.timer_end = round_to_nearest_minute(timer_end) if timer_end.present?
+  end
+
   def round_to_nearest_minute(time)
     Time.at((time.to_f / 60).round * 60).utc
   end

app/views/timer_sessions/_timer_sessions_day_block.html.erb

@@ -11,7 +11,12 @@
         <%= render TimerSessionEntryComponent.new(
           timer_session_entry: time_entity,
           discrepancy_detected: @non_matching_timer_session_ids.include?(time_entity.id),
-          overlap_detected: timer_sessions.any? { |other_entity| time_entity != other_entity && other_entity&.overlaps?(time_entity) },
+          overlap_detected: timer_sessions.any? do |other_entity|
+            other_entity.timer_session? && 
+            time_entity.timer_session? && 
+            time_entity != other_entity && 
+            other_entity.overlaps?(time_entity)
+          end,
           gap_separator: draw_gap_separator(time_entity, previous_time_entity)
         ) %>
       <% end %>

assets.src/src/styles/utils.scss

@@ -57,7 +57,7 @@
   }
 
   @media only screen and (max-width: 480px) {
-    [class*="w-"] {
+    [class*='w-'] {
       width: 100% !important;
     }
   }
@@ -140,7 +140,7 @@
 
   @media only screen and (max-width: 768px) {
     /* For mobile phones: */
-    [class*="col-"] {
+    [class*='col-'] {
       width: 100%;
     }
   }

assets/javascripts/redmine-tracky.js

@@ -117,7 +117,7 @@ def setup
     } }, xhr: true
     assert_equal 2, TimerSession.count
     assert_equal TimerSession.last.finished, true
-    assert_in_delta TimerSession.last.timer_start, Time.zone.now - 1.hour, 1.second
+    assert_in_delta TimerSession.last.timer_start, Time.zone.now - 1.hour, 30.seconds
     assert_response 200
   end
 

test/functional/time_tracker_controller_test.rb

@@ -27,6 +27,14 @@ class TimerSessionsManagementTest < ApplicationSystemTestCase
     end
   end
 
+  test 'index - does not raise error when rendering time entries on same date' do
+    last_session = @timer_sessions.last
+    entry = TimeEntry.create!(issue: Issue.first, user: last_session.user, hours: 1,
+                              spent_on: last_session.timer_start)
+    visit timer_sessions_path
+    entry.destroy!
+  end
+
   test 'filter' do
     @timer_sessions.each do |timer_session|
       assert has_content?(timer_session.comments)

test/system/timer_sessions_management_test.rb

@@ -54,15 +54,4 @@ class TimeDiscrepancyLoaderTest < ActiveSupport::TestCase
     assert_equal 1, where_time_not_adding_up.length
     assert_kind_of Integer, where_time_not_adding_up.first
   end
-
-  test 'ignore small discrepancies in time sum' do
-    timer_sessions = TimerSession.includes(:issues, :time_entries, :timer_session_time_entries)
-                                 .finished.created_by(User.current)
-    uneven_timer_session_ids = TimeDiscrepancyLoader.uneven_timer_session_ids(timer_sessions)
-
-    # @timer_session is still valid (even though the hours are not equal)
-    # because the difference is less than 0.05
-    assert uneven_timer_session_ids.exclude?(@timer_session.id)
-    assert_not_equal @timer_session.hours, @timer_session.time_entries.sum(&:hours)
-  end
 end

test/unit/time_discrepancy_loader_test.rb

@@ -58,6 +58,18 @@ class TimerSessionTest < ActiveSupport::TestCase
     assert_not @timer_session.valid?
   end
 
+  test 'round_timer_to_nearest_minute' do
+    timer_start_before = @timer_session.timer_start
+
+    timer_start_after = timer_start_before + 10.seconds
+    @timer_session.update(timer_start: timer_start_after)
+    assert_equal timer_start_before, @timer_session.reload.timer_start
+
+    timer_start_after = timer_start_before + 40.seconds
+    @timer_session.update(timer_start: timer_start_after)
+    assert_equal timer_start_before + 1.minute, @timer_session.reload.timer_start
+  end
+
   test 'overlaps?' do # rubocop:disable Metrics/BlockLength
     session1 = FactoryBot.create(:timer_session, user: User.current, timer_start: Time.zone.now,
                                                  timer_end: Time.zone.now + 1.hour)

test/unit/timer_session_test.rb

@@ -44,6 +44,6 @@ class TimerSessionsHelperTest < ActionView::TestCase
   end
 
   test '#issue_link_list' do
-    assert_equal ['<a href="/issues/1">[eCookbook] 1: Cannot print recipes</a>'], issue_link_list([Issue.first])
+    assert_equal ['<a href="/issues/1">1 eCookbook: Cannot print recipes</a>'], issue_link_list([Issue.first])
   end
 end