fix the timeline stay issue (right side)

2023-06-10 12:03:32 +03:00
parent 9dcc422f75
commit 7c5df992ed
3 changed files with 9 additions and 7 deletions
--- a/app/controllers/timeline_controller.rb
+++ b/app/controllers/timeline_controller.rb
@ -2,6 +2,10 @@ class TimelineController < ApplicationController

  def index
    @weeks = (params[:weeks] || "12").to_i
-    @members = Member.visible_scope.where("leaving > ? " , Date.today).order(:arriving).page(1).per(50)
+    @members = Member.visible_scope.
+                where("leaving > ? " , Date.today).
+                where("arriving < ? " , Date.today.at_beginning_of_month + @weeks.weeks).
+                order(:arriving).
+                page(1).per(50)
  end
 end