From 3ca9ae343f5ebb871b71ce0d8c73b5f68c6612cb Mon Sep 17 00:00:00 2001
From: endoooo <eric.ehe@gmail.com>
Date: Thu, 12 Dec 2024 17:20:10 -0300
Subject: [PATCH 1/7] chore: created base migration and schema for students
 records and classes relationship

- created `students_records_classes` table
- created `StudentsRecords.StudentRecordClassRelationship` schema
- added classes fields to `StudentRecord` schema
---
 .../students_records/student_record.ex        | 28 +++++++++++++++++++
 .../student_record_class_relationship.ex      | 22 +++++++++++++++
 .../student_record_relationship.ex            |  2 +-
 ...195844_create_students_records_classes.exs | 28 +++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 lib/lanttern/students_records/student_record_class_relationship.ex
 create mode 100644 priv/repo/migrations/20241212195844_create_students_records_classes.exs

diff --git a/lib/lanttern/students_records/student_record.ex b/lib/lanttern/students_records/student_record.ex
index 4d6ab6cf..b6a08db4 100644
--- a/lib/lanttern/students_records/student_record.ex
+++ b/lib/lanttern/students_records/student_record.ex
@@ -8,9 +8,11 @@ defmodule Lanttern.StudentsRecords.StudentRecord do
 
   import LantternWeb.Gettext
 
+  alias Lanttern.StudentsRecords.StudentRecordClassRelationship
   alias Lanttern.StudentsRecords.StudentRecordRelationship
   alias Lanttern.StudentsRecords.StudentRecordStatus
   alias Lanttern.StudentsRecords.StudentRecordType
+  alias Lanttern.Schools.Class
   alias Lanttern.Schools.School
   alias Lanttern.Schools.Student
 
@@ -21,6 +23,9 @@ defmodule Lanttern.StudentsRecords.StudentRecord do
           date: Date.t(),
           time: Time.t(),
           students: [Student.t()],
+          students_ids: [pos_integer()],
+          classes: [Class.t()],
+          classes_ids: [pos_integer()],
           school_id: pos_integer(),
           school: School.t(),
           status_id: pos_integer(),
@@ -37,17 +42,21 @@ defmodule Lanttern.StudentsRecords.StudentRecord do
     field :date, :date
     field :time, :time
     field :students_ids, {:array, :id}, virtual: true
+    field :classes_ids, {:array, :id}, virtual: true
 
     belongs_to :school, School
     belongs_to :status, StudentRecordStatus
     belongs_to :type, StudentRecordType
 
     has_many :students_relationships, StudentRecordRelationship, on_replace: :delete
+    has_many :classes_relationships, StudentRecordClassRelationship, on_replace: :delete
 
     many_to_many :students, Student,
       join_through: "students_students_records",
       preload_order: [asc: :name]
 
+    many_to_many :classes, Class, join_through: "students_records_classes"
+
     timestamps()
   end
 
@@ -60,12 +69,14 @@ defmodule Lanttern.StudentsRecords.StudentRecord do
       :date,
       :time,
       :students_ids,
+      :classes_ids,
       :school_id,
       :type_id,
       :status_id
     ])
     |> validate_required([:description, :date, :school_id, :type_id, :status_id])
     |> cast_and_validate_students()
+    |> cast_classes()
   end
 
   def cast_and_validate_students(changeset) do
@@ -96,4 +107,21 @@ defmodule Lanttern.StudentsRecords.StudentRecord do
   end
 
   defp cast_students(changeset, _), do: changeset
+
+  defp cast_classes(changeset) do
+    case get_change(changeset, :classes_ids) do
+      classes_ids when is_list(classes_ids) ->
+        school_id = get_field(changeset, :school_id)
+
+        classes_relationships_params =
+          Enum.map(classes_ids, &%{class_id: &1, school_id: school_id})
+
+        changeset
+        |> put_change(:classes_relationships, classes_relationships_params)
+        |> cast_assoc(:classes_relationships)
+
+      _ ->
+        changeset
+    end
+  end
 end
diff --git a/lib/lanttern/students_records/student_record_class_relationship.ex b/lib/lanttern/students_records/student_record_class_relationship.ex
new file mode 100644
index 00000000..8ea4e5c3
--- /dev/null
+++ b/lib/lanttern/students_records/student_record_class_relationship.ex
@@ -0,0 +1,22 @@
+defmodule Lanttern.StudentsRecords.StudentRecordClassRelationship do
+  @moduledoc """
+  The `StudentRecordClassRelationship` schema (join table)
+  """
+
+  use Ecto.Schema
+  import Ecto.Changeset
+
+  @primary_key false
+  schema "students_records_classes" do
+    field :student_record_id, :id, primary_key: true
+    field :class_id, :id, primary_key: true
+    field :school_id, :id
+  end
+
+  @doc false
+  def changeset(student_record_class_relationship, attrs) do
+    student_record_class_relationship
+    |> cast(attrs, [:class_id, :student_record_id, :school_id])
+    |> validate_required([:class_id, :student_record_id, :school_id])
+  end
+end
diff --git a/lib/lanttern/students_records/student_record_relationship.ex b/lib/lanttern/students_records/student_record_relationship.ex
index c0623074..9b3a85c9 100644
--- a/lib/lanttern/students_records/student_record_relationship.ex
+++ b/lib/lanttern/students_records/student_record_relationship.ex
@@ -16,7 +16,7 @@ defmodule Lanttern.StudentsRecords.StudentRecordRelationship do
   @doc false
   def changeset(student_record_relationship, attrs) do
     student_record_relationship
-    |> cast(attrs, [:student_id, :student_record_i, :school_id])
+    |> cast(attrs, [:student_id, :student_record_id, :school_id])
     |> validate_required([:student_id, :student_record_id, :school_id])
   end
 end
diff --git a/priv/repo/migrations/20241212195844_create_students_records_classes.exs b/priv/repo/migrations/20241212195844_create_students_records_classes.exs
new file mode 100644
index 00000000..1ee3dbfb
--- /dev/null
+++ b/priv/repo/migrations/20241212195844_create_students_records_classes.exs
@@ -0,0 +1,28 @@
+defmodule Lanttern.Repo.Migrations.CreateStudentsRecordsClasses do
+  use Ecto.Migration
+
+  def change do
+    # creating unique constraints to allow composite foreign keys.
+    # this guarantees, in the database level, that record and class
+    # belong to the same school
+
+    # removing existing "classes_school_id_index" to prevent unnecessary index
+    drop index(:classes, [:school_id])
+    create unique_index(:classes, [:school_id, :id])
+
+    create table(:students_records_classes, primary_key: false) do
+      # in the future we will handle how to cascade class and school deletion to ss records
+      add :class_id, references(:classes, with: [school_id: :school_id], on_delete: :nothing),
+        null: false
+
+      add :student_record_id,
+          references(:students_records, with: [school_id: :school_id], on_delete: :delete_all),
+          null: false
+
+      add :school_id, references(:schools, on_delete: :nothing), null: false
+    end
+
+    create index(:students_records_classes, [:class_id])
+    create unique_index(:students_records_classes, [:student_record_id, :class_id])
+  end
+end

From 4cd74b8d6d92851c41c837ab0c574fd33d77bf5f Mon Sep 17 00:00:00 2001
From: endoooo <eric.ehe@gmail.com>
Date: Fri, 13 Dec 2024 09:07:03 -0300
Subject: [PATCH 2/7] chore: added basic tests of student record classes and
 added `classes_ids` to log

---
 .../student_record_log.ex                     |  2 ++
 ...dd_classes_ids_to_students_records_log.exs | 11 ++++++
 test/lanttern/students_records_test.exs       | 34 ++++++++++++++++---
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 priv/repo/migrations/20241213115237_add_classes_ids_to_students_records_log.exs

diff --git a/lib/lanttern/students_records_log/student_record_log.ex b/lib/lanttern/students_records_log/student_record_log.ex
index 8b4459b7..ab586138 100644
--- a/lib/lanttern/students_records_log/student_record_log.ex
+++ b/lib/lanttern/students_records_log/student_record_log.ex
@@ -17,6 +17,7 @@ defmodule Lanttern.StudentsRecordsLog.StudentRecordLog do
     field :date, :date
     field :time, :time
     field :students_ids, {:array, :id}
+    field :classes_ids, {:array, :id}
     field :school_id, :id
     field :type_id, :id
     field :status_id, :id
@@ -36,6 +37,7 @@ defmodule Lanttern.StudentsRecordsLog.StudentRecordLog do
       :date,
       :time,
       :students_ids,
+      :classes_ids,
       :school_id,
       :type_id,
       :status_id
diff --git a/priv/repo/migrations/20241213115237_add_classes_ids_to_students_records_log.exs b/priv/repo/migrations/20241213115237_add_classes_ids_to_students_records_log.exs
new file mode 100644
index 00000000..04abe6c9
--- /dev/null
+++ b/priv/repo/migrations/20241213115237_add_classes_ids_to_students_records_log.exs
@@ -0,0 +1,11 @@
+defmodule Lanttern.Repo.Migrations.AddClassesIdsToStudentsRecordsLog do
+  use Ecto.Migration
+
+  @prefix "log"
+
+  def change do
+    alter table(:students_records, prefix: @prefix) do
+      add :classes_ids, {:array, :bigint}
+    end
+  end
+end
diff --git a/test/lanttern/students_records_test.exs b/test/lanttern/students_records_test.exs
index a8560ffc..e9ce97ae 100644
--- a/test/lanttern/students_records_test.exs
+++ b/test/lanttern/students_records_test.exs
@@ -145,6 +145,7 @@ defmodule Lanttern.StudentsRecordsTest do
       type = student_record_type_fixture(%{school_id: school.id})
       status = student_record_status_fixture(%{school_id: school.id})
       student = SchoolsFixtures.student_fixture(%{school_id: school.id})
+      class = SchoolsFixtures.class_fixture(%{school_id: school.id})
 
       # profile to test log
       profile = Lanttern.IdentityFixtures.teacher_profile_fixture()
@@ -157,7 +158,8 @@ defmodule Lanttern.StudentsRecordsTest do
         date: ~D[2024-09-15],
         time: ~T[14:00:00],
         description: "some description",
-        students_ids: [student.id]
+        students_ids: [student.id],
+        classes_ids: [class.id]
       }
 
       assert {:ok, %StudentRecord{} = student_record} =
@@ -171,6 +173,10 @@ defmodule Lanttern.StudentsRecordsTest do
       assert student_record.time == ~T[14:00:00]
       assert student_record.description == "some description"
 
+      student_record = student_record |> Repo.preload([:students, :classes])
+      assert student_record.students == [student]
+      assert student_record.classes == [class]
+
       on_exit(fn ->
         assert_supervised_tasks_are_down()
 
@@ -184,6 +190,7 @@ defmodule Lanttern.StudentsRecordsTest do
         assert student_record_log.operation == "CREATE"
 
         assert student_record_log.students_ids == [student.id]
+        assert student_record_log.classes_ids == [class.id]
         assert student_record_log.school_id == student_record.school_id
         assert student_record_log.status_id == student_record.status_id
         assert student_record_log.type_id == student_record.type_id
@@ -199,13 +206,27 @@ defmodule Lanttern.StudentsRecordsTest do
     end
 
     test "update_student_record/2 with valid data updates the student_record" do
-      student_record = student_record_fixture()
+      school = SchoolsFixtures.school_fixture()
+      student = SchoolsFixtures.student_fixture(%{school_id: school.id})
+      class = SchoolsFixtures.class_fixture(%{school_id: school.id})
+
+      student_record =
+        student_record_fixture(%{
+          school_id: school.id,
+          students_ids: [student.id],
+          classes_ids: [class.id]
+        })
+
+      updated_student = SchoolsFixtures.student_fixture(%{school_id: school.id})
+      updated_class = SchoolsFixtures.class_fixture(%{school_id: school.id})
 
       update_attrs = %{
         name: "some updated name",
         date: ~D[2024-09-16],
         time: ~T[15:01:01],
-        description: "some updated description"
+        description: "some updated description",
+        students_ids: [updated_student.id],
+        classes_ids: [updated_class.id]
       }
 
       # profile to test log
@@ -221,6 +242,10 @@ defmodule Lanttern.StudentsRecordsTest do
       assert student_record.time == ~T[15:01:01]
       assert student_record.description == "some updated description"
 
+      student_record = student_record |> Repo.preload([:students, :classes])
+      assert student_record.students == [updated_student]
+      assert student_record.classes == [updated_class]
+
       on_exit(fn ->
         assert_supervised_tasks_are_down()
 
@@ -233,7 +258,8 @@ defmodule Lanttern.StudentsRecordsTest do
         assert student_record_log.profile_id == profile.id
         assert student_record_log.operation == "UPDATE"
 
-        assert student_record_log.students_ids == student_record.students_ids
+        assert student_record_log.students_ids == [updated_student.id]
+        assert student_record_log.classes_ids == [updated_class.id]
         assert student_record_log.school_id == student_record.school_id
         assert student_record_log.status_id == student_record.status_id
         assert student_record_log.type_id == student_record.type_id

From d23d9dbaf4db5aee4159b82811d534f85123bc81 Mon Sep 17 00:00:00 2001
From: endoooo <eric.ehe@gmail.com>
Date: Fri, 13 Dec 2024 18:51:34 -0300
Subject: [PATCH 3/7] chore: added support to display classes in students
 records routes

- removed support to classes in `assign_user_filters/2` in favor of new function `assign_classes_filter/2`
- created `class_with_cycle/2` school helper
- removed `Filters.StrandClassesFilterOverlayComponent` in favor of refactored `Filters.ClassesFilterOverlayComponent`
- adjusted classes filter implementation in school's students tab, emphasizing classes related to current user cycle
---
 lib/lanttern/schools.ex                       |   2 +
 .../components/core_components.ex             |  10 +-
 lib/lanttern_web/helpers/filters_helpers.ex   |  92 ++++++++---
 lib/lanttern_web/helpers/schools_helpers.ex   |  32 ++++
 .../live/pages/school/students_component.ex   |  33 +++-
 .../pages/strands/id/assessment_component.ex  |   4 +-
 .../live/pages/strands/id/notes_component.ex  |   4 +-
 .../strands/id/strand_rubrics_component.ex    |   4 +-
 .../strands/moment/id/assessment_component.ex |   4 +-
 .../id/student_record_live.ex                 |   3 +-
 .../id/student_record_live.html.heex          |  34 +++-
 .../students_records/students_records_live.ex |   3 +-
 .../students_records_live.html.heex           |  13 ++
 .../classes_filter_overlay_component.ex       |  51 +++++-
 ...strand_classes_filter_overlay_component.ex | 154 ------------------
 .../shared/schools/class_search_component.ex  |   2 +-
 ...xecute_create_students_records_classes.exs |  20 +++
 17 files changed, 253 insertions(+), 212 deletions(-)
 delete mode 100644 lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex
 create mode 100644 priv/repo/migrations/20241213131428_execute_create_students_records_classes.exs

diff --git a/lib/lanttern/schools.ex b/lib/lanttern/schools.ex
index baaf85a5..a2dcaa67 100644
--- a/lib/lanttern/schools.ex
+++ b/lib/lanttern/schools.ex
@@ -419,6 +419,8 @@ defmodule Lanttern.Schools do
   @doc """
   Returns the list of classes.
 
+  Cycle and years are always preloaded.
+
   ## Options:
 
   - `:classes_ids` – filter results by given ids
diff --git a/lib/lanttern_web/components/core_components.ex b/lib/lanttern_web/components/core_components.ex
index a16d179b..e7cb2ca0 100644
--- a/lib/lanttern_web/components/core_components.ex
+++ b/lib/lanttern_web/components/core_components.ex
@@ -20,6 +20,8 @@ defmodule LantternWeb.CoreComponents do
   import Phoenix.HTML, only: [raw: 1]
   import LantternWeb.Gettext
 
+  import LantternWeb.SchoolsHelpers, only: [class_with_cycle: 2]
+
   @doc """
   Renders a `<button>` or `<.link>` with icon.
 
@@ -155,7 +157,7 @@ defmodule LantternWeb.CoreComponents do
     <span
       id={@id}
       class={[
-        "inline-flex items-center rounded-sm px-1 py-1 font-mono font-normal text-xs",
+        "inline-flex items-center rounded-sm px-1 py-1 font-mono font-normal text-xs whitespace-nowrap",
         badge_theme(@theme),
         @class
       ]}
@@ -335,6 +337,8 @@ defmodule LantternWeb.CoreComponents do
     default: nil,
     doc: "supports \"class_with_cycle\" opt, which will render the class + cycle name"
 
+  attr :current_user, :any, default: nil, doc: "used when `label_setter` is \"class_with_cycle\""
+
   attr :on_select, :any,
     required: true,
     doc: "expects a function with arity 1. will receive the `item.id` as arg"
@@ -358,7 +362,7 @@ defmodule LantternWeb.CoreComponents do
         phx-click={@on_select.(item.id)}
       >
         <%= case @label_setter do
-          "class_with_cycle" -> "#{item.name} (#{item.cycle.name})"
+          "class_with_cycle" -> class_with_cycle(item, @current_user)
           _ -> item.name
         end %>
       </.badge_button>
@@ -704,7 +708,7 @@ defmodule LantternWeb.CoreComponents do
       |> assign(:grid_col_span_style, grid_col_span_style)
 
     ~H"""
-    <div class={@class}>
+    <div class={["bg-white shadow-xl", @class]}>
       <div class="grid" style={@grid_template_cols_style}>
         <div
           class="sticky z-10 grid grid-cols-subgrid font-display font-bold text-sm bg-white shadow"
diff --git a/lib/lanttern_web/helpers/filters_helpers.ex b/lib/lanttern_web/helpers/filters_helpers.ex
index 2478d91a..fb0aefee 100644
--- a/lib/lanttern_web/helpers/filters_helpers.ex
+++ b/lib/lanttern_web/helpers/filters_helpers.ex
@@ -35,12 +35,6 @@ defmodule LantternWeb.FiltersHelpers do
   - `:selected_years_ids`
   - `:selected_years`
 
-  ### `:classes` assigns
-
-  - `:classes`
-  - `:selected_classes_ids`
-  - `:selected_classes`
-
   ### `:assessment_view assigns
 
   - `:current_assessment_view`
@@ -124,20 +118,6 @@ defmodule LantternWeb.FiltersHelpers do
     |> assign_filter_type(current_user, current_filters, filter_types)
   end
 
-  defp assign_filter_type(socket, current_user, current_filters, [:classes | filter_types]) do
-    classes =
-      Schools.list_user_classes(current_user)
-
-    selected_classes_ids = Map.get(current_filters, :classes_ids) || []
-    selected_classes = Enum.filter(classes, &(&1.id in selected_classes_ids))
-
-    socket
-    |> assign(:classes, classes)
-    |> assign(:selected_classes_ids, selected_classes_ids)
-    |> assign(:selected_classes, selected_classes)
-    |> assign_filter_type(current_user, current_filters, filter_types)
-  end
-
   defp assign_filter_type(
          socket,
          current_user,
@@ -267,6 +247,68 @@ defmodule LantternWeb.FiltersHelpers do
     starred_strands: :only_starred_strands
   }
 
+  @doc """
+  Handle classes filter assigns in socket.
+
+  ## Opts
+
+  Any opts accepted in `list_user_classes/2`.
+
+  ## Expected assigns in socket
+
+  - `current_user` - used to get the current cycle information
+
+  ## Returned socket assigns
+
+  - `:classes`
+  - `:selected_classes_ids`
+  - `:selected_classes`
+
+  ## Examples
+
+      iex> assign_classes_filter(socket)
+      socket
+  """
+  @spec assign_classes_filter(Phoenix.LiveView.Socket.t(), opts :: Keyword.t()) ::
+          Phoenix.LiveView.Socket.t()
+  def assign_classes_filter(socket, opts \\ []) do
+    classes =
+      Schools.list_user_classes(socket.assigns.current_user, opts)
+
+    selected_classes_ids =
+      case Personalization.get_profile_settings(socket.assigns.current_user.current_profile_id) do
+        %{current_filters: current_filters} when not is_nil(current_filters) -> current_filters
+        _ -> %{}
+      end
+      |> Map.get(:classes_ids) || []
+
+    selected_classes = Enum.filter(classes, &(&1.id in selected_classes_ids))
+
+    # as classes may be filtered (by cycle, for example), selected classes
+    # may have more classes than the listed. we check for this case below,
+    # and adjust classes and selected classes as needed
+
+    classes_ids = Enum.map(classes, & &1.id)
+
+    selected_classes_ids_not_in_classes =
+      Enum.filter(selected_classes_ids, &(&1 not in classes_ids))
+
+    selected_classes_not_in_classes =
+      if selected_classes_ids_not_in_classes != [] do
+        Schools.list_classes(classes_ids: selected_classes_ids_not_in_classes)
+      else
+        []
+      end
+
+    classes = classes ++ selected_classes_not_in_classes
+    selected_classes = selected_classes ++ selected_classes_not_in_classes
+
+    socket
+    |> assign(:classes, classes)
+    |> assign(:selected_classes_ids, selected_classes_ids)
+    |> assign(:selected_classes, selected_classes)
+  end
+
   @doc """
   Handle strand classes filter assigns in socket.
 
@@ -585,11 +627,13 @@ defmodule LantternWeb.FiltersHelpers do
     socket
   end
 
-  defp apply_save_profile_filters(current_user, attrs, strand_id: strand_id),
-    do: Filters.set_profile_strand_filters(current_user, strand_id, attrs)
+  defp apply_save_profile_filters(current_user, attrs, strand_id: strand_id)
+       when is_integer(strand_id),
+       do: Filters.set_profile_strand_filters(current_user, strand_id, attrs)
 
-  defp apply_save_profile_filters(current_user, attrs, report_card_id: report_card_id),
-    do: Filters.set_profile_report_card_filters(current_user, report_card_id, attrs)
+  defp apply_save_profile_filters(current_user, attrs, report_card_id: report_card_id)
+       when is_integer(report_card_id),
+       do: Filters.set_profile_report_card_filters(current_user, report_card_id, attrs)
 
   defp apply_save_profile_filters(current_user, attrs, _),
     do: Filters.set_profile_current_filters(current_user, attrs)
diff --git a/lib/lanttern_web/helpers/schools_helpers.ex b/lib/lanttern_web/helpers/schools_helpers.ex
index 69c8c60b..2fad2853 100644
--- a/lib/lanttern_web/helpers/schools_helpers.ex
+++ b/lib/lanttern_web/helpers/schools_helpers.ex
@@ -4,6 +4,10 @@ defmodule LantternWeb.SchoolsHelpers do
   """
 
   alias Lanttern.Schools
+  alias Lanttern.Schools.Cycle
+  alias Lanttern.Schools.Class
+  alias Lanttern.Identity.Profile
+  alias Lanttern.Identity.User
 
   @doc """
   Generate list of schools to use as `Phoenix.HTML.Form.options_for_select/2` arg
@@ -73,4 +77,32 @@ defmodule LantternWeb.SchoolsHelpers do
     Schools.list_teachers()
     |> Enum.map(fn t -> {t.name, t.id} end)
   end
+
+  @doc """
+  Returns the class name in the format `"Class A (Cycle X)"`.
+
+  When a user is given, only class name will be returned
+  when class cycle is the same as user's current cycle.
+
+  ## Examples
+
+      iex> class_with_cycle(class)
+      "Class A (Cycle X)"
+  """
+  @spec class_with_cycle(Class.t(), User.t() | nil) :: binary()
+  def class_with_cycle(class, user \\ nil)
+
+  def class_with_cycle(
+        %Class{cycle_id: class_cycle_id} = class,
+        %User{
+          current_profile: %Profile{current_school_cycle: %Cycle{id: current_cycle_id}}
+        }
+      )
+      when class_cycle_id == current_cycle_id,
+      do: class.name
+
+  def class_with_cycle(%Class{cycle: %Cycle{} = cycle} = class, _user),
+    do: "#{class.name} (#{cycle.name})"
+
+  def class_with_cycle(%Class{} = class, _user), do: class.name
 end
diff --git a/lib/lanttern_web/live/pages/school/students_component.ex b/lib/lanttern_web/live/pages/school/students_component.ex
index 4522ef01..4ec76efc 100644
--- a/lib/lanttern_web/live/pages/school/students_component.ex
+++ b/lib/lanttern_web/live/pages/school/students_component.ex
@@ -2,11 +2,13 @@ defmodule LantternWeb.SchoolLive.StudentsComponent do
   use LantternWeb, :live_component
 
   alias Lanttern.Schools
+  alias Lanttern.Schools.Cycle
   alias Lanttern.Schools.Student
-  import LantternWeb.FiltersHelpers
 
   # shared components
   alias LantternWeb.Schools.StudentFormOverlayComponent
+  import LantternWeb.FiltersHelpers, only: [assign_classes_filter: 2, save_profile_filters: 2]
+  import LantternWeb.SchoolsHelpers, only: [class_with_cycle: 2]
 
   @impl true
   def render(assigns) do
@@ -24,10 +26,10 @@ defmodule LantternWeb.SchoolLive.StudentsComponent do
           <%= if @selected_classes != [] do %>
             <.badge
               :for={class <- @selected_classes}
-              on_remove={JS.push("remove_class_filter", target: @myself)}
+              on_remove={JS.push("remove_class_filter", value: %{"id" => class.id}, target: @myself)}
               theme="primary"
             >
-              <%= class.name %>
+              <%= class_with_cycle(class, @current_user) %>
             </.badge>
           <% else %>
             <.badge><%= gettext("all classes") %></.badge>
@@ -65,7 +67,7 @@ defmodule LantternWeb.SchoolLive.StudentsComponent do
           >
             <div class="flex flex-wrap gap-1">
               <.badge :for={class <- student.classes}>
-                <%= "#{class.name} (#{class.cycle.name})" %>
+                <%= class_with_cycle(class, @current_user) %>
               </.badge>
             </div>
           </:col>
@@ -87,6 +89,7 @@ defmodule LantternWeb.SchoolLive.StudentsComponent do
           stream={@streams.no_class_students}
           row_click={fn student -> JS.navigate(~p"/school/students/#{student}") end}
           sticky_header_offset="7rem"
+          class={["mt-10", if(@selected_classes_ids != [], do: "hidden")]}
         >
           <:col
             :let={student}
@@ -249,7 +252,7 @@ defmodule LantternWeb.SchoolLive.StudentsComponent do
 
   defp initialize(%{assigns: %{initialized: false}} = socket) do
     socket
-    |> assign_user_filters([:classes])
+    |> apply_assign_classes_filter()
     |> stream_students()
     |> stream_no_class_students()
     |> assign(:initialized, true)
@@ -257,6 +260,16 @@ defmodule LantternWeb.SchoolLive.StudentsComponent do
 
   defp initialize(socket), do: socket
 
+  defp apply_assign_classes_filter(socket) do
+    assign_classes_filter_opts =
+      case socket.assigns.current_user.current_profile do
+        %{current_school_cycle: %Cycle{} = cycle} -> [cycles_ids: [cycle.id]]
+        _ -> []
+      end
+
+    assign_classes_filter(socket, assign_classes_filter_opts)
+  end
+
   defp stream_students(socket) do
     students =
       Schools.list_students(
@@ -308,12 +321,16 @@ defmodule LantternWeb.SchoolLive.StudentsComponent do
   defp assign_student(socket), do: assign(socket, :student, nil)
 
   @impl true
-  def handle_event("remove_class_filter", _params, socket) do
+  def handle_event("remove_class_filter", %{"id" => class_id}, socket) do
+    selected_classes_ids =
+      socket.assigns.selected_classes_ids
+      |> Enum.filter(&(&1 != class_id))
+
     socket =
       socket
-      |> assign(:selected_classes_ids, [])
+      |> assign(:selected_classes_ids, selected_classes_ids)
       |> save_profile_filters([:classes])
-      |> assign_user_filters([:classes])
+      |> apply_assign_classes_filter()
       |> stream_students()
 
     {:noreply, socket}
diff --git a/lib/lanttern_web/live/pages/strands/id/assessment_component.ex b/lib/lanttern_web/live/pages/strands/id/assessment_component.ex
index a2d3e7a1..6bea1446 100644
--- a/lib/lanttern_web/live/pages/strands/id/assessment_component.ex
+++ b/lib/lanttern_web/live/pages/strands/id/assessment_component.ex
@@ -52,11 +52,11 @@ defmodule LantternWeb.StrandLive.AssessmentComponent do
         navigate={~p"/strands/#{@strand}/assessment"}
       />
       <.live_component
-        module={LantternWeb.Filters.StrandClassesFilterOverlayComponent}
+        module={LantternWeb.Filters.ClassesFilterOverlayComponent}
         id="classes-filter-modal"
         current_user={@current_user}
         title={gettext("Select classes for assessment")}
-        strand_id={@strand.id}
+        profile_filter_opts={[strand_id: @strand.id]}
         classes={@classes}
         selected_classes_ids={@selected_classes_ids}
         navigate={~p"/strands/#{@strand}/assessment"}
diff --git a/lib/lanttern_web/live/pages/strands/id/notes_component.ex b/lib/lanttern_web/live/pages/strands/id/notes_component.ex
index 47f9d20e..cfade4a6 100644
--- a/lib/lanttern_web/live/pages/strands/id/notes_component.ex
+++ b/lib/lanttern_web/live/pages/strands/id/notes_component.ex
@@ -97,11 +97,11 @@ defmodule LantternWeb.StrandLive.NotesComponent do
         </div>
       </.responsive_container>
       <.live_component
-        module={LantternWeb.Filters.StrandClassesFilterOverlayComponent}
+        module={LantternWeb.Filters.ClassesFilterOverlayComponent}
         id="classes-filter-modal"
         current_user={@current_user}
         title={gettext("Select classes to view student notes")}
-        strand_id={@strand.id}
+        profile_filter_opts={[strand_id: @strand.id]}
         classes={@classes}
         selected_classes_ids={@selected_classes_ids}
         navigate={~p"/strands/#{@strand}/notes"}
diff --git a/lib/lanttern_web/live/pages/strands/id/strand_rubrics_component.ex b/lib/lanttern_web/live/pages/strands/id/strand_rubrics_component.ex
index cadcab29..3a020788 100644
--- a/lib/lanttern_web/live/pages/strands/id/strand_rubrics_component.ex
+++ b/lib/lanttern_web/live/pages/strands/id/strand_rubrics_component.ex
@@ -150,11 +150,11 @@ defmodule LantternWeb.StrandLive.StrandRubricsComponent do
         </section>
       </.responsive_container>
       <.live_component
-        module={LantternWeb.Filters.StrandClassesFilterOverlayComponent}
+        module={LantternWeb.Filters.ClassesFilterOverlayComponent}
         id="classes-filter-modal"
         current_user={@current_user}
         title={gettext("Select classes to view students differentiation rubrics")}
-        strand_id={@strand.id}
+        profile_filter_opts={[strand_id: @strand.id]}
         classes={@classes}
         selected_classes_ids={@selected_classes_ids}
         navigate={~p"/strands/#{@strand}/rubrics"}
diff --git a/lib/lanttern_web/live/pages/strands/moment/id/assessment_component.ex b/lib/lanttern_web/live/pages/strands/moment/id/assessment_component.ex
index 4d4452c3..9c4f9ef1 100644
--- a/lib/lanttern_web/live/pages/strands/moment/id/assessment_component.ex
+++ b/lib/lanttern_web/live/pages/strands/moment/id/assessment_component.ex
@@ -122,11 +122,11 @@ defmodule LantternWeb.MomentLive.AssessmentComponent do
         </:actions>
       </.slide_over>
       <.live_component
-        module={LantternWeb.Filters.StrandClassesFilterOverlayComponent}
+        module={LantternWeb.Filters.ClassesFilterOverlayComponent}
         id="classes-filter-modal"
         current_user={@current_user}
         title={gettext("Select classes for assessment")}
-        strand_id={@moment.strand_id}
+        profile_filter_opts={[strand_id: @moment.strand_id]}
         classes={@classes}
         selected_classes_ids={@selected_classes_ids}
         navigate={~p"/strands/moment/#{@moment}/assessment"}
diff --git a/lib/lanttern_web/live/pages/students_records/id/student_record_live.ex b/lib/lanttern_web/live/pages/students_records/id/student_record_live.ex
index b2c0391d..042c20e9 100644
--- a/lib/lanttern_web/live/pages/students_records/id/student_record_live.ex
+++ b/lib/lanttern_web/live/pages/students_records/id/student_record_live.ex
@@ -8,6 +8,7 @@ defmodule LantternWeb.StudentRecordLive do
   # shared components
 
   alias LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent
+  import LantternWeb.SchoolsHelpers, only: [class_with_cycle: 2]
 
   # lifecycle
 
@@ -27,7 +28,7 @@ defmodule LantternWeb.StudentRecordLive do
   defp assign_student_record(socket, %{"id" => id}) do
     student_record =
       StudentsRecords.get_student_record(id,
-        preloads: [:students, :students_relationships, :type, :status]
+        preloads: [:students, :students_relationships, :type, :status, [classes: :cycle]]
       )
       |> put_students_ids()
 
diff --git a/lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex b/lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex
index ad6eb445..d1893077 100644
--- a/lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex
+++ b/lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex
@@ -34,14 +34,32 @@
   </div>
 </.header_nav>
 <.responsive_container class="py-6 sm:py-10">
-  <p class="font-bold"><%= gettext("Student record of") %></p>
-  <div class="flex flex-wrap gap-2 mt-4">
-    <.person_badge
-      :for={student <- @student_record.students}
-      person={student}
-      theme="cyan"
-      size="sm"
-    />
+  <div class="flex items-start gap-4">
+    <div class="flex-1">
+      <div class="flex items-center gap-2">
+        <.icon name="hero-user-group-mini" class="text-ltrn-subtle" />
+        <p><%= gettext("Students") %></p>
+      </div>
+      <div class="flex flex-wrap gap-2 mt-4">
+        <.person_badge
+          :for={student <- @student_record.students}
+          person={student}
+          theme="cyan"
+          size="sm"
+        />
+      </div>
+    </div>
+    <div :if={@student_record.classes != []} class="flex-1">
+      <div class="flex items-center gap-2">
+        <.icon name="hero-rectangle-group-mini" class="text-ltrn-subtle" />
+        <p><%= gettext("Classes") %></p>
+      </div>
+      <div class="flex flex-wrap gap-2 mt-4">
+        <.badge :for={class <- @student_record.classes}>
+          <%= class_with_cycle(class, @current_user) %>
+        </.badge>
+      </div>
+    </div>
   </div>
   <.markdown text={@student_record.description} class="mt-10" />
 </.responsive_container>
diff --git a/lib/lanttern_web/live/pages/students_records/students_records_live.ex b/lib/lanttern_web/live/pages/students_records/students_records_live.ex
index fac04a18..3c5e380e 100644
--- a/lib/lanttern_web/live/pages/students_records/students_records_live.ex
+++ b/lib/lanttern_web/live/pages/students_records/students_records_live.ex
@@ -11,6 +11,7 @@ defmodule LantternWeb.StudentsRecordsLive do
 
   alias LantternWeb.Schools.StudentSearchComponent
   alias LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent
+  import LantternWeb.SchoolsHelpers, only: [class_with_cycle: 2]
 
   # lifecycle
 
@@ -48,7 +49,7 @@ defmodule LantternWeb.StudentsRecordsLive do
         students_ids: students_ids,
         types_ids: types_ids,
         statuses_ids: statuses_ids,
-        preloads: [:type, :status, :students],
+        preloads: [:type, :status, :students, [classes: :cycle]],
         first: 20,
         after: keyset
       )
diff --git a/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex b/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
index 06cd3742..888eaa57 100644
--- a/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
+++ b/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
@@ -89,6 +89,19 @@
       />
     </div>
   </:col>
+  <:col :let={student_record} label={gettext("Classes")} template_col="min-content">
+    <%= if student_record.classes != [] do %>
+      <div class="flex flex-wrap gap-1">
+        <.badge :for={class <- student_record.classes}>
+          <%= class_with_cycle(class, @current_user) %>
+        </.badge>
+      </div>
+    <% else %>
+      <.badge>
+        —
+      </.badge>
+    <% end %>
+  </:col>
   <:col :let={student_record} label={gettext("Record")}>
     <p :if={student_record.name} class="mb-4 font-display font-black">
       <%= student_record.name %>
diff --git a/lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex b/lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex
index 6c40d172..d29cffd4 100644
--- a/lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex
+++ b/lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex
@@ -5,6 +5,7 @@ defmodule LantternWeb.Filters.ClassesFilterOverlayComponent do
   Expected external assigns:
 
   ```elixir
+  attr :profile_filter_opts, :any, doc: "the keyword list used in `clear_profile_filters/3` and `save_profile_fitlers/3` (e.g. `strand_id`)"
   attr :current_user, Lanttern.Identity.User, required: true
   attr :title, :string, required: true
   attr :navigate, :string
@@ -17,12 +18,16 @@ defmodule LantternWeb.Filters.ClassesFilterOverlayComponent do
 
   import LantternWeb.FiltersHelpers
 
+  # shared
+
+  alias LantternWeb.Schools.ClassSearchComponent
+
   @impl true
   def render(assigns) do
     ~H"""
     <div>
       <.modal id={@id}>
-        <h5 class="mb-10 font-display font-black text-xl">
+        <h5 class="mb-6 font-display font-black text-xl">
           <%= @title %>
         </h5>
         <.badge_button_picker
@@ -34,8 +39,17 @@ defmodule LantternWeb.Filters.ClassesFilterOverlayComponent do
           }
           items={@classes}
           selected_ids={@selected_classes_ids}
-          class="mt-4"
+          label_setter="class_with_cycle"
+          current_user={@current_user}
         />
+        <form class="mt-6">
+          <.live_component
+            module={ClassSearchComponent}
+            id="class-search"
+            notify_component={@myself}
+            label={gettext("Search all school classes")}
+          />
+        </form>
         <div class="flex justify-between gap-2 mt-10">
           <.button type="button" theme="ghost" phx-click={JS.push("clear_filters", target: @myself)}>
             <%= gettext("Clear filters") %>
@@ -66,11 +80,26 @@ defmodule LantternWeb.Filters.ClassesFilterOverlayComponent do
     socket =
       socket
       |> assign(:has_changes, false)
+      |> assign(:profile_filter_opts, [])
 
     {:ok, socket}
   end
 
   @impl true
+  def update(%{action: {ClassSearchComponent, {:selected, class}}}, socket) do
+    selected_classes_ids =
+      [class.id | socket.assigns.selected_classes_ids]
+      |> Enum.uniq()
+
+    socket =
+      socket
+      |> assign(:selected_classes_ids, selected_classes_ids)
+      |> maybe_add_class_from_search(class)
+      |> assign(:has_changes, true)
+
+    {:ok, socket}
+  end
+
   def update(assigns, socket) do
     socket =
       socket
@@ -79,6 +108,19 @@ defmodule LantternWeb.Filters.ClassesFilterOverlayComponent do
     {:ok, socket}
   end
 
+  # the selected class may not be part of the initial class list
+  # in this case, we add the selected class to the list
+  defp maybe_add_class_from_search(socket, class) do
+    classes_ids = Enum.map(socket.assigns.classes, & &1.id)
+
+    if class.id in classes_ids do
+      socket
+    else
+      classes = socket.assigns.classes ++ [class]
+      assign(socket, :classes, classes)
+    end
+  end
+
   # event handlers
 
   @impl true
@@ -98,7 +140,8 @@ defmodule LantternWeb.Filters.ClassesFilterOverlayComponent do
   def handle_event("clear_filters", _, socket) do
     clear_profile_filters(
       socket.assigns.current_user,
-      [:classes]
+      [:classes],
+      socket.assigns.profile_filter_opts
     )
 
     {:noreply, handle_navigation(socket)}
@@ -107,7 +150,7 @@ defmodule LantternWeb.Filters.ClassesFilterOverlayComponent do
   def handle_event("apply_filters", _, socket) do
     socket =
       socket
-      |> save_profile_filters([:classes])
+      |> save_profile_filters([:classes], socket.assigns.profile_filter_opts)
       |> assign(:has_changes, false)
       |> handle_navigation()
 
diff --git a/lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex b/lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex
deleted file mode 100644
index 22ca74f9..00000000
--- a/lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex
+++ /dev/null
@@ -1,154 +0,0 @@
-defmodule LantternWeb.Filters.StrandClassesFilterOverlayComponent do
-  @moduledoc """
-  Renders a classes filter overlay.
-
-  Expected external assigns:
-
-  ```elixir
-  attr :strand_id, :integer, required: true
-  attr :current_user, Lanttern.Identity.User, required: true
-  attr :title, :string, required: true
-  attr :navigate, :string
-  attr :classes, :list, required: true
-  attr :selected_classes_ids, :list, required: true
-  ```
-  """
-
-  use LantternWeb, :live_component
-
-  import LantternWeb.FiltersHelpers
-
-  # shared
-
-  alias LantternWeb.Schools.ClassSearchComponent
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <div>
-      <.modal id={@id}>
-        <h5 class="mb-6 font-display font-black text-xl">
-          <%= @title %>
-        </h5>
-        <.badge_button_picker
-          on_select={
-            &JS.push("toggle_filter",
-              value: %{"id" => &1},
-              target: @myself
-            )
-          }
-          items={@classes}
-          selected_ids={@selected_classes_ids}
-        />
-        <form class="mt-6">
-          <.live_component
-            module={ClassSearchComponent}
-            id="class-search"
-            notify_component={@myself}
-            label={gettext("Search all school classes")}
-          />
-        </form>
-        <div class="flex justify-between gap-2 mt-10">
-          <.button type="button" theme="ghost" phx-click={JS.push("clear_filters", target: @myself)}>
-            <%= gettext("Clear filters") %>
-          </.button>
-          <div class="flex gap-2">
-            <.button type="button" theme="ghost" phx-click={JS.exec("data-cancel", to: "##{@id}")}>
-              <%= gettext("Cancel") %>
-            </.button>
-            <.button
-              type="button"
-              disabled={!@has_changes}
-              phx-click={JS.push("apply_filters", target: @myself)}
-              phx-disable-with={gettext("Applying filters...")}
-            >
-              <%= gettext("Apply filters") %>
-            </.button>
-          </div>
-        </div>
-      </.modal>
-    </div>
-    """
-  end
-
-  # lifecycle
-
-  @impl true
-  def mount(socket) do
-    socket =
-      socket
-      |> assign(:has_changes, false)
-      |> assign(:filter_opts, [])
-
-    {:ok, socket}
-  end
-
-  @impl true
-  def update(%{action: {ClassSearchComponent, {:selected, class}}}, socket) do
-    socket =
-      socket
-      |> handle_filter_toggle(:classes, class.id)
-      |> maybe_add_class_from_search(class)
-      |> assign(:has_changes, true)
-
-    {:ok, socket}
-  end
-
-  def update(assigns, socket) do
-    socket =
-      socket
-      |> assign(assigns)
-
-    {:ok, socket}
-  end
-
-  # when using the classes filter in strand context
-  # the selected class may not be part of the initial class list
-  # in this case, we add the selected class to the list
-  defp maybe_add_class_from_search(socket, class) do
-    classes_ids = Enum.map(socket.assigns.classes, & &1.id)
-
-    if class.id in classes_ids do
-      socket
-    else
-      classes = socket.assigns.classes ++ [class]
-      assign(socket, :classes, classes)
-    end
-  end
-
-  # event handlers
-
-  @impl true
-  def handle_event("toggle_filter", %{"id" => id}, socket) do
-    socket =
-      socket
-      |> handle_filter_toggle(:classes, id)
-      |> assign(:has_changes, true)
-
-    {:noreply, socket}
-  end
-
-  def handle_event("update_filters", _, socket) do
-    {:noreply, assign(socket, :has_changes, false)}
-  end
-
-  def handle_event("clear_filters", _, socket) do
-    clear_profile_filters(
-      socket.assigns.current_user,
-      [:classes],
-      strand_id: socket.assigns.strand_id
-    )
-
-    {:noreply, handle_navigation(socket)}
-  end
-
-  def handle_event("apply_filters", _, socket) do
-    socket =
-      socket
-      |> save_profile_filters([:classes], strand_id: socket.assigns.strand_id)
-      |> assign(:has_changes, false)
-      |> handle_navigation()
-
-    {:noreply, socket}
-  end
-end
diff --git a/lib/lanttern_web/live/shared/schools/class_search_component.ex b/lib/lanttern_web/live/shared/schools/class_search_component.ex
index 3ccc228f..f07dc08e 100644
--- a/lib/lanttern_web/live/shared/schools/class_search_component.ex
+++ b/lib/lanttern_web/live/shared/schools/class_search_component.ex
@@ -116,7 +116,7 @@ defmodule LantternWeb.Schools.ClassSearchComponent do
   end
 
   def handle_event("autocomplete_result_select", %{"id" => id}, socket) do
-    selected = Schools.get_class!(id)
+    selected = Schools.get_class!(id, preloads: [:years, :cycle])
 
     notify(
       __MODULE__,
diff --git a/priv/repo/migrations/20241213131428_execute_create_students_records_classes.exs b/priv/repo/migrations/20241213131428_execute_create_students_records_classes.exs
new file mode 100644
index 00000000..3e849040
--- /dev/null
+++ b/priv/repo/migrations/20241213131428_execute_create_students_records_classes.exs
@@ -0,0 +1,20 @@
+defmodule Lanttern.Repo.Migrations.ExecuteCreateStudentsRecordsClasses do
+  use Ecto.Migration
+
+  def change do
+    execute """
+            insert into students_records_classes (student_record_id, class_id, school_id)
+            select distinct
+              sr.id student_record_id,
+              c.id class_id,
+              c.school_id school_id
+            from students_records sr
+            join students_students_records ssr on ssr.student_record_id = sr.id
+            join classes_students cs on cs.student_id = ssr.student_id
+            join classes c on c.id = cs.class_id
+            join school_cycles cy on cy.id = c.cycle_id
+            where sr.date >= cy.start_at and sr.date <= cy.end_at
+            """,
+            ""
+  end
+end

From 35f959a72aaa3137f4026ac10b18dafba8c8fda1 Mon Sep 17 00:00:00 2001
From: endoooo <eric.ehe@gmail.com>
Date: Mon, 16 Dec 2024 09:04:26 -0300
Subject: [PATCH 4/7] feat: added support to filter students records by class

- added support to `classes_ids` opt in `StudentsRecords.list_students_records/1`
- minor adjustment in `<.badge>`'s `on_remove` UI
---
 lib/lanttern/students_records.ex              | 15 +++++++--
 .../components/core_components.ex             |  2 +-
 .../students_records/students_records_live.ex | 33 ++++++++++++++++++-
 .../students_records_live.html.heex           | 32 ++++++++++++++++--
 test/lanttern/students_records_test.exs       | 20 +++++++++++
 5 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/lib/lanttern/students_records.ex b/lib/lanttern/students_records.ex
index aad63bd1..ad4adc13 100644
--- a/lib/lanttern/students_records.ex
+++ b/lib/lanttern/students_records.ex
@@ -18,6 +18,7 @@ defmodule Lanttern.StudentsRecords do
 
   - `:school_id` - filter results by school
   - `:students_ids` - filter results by students
+  - `:classes_ids` - filter results by classes
   - `:types_ids` - filter results by type
   - `:statuses_ids` - filter results by status
   - `:preloads` - preloads associated data
@@ -63,8 +64,18 @@ defmodule Lanttern.StudentsRecords do
        when is_list(students_ids) and students_ids != [] do
     from(
       sr in queryable,
-      join: s in assoc(sr, :students),
-      where: s.id in ^students_ids
+      join: srel in assoc(sr, :students_relationships),
+      where: srel.student_id in ^students_ids
+    )
+    |> apply_list_students_records_opts(opts)
+  end
+
+  defp apply_list_students_records_opts(queryable, [{:classes_ids, classes_ids} | opts])
+       when is_list(classes_ids) and classes_ids != [] do
+    from(
+      sr in queryable,
+      join: cr in assoc(sr, :classes_relationships),
+      where: cr.class_id in ^classes_ids
     )
     |> apply_list_students_records_opts(opts)
   end
diff --git a/lib/lanttern_web/components/core_components.ex b/lib/lanttern_web/components/core_components.ex
index e7cb2ca0..2e33b503 100644
--- a/lib/lanttern_web/components/core_components.ex
+++ b/lib/lanttern_web/components/core_components.ex
@@ -174,7 +174,7 @@ defmodule LantternWeb.CoreComponents do
         <span class="sr-only"><%= gettext("Remove") %></span>
         <.icon
           name="hero-x-mark-mini"
-          class="w-3.5 text-ltrn-subtle hover:text-ltrn-dark"
+          class="w-3.5 text-ltrn-dark"
           style={create_color_map_text_style(@color_map)}
         />
         <span class="absolute -inset-1"></span>
diff --git a/lib/lanttern_web/live/pages/students_records/students_records_live.ex b/lib/lanttern_web/live/pages/students_records/students_records_live.ex
index 3c5e380e..83164632 100644
--- a/lib/lanttern_web/live/pages/students_records/students_records_live.ex
+++ b/lib/lanttern_web/live/pages/students_records/students_records_live.ex
@@ -3,8 +3,11 @@ defmodule LantternWeb.StudentsRecordsLive do
 
   alias Lanttern.StudentsRecords
   alias Lanttern.StudentsRecords.StudentRecord
+  alias Lanttern.Schools.Cycle
+
+  import LantternWeb.FiltersHelpers,
+    only: [assign_user_filters: 2, assign_classes_filter: 2, save_profile_filters: 2]
 
-  import LantternWeb.FiltersHelpers, only: [assign_user_filters: 2, save_profile_filters: 2]
   import LantternWeb.PersonalizationHelpers, only: [profile_has_permission?: 2]
 
   # shared components
@@ -24,16 +27,28 @@ defmodule LantternWeb.StudentsRecordsLive do
       socket
       |> assign(:page_title, gettext("Students records"))
       |> assign_user_filters([:students, :student_record_types, :student_record_statuses])
+      |> apply_assign_classes_filter()
       |> stream_students_records()
       |> assign(:show_student_search_modal, false)
 
     {:ok, socket}
   end
 
+  defp apply_assign_classes_filter(socket) do
+    assign_classes_filter_opts =
+      case socket.assigns.current_user.current_profile do
+        %{current_school_cycle: %Cycle{} = cycle} -> [cycles_ids: [cycle.id]]
+        _ -> []
+      end
+
+    assign_classes_filter(socket, assign_classes_filter_opts)
+  end
+
   defp stream_students_records(socket, reset \\ false) do
     %{
       current_user: %{current_profile: %{school_id: school_id}},
       selected_students_ids: students_ids,
+      selected_classes_ids: classes_ids,
       selected_student_record_types_ids: types_ids,
       selected_student_record_statuses_ids: statuses_ids
     } = socket.assigns
@@ -47,6 +62,7 @@ defmodule LantternWeb.StudentsRecordsLive do
       StudentsRecords.list_students_records_page(
         school_id: school_id,
         students_ids: students_ids,
+        classes_ids: classes_ids,
         types_ids: types_ids,
         statuses_ids: statuses_ids,
         preloads: [:type, :status, :students, [classes: :cycle]],
@@ -130,6 +146,21 @@ defmodule LantternWeb.StudentsRecordsLive do
     {:noreply, socket}
   end
 
+  def handle_event("remove_class_filter", %{"id" => class_id}, socket) do
+    selected_classes_ids =
+      socket.assigns.selected_classes_ids
+      |> Enum.filter(&(&1 != class_id))
+
+    socket =
+      socket
+      |> assign(:selected_classes_ids, selected_classes_ids)
+      |> save_profile_filters([:classes])
+      |> apply_assign_classes_filter()
+      |> stream_students_records(true)
+
+    {:noreply, socket}
+  end
+
   def handle_event("remove_type_filter", _, socket) do
     socket =
       socket
diff --git a/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex b/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
index 888eaa57..0cb9548d 100644
--- a/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
+++ b/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
@@ -20,6 +20,17 @@
           <.badge><%= gettext("all students") %></.badge>
         <% end %>
         ,
+        <%= if @selected_classes != [] do %>
+          <.badge
+            :for={class <- @selected_classes}
+            on_remove={JS.push("remove_class_filter", value: %{"id" => class.id})}
+            theme="primary"
+          >
+            <%= class_with_cycle(class, @current_user) %>
+          </.badge>
+        <% else %>
+          <.badge><%= gettext("all classes") %></.badge>
+        <% end %>,
         <%= if @selected_student_record_types != [] do %>
           <.badge
             :for={type <- @selected_student_record_types}
@@ -89,7 +100,13 @@
       />
     </div>
   </:col>
-  <:col :let={student_record} label={gettext("Classes")} template_col="min-content">
+  <:col
+    :let={student_record}
+    label={gettext("Classes")}
+    template_col="min-content"
+    on_filter={JS.exec("data-show", to: "#students-records-classes-filters-overlay")}
+    filter_is_active={@selected_classes_ids != []}
+  >
     <%= if student_record.classes != [] do %>
       <div class="flex flex-wrap gap-1">
         <.badge :for={class <- student_record.classes}>
@@ -142,7 +159,9 @@
   </:action>
 </.data_grid>
 <div :if={@has_next} class="flex justify-center pb-10">
-  <.button theme="ghost" phx-click="load_more"><%= gettext("Load more records") %></.button>
+  <.button theme="ghost" phx-click="load_more" class="mt-6">
+    <%= gettext("Load more records") %>
+  </.button>
 </div>
 <.modal
   :if={@show_student_search_modal}
@@ -162,6 +181,15 @@
     />
   </form>
 </.modal>
+<.live_component
+  module={LantternWeb.Filters.ClassesFilterOverlayComponent}
+  id="students-records-classes-filters-overlay"
+  current_user={@current_user}
+  title={gettext("Filter students records by class")}
+  navigate={~p"/students_records"}
+  classes={@classes}
+  selected_classes_ids={@selected_classes_ids}
+/>
 <.single_selection_filter_modal
   id="student-record-types-filter-modal"
   title={gettext("Filter students records by type")}
diff --git a/test/lanttern/students_records_test.exs b/test/lanttern/students_records_test.exs
index e9ce97ae..f93d8cef 100644
--- a/test/lanttern/students_records_test.exs
+++ b/test/lanttern/students_records_test.exs
@@ -60,6 +60,26 @@ defmodule Lanttern.StudentsRecordsTest do
       assert expected_student_record.id == student_record.id
     end
 
+    test "list_students_records/1 with classes opt returns records filtered by classes" do
+      school = SchoolsFixtures.school_fixture()
+      class = SchoolsFixtures.class_fixture(%{school_id: school.id})
+
+      student_record =
+        student_record_fixture(%{school_id: school.id, classes_ids: [class.id]})
+
+      # extra fixture to test filtering
+      student_record_fixture()
+      student_record_fixture(%{school_id: school.id})
+
+      [expected_student_record] =
+        StudentsRecords.list_students_records(
+          school_id: school.id,
+          classes_ids: [class.id]
+        )
+
+      assert expected_student_record.id == student_record.id
+    end
+
     test "list_students_records/1 with types and statuses opts students_records filtered by given types and statuses" do
       school = SchoolsFixtures.school_fixture()
       type = student_record_type_fixture(%{school_id: school.id})

From 7c22fdbf582401ab7da48003b1450649404fd7e4 Mon Sep 17 00:00:00 2001
From: endoooo <eric.ehe@gmail.com>
Date: Mon, 16 Dec 2024 10:52:43 -0300
Subject: [PATCH 5/7] chore: added support to manage classes in
 `StudentRecordFormOverlayComponent`

- created `Schools.ClassesFieldComponent` to handle classes selection in form with cycle context
- removed local handling of classes in `StudentFormOverlayComponent` in favor of `ClassesFieldComponent`
- added support to `Cycle` as second arg in `class_with_cycle/2` school helper
- adjusted `<.badge_button_picker>` `current_user` attr name to `current_user_or_cycle`, to align with `class_with_cycle/2`
---
 lib/lanttern/students_records.ex              |   1 +
 .../components/core_components.ex             |   6 +-
 lib/lanttern_web/helpers/schools_helpers.ex   |  13 +-
 .../students_records/students_records_live.ex |   4 +-
 .../classes_filter_overlay_component.ex       |   2 +-
 .../shared/schools/classes_field_component.ex | 200 ++++++++++++++++++
 .../schools/student_form_overlay_component.ex | 169 ++-------------
 .../student_record_form_overlay_component.ex  |  27 +++
 8 files changed, 265 insertions(+), 157 deletions(-)
 create mode 100644 lib/lanttern_web/live/shared/schools/classes_field_component.ex

diff --git a/lib/lanttern/students_records.ex b/lib/lanttern/students_records.ex
index ad4adc13..d63e53fa 100644
--- a/lib/lanttern/students_records.ex
+++ b/lib/lanttern/students_records.ex
@@ -34,6 +34,7 @@ defmodule Lanttern.StudentsRecords do
           [
             school_id: pos_integer(),
             students_ids: [pos_integer()],
+            classes_ids: [pos_integer()],
             types_ids: [pos_integer()],
             statuses_ids: [pos_integer()],
             preloads: list()
diff --git a/lib/lanttern_web/components/core_components.ex b/lib/lanttern_web/components/core_components.ex
index 2e33b503..949ca515 100644
--- a/lib/lanttern_web/components/core_components.ex
+++ b/lib/lanttern_web/components/core_components.ex
@@ -337,7 +337,9 @@ defmodule LantternWeb.CoreComponents do
     default: nil,
     doc: "supports \"class_with_cycle\" opt, which will render the class + cycle name"
 
-  attr :current_user, :any, default: nil, doc: "used when `label_setter` is \"class_with_cycle\""
+  attr :current_user_or_cycle, :any,
+    default: nil,
+    doc: "used when `label_setter` is \"class_with_cycle\""
 
   attr :on_select, :any,
     required: true,
@@ -362,7 +364,7 @@ defmodule LantternWeb.CoreComponents do
         phx-click={@on_select.(item.id)}
       >
         <%= case @label_setter do
-          "class_with_cycle" -> class_with_cycle(item, @current_user)
+          "class_with_cycle" -> class_with_cycle(item, @current_user_or_cycle)
           _ -> item.name
         end %>
       </.badge_button>
diff --git a/lib/lanttern_web/helpers/schools_helpers.ex b/lib/lanttern_web/helpers/schools_helpers.ex
index 2fad2853..3931a1b7 100644
--- a/lib/lanttern_web/helpers/schools_helpers.ex
+++ b/lib/lanttern_web/helpers/schools_helpers.ex
@@ -81,15 +81,15 @@ defmodule LantternWeb.SchoolsHelpers do
   @doc """
   Returns the class name in the format `"Class A (Cycle X)"`.
 
-  When a user is given, only class name will be returned
-  when class cycle is the same as user's current cycle.
+  Only class name will be returned when class cycle is the same as the current cycle
+  (infered from `User` or directly from `Cycle` as second argument).
 
   ## Examples
 
       iex> class_with_cycle(class)
       "Class A (Cycle X)"
   """
-  @spec class_with_cycle(Class.t(), User.t() | nil) :: binary()
+  @spec class_with_cycle(Class.t(), User.t() | Cycle.t() | nil) :: binary()
   def class_with_cycle(class, user \\ nil)
 
   def class_with_cycle(
@@ -101,6 +101,13 @@ defmodule LantternWeb.SchoolsHelpers do
       when class_cycle_id == current_cycle_id,
       do: class.name
 
+  def class_with_cycle(
+        %Class{cycle_id: class_cycle_id} = class,
+        %Cycle{id: current_cycle_id}
+      )
+      when class_cycle_id == current_cycle_id,
+      do: class.name
+
   def class_with_cycle(%Class{cycle: %Cycle{} = cycle} = class, _user),
     do: "#{class.name} (#{cycle.name})"
 
diff --git a/lib/lanttern_web/live/pages/students_records/students_records_live.ex b/lib/lanttern_web/live/pages/students_records/students_records_live.ex
index 83164632..0c825352 100644
--- a/lib/lanttern_web/live/pages/students_records/students_records_live.ex
+++ b/lib/lanttern_web/live/pages/students_records/students_records_live.ex
@@ -111,7 +111,9 @@ defmodule LantternWeb.StudentsRecordsLive do
 
   defp get_student_record_and_validate_permission(socket, id) do
     student_record =
-      StudentsRecords.get_student_record(id, preloads: [:students_relationships, :students])
+      StudentsRecords.get_student_record(id,
+        preloads: [:students_relationships, :students, :classes_relationships, :classes]
+      )
       |> put_students_ids()
 
     case student_record do
diff --git a/lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex b/lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex
index d29cffd4..768a406b 100644
--- a/lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex
+++ b/lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex
@@ -40,7 +40,7 @@ defmodule LantternWeb.Filters.ClassesFilterOverlayComponent do
           items={@classes}
           selected_ids={@selected_classes_ids}
           label_setter="class_with_cycle"
-          current_user={@current_user}
+          current_user_or_cycle={@current_user}
         />
         <form class="mt-6">
           <.live_component
diff --git a/lib/lanttern_web/live/shared/schools/classes_field_component.ex b/lib/lanttern_web/live/shared/schools/classes_field_component.ex
new file mode 100644
index 00000000..bb5e14a5
--- /dev/null
+++ b/lib/lanttern_web/live/shared/schools/classes_field_component.ex
@@ -0,0 +1,200 @@
+defmodule LantternWeb.Schools.ClassesFieldComponent do
+  @moduledoc """
+  Renders a classes picker to use in forms.
+
+  The component displays the user school and current cycle classes by default,
+  but also handles classes from other cycles search and rendering.
+
+  This component uses the `selected_classes_ids` to handle the UI rendering. On change,
+  it notifies the parent view/component with the updated selected classes ids but doesn't
+  "save" it internally — it expects the parent updated `selected_classes_ids` to rerender
+  the updated UI.
+
+  ### Attrs
+
+      attr :label, :string, required: true
+      attr :selected_classes_ids, :list, required: true, doc: "the selected classes ids list"
+      attr :school_id, :integer, required: true, doc: "used to filter classes"
+      attr :current_cycle, Cycle, required: true, doc: "used to manage the classes lists"
+      attr :notify_parent, :boolean
+      attr :notify_component, Phoenix.LiveComponent.CID
+      attr :class, :any
+
+  """
+
+  use LantternWeb, :live_component
+
+  alias Lanttern.Schools
+  alias Lanttern.Schools.Cycle
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div class={@class}>
+      <.label><%= @label %></.label>
+      <%= if @selected_classes != [] do %>
+        <.badge_button_picker
+          id="current-class-picker"
+          on_select={
+            &(JS.push("unselect_class", value: %{"id" => &1}, target: @myself)
+              |> JS.dispatch("change", to: "#student-form"))
+          }
+          items={@selected_classes}
+          selected_ids={@selected_classes_ids}
+          label_setter="class_with_cycle"
+          current_user_or_cycle={@current_cycle}
+        />
+      <% else %>
+        <.empty_state_simple><%= gettext("No linked classes") %></.empty_state_simple>
+      <% end %>
+      <div :if={@cycle_classes != []} class="mt-6">
+        <p class="mb-2"><%= gettext("%{cycle} cycle classes", cycle: @current_cycle.name) %></p>
+        <.badge_button_picker
+          id="class-cycle-select"
+          on_select={
+            &(JS.push("select_cycle_class", value: %{"id" => &1}, target: @myself)
+              |> JS.dispatch("change", to: "#student-form"))
+          }
+          items={@cycle_classes}
+          selected_ids={@selected_classes_ids}
+        />
+      </div>
+      <.select
+        name="other_classes"
+        prompt={
+          if @cycle_classes != [],
+            do: gettext("Other cycle classes"),
+            else: gettext("Select a class")
+        }
+        options={@other_cycle_classes_options}
+        value=""
+        phx-change="select_other_cycle_class"
+        phx-target={@myself}
+        class="mt-6"
+      />
+      <%!-- <div :if={@form.source.action in [:insert, :update]}>
+        <.error :for={{msg, _} <- @form[:classes_ids].errors}><%= msg %></.error>
+      </div> --%>
+    </div>
+    """
+  end
+
+  @impl true
+  def mount(socket) do
+    socket =
+      socket
+      |> assign(:class, nil)
+      |> assign(:initialized, false)
+
+    {:ok, socket}
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    socket =
+      socket
+      |> assign(assigns)
+      |> initialize()
+      |> assign_classes()
+
+    {:ok, socket}
+  end
+
+  defp initialize(%{assigns: %{initialized: false}} = socket) do
+    socket
+    |> assign_all_classes()
+    |> assign(:initialized, true)
+  end
+
+  defp initialize(socket), do: socket
+
+  defp assign_all_classes(socket) do
+    all_classes = Schools.list_classes(schools_ids: [socket.assigns.school_id])
+    assign(socket, :all_classes, all_classes)
+  end
+
+  defp assign_classes(socket) do
+    selected_classes =
+      Enum.filter(
+        socket.assigns.all_classes,
+        &(&1.id in socket.assigns.selected_classes_ids)
+      )
+
+    socket
+    |> assign(:selected_classes, selected_classes)
+    |> assign_cycle_classes()
+    |> assign_other_cycle_classes_options()
+  end
+
+  defp assign_cycle_classes(socket) do
+    cycle_classes =
+      case socket.assigns do
+        %{current_cycle: %Cycle{} = cycle} ->
+          Enum.filter(socket.assigns.all_classes, &(&1.cycle_id == cycle.id))
+
+        _ ->
+          []
+      end
+      |> Enum.filter(&(&1.id not in socket.assigns.selected_classes_ids))
+
+    assign(socket, :cycle_classes, cycle_classes)
+  end
+
+  defp assign_other_cycle_classes_options(socket) do
+    cycle_id =
+      case socket.assigns do
+        %{current_cycle: %Cycle{} = cycle} -> cycle.id
+        _ -> nil
+      end
+
+    other_cycle_classes_options =
+      socket.assigns.all_classes
+      |> Enum.filter(fn class ->
+        class.cycle_id != cycle_id &&
+          class.id not in socket.assigns.selected_classes_ids
+      end)
+      |> Enum.map(&{"#{&1.name} (#{&1.cycle.name})", &1.id})
+
+    assign(socket, :other_cycle_classes_options, other_cycle_classes_options)
+  end
+
+  # event handlers
+
+  @impl true
+  def handle_event("unselect_class", %{"id" => id}, socket) do
+    updated_selected_classes_ids =
+      Enum.reject(socket.assigns.selected_classes_ids, &(&1 == id))
+
+    notify_change(socket, updated_selected_classes_ids)
+
+    {:noreply, socket}
+  end
+
+  def handle_event("select_cycle_class", %{"id" => id}, socket) do
+    updated_selected_classes_ids =
+      [id | socket.assigns.selected_classes_ids]
+
+    notify_change(socket, updated_selected_classes_ids)
+
+    {:noreply, socket}
+  end
+
+  def handle_event("select_other_cycle_class", %{"other_classes" => id}, socket) do
+    id = String.to_integer(id)
+
+    updated_selected_classes_ids =
+      [id | socket.assigns.selected_classes_ids]
+
+    notify_change(socket, updated_selected_classes_ids)
+
+    {:noreply, socket}
+  end
+
+  defp notify_change(socket, selected_classes_ids),
+    do:
+      notify(
+        __MODULE__,
+        {:changed, selected_classes_ids},
+        socket.assigns
+      )
+end
diff --git a/lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex b/lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex
index 44da2e3a..337e770e 100644
--- a/lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex
+++ b/lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex
@@ -16,9 +16,12 @@ defmodule LantternWeb.Schools.StudentFormOverlayComponent do
   use LantternWeb, :live_component
 
   alias Lanttern.Schools
-  alias Lanttern.Schools.Cycle
   alias Lanttern.Schools.Student
 
+  # shared
+
+  alias LantternWeb.Schools.ClassesFieldComponent
+
   @impl true
   def render(assigns) do
     ~H"""
@@ -42,51 +45,15 @@ defmodule LantternWeb.Schools.StudentFormOverlayComponent do
             class="mb-6"
             phx-debounce="1500"
           />
-          <div>
-            <.label><%= gettext("Classes") %></.label>
-            <%= if @selected_classes != [] do %>
-              <.badge_button_picker
-                id="current-class-picker"
-                on_select={
-                  &(JS.push("unselect_class", value: %{"id" => &1}, target: @myself)
-                    |> JS.dispatch("change", to: "#student-form"))
-                }
-                items={@selected_classes}
-                selected_ids={@selected_classes_ids}
-                label_setter="class_with_cycle"
-              />
-            <% else %>
-              <.empty_state_simple><%= gettext("No linked classes") %></.empty_state_simple>
-            <% end %>
-            <div :if={@cycle_classes != []} class="mt-6">
-              <p class="mb-2"><%= gettext("%{cycle} cycle classes", cycle: @current_cycle.name) %></p>
-              <.badge_button_picker
-                id="class-cycle-select"
-                on_select={
-                  &(JS.push("select_cycle_class", value: %{"id" => &1}, target: @myself)
-                    |> JS.dispatch("change", to: "#student-form"))
-                }
-                items={@cycle_classes}
-                selected_ids={@selected_classes_ids}
-              />
-            </div>
-            <.select
-              name="other_classes"
-              prompt={
-                if @cycle_classes != [],
-                  do: gettext("Other cycle classes"),
-                  else: gettext("Select a class")
-              }
-              options={@other_cycle_classes_options}
-              value=""
-              phx-change="select_other_cycle_class"
-              phx-target={@myself}
-              class="mt-6"
-            />
-            <%!-- <div :if={@form.source.action in [:insert, :update]}>
-              <.error :for={{msg, _} <- @form[:classes_ids].errors}><%= msg %></.error>
-            </div> --%>
-          </div>
+          <.live_component
+            module={ClassesFieldComponent}
+            id="student-form-classes-picker"
+            label={gettext("Classes")}
+            school_id={@student.school_id}
+            current_cycle={@current_cycle}
+            selected_classes_ids={@selected_classes_ids}
+            notify_component={@myself}
+          />
         </.form>
         <:actions_left :if={@student.id}>
           <.button
@@ -119,6 +86,12 @@ defmodule LantternWeb.Schools.StudentFormOverlayComponent do
   end
 
   @impl true
+  def update(
+        %{action: {ClassesFieldComponent, {:changed, selected_classes_ids}}},
+        socket
+      ),
+      do: {:ok, assign(socket, :selected_classes_ids, selected_classes_ids)}
+
   def update(%{student: %Student{}} = assigns, socket) do
     socket =
       socket
@@ -131,7 +104,6 @@ defmodule LantternWeb.Schools.StudentFormOverlayComponent do
   defp initialize(%{assigns: %{initialized: false}} = socket) do
     socket
     |> assign_form()
-    |> assign_classes()
     |> assign(:initialized, true)
   end
 
@@ -148,112 +120,9 @@ defmodule LantternWeb.Schools.StudentFormOverlayComponent do
     |> assign(:selected_classes_ids, selected_classes_ids)
   end
 
-  defp assign_classes(socket) do
-    school_id = socket.assigns.student.school_id
-    all_classes = Schools.list_classes(schools_ids: [school_id])
-
-    selected_classes =
-      Enum.filter(all_classes, &(&1.id in socket.assigns.selected_classes_ids))
-
-    socket
-    |> assign(:all_classes, all_classes)
-    |> assign(:selected_classes, selected_classes)
-    |> assign_cycle_classes()
-    |> assign_other_cycle_classes_options()
-  end
-
-  defp assign_cycle_classes(socket) do
-    cycle_classes =
-      case socket.assigns do
-        %{current_cycle: %Cycle{} = cycle} ->
-          Enum.filter(socket.assigns.all_classes, &(&1.cycle_id == cycle.id))
-
-        _ ->
-          []
-      end
-      |> Enum.filter(&(&1.id not in socket.assigns.selected_classes_ids))
-
-    assign(socket, :cycle_classes, cycle_classes)
-  end
-
-  defp assign_other_cycle_classes_options(socket) do
-    cycle_id =
-      case socket.assigns do
-        %{current_cycle: %Cycle{} = cycle} -> cycle.id
-        _ -> nil
-      end
-
-    other_cycle_classes_options =
-      socket.assigns.all_classes
-      |> Enum.filter(fn class ->
-        class.cycle_id != cycle_id &&
-          class.id not in socket.assigns.selected_classes_ids
-      end)
-      |> Enum.map(&{"#{&1.name} (#{&1.cycle.name})", &1.id})
-
-    assign(socket, :other_cycle_classes_options, other_cycle_classes_options)
-  end
-
   # event handlers
 
   @impl true
-  def handle_event("unselect_class", %{"id" => id}, socket) do
-    selected_classes_ids =
-      Enum.reject(socket.assigns.selected_classes_ids, &(&1 == id))
-
-    selected_classes =
-      socket.assigns.all_classes
-      |> Enum.filter(&(&1.id in selected_classes_ids))
-
-    socket =
-      socket
-      |> assign(:selected_classes_ids, selected_classes_ids)
-      |> assign(:selected_classes, selected_classes)
-      |> assign_cycle_classes()
-      |> assign_other_cycle_classes_options()
-      |> assign_validated_form(socket.assigns.form.params)
-
-    {:noreply, socket}
-  end
-
-  def handle_event("select_cycle_class", %{"id" => id}, socket) do
-    selected_classes_ids =
-      [id | socket.assigns.selected_classes_ids]
-
-    selected_classes =
-      socket.assigns.all_classes
-      |> Enum.filter(&(&1.id in selected_classes_ids))
-
-    socket =
-      socket
-      |> assign(:selected_classes_ids, selected_classes_ids)
-      |> assign(:selected_classes, selected_classes)
-      |> assign_cycle_classes()
-      |> assign_validated_form(socket.assigns.form.params)
-
-    {:noreply, socket}
-  end
-
-  def handle_event("select_other_cycle_class", %{"other_classes" => id}, socket) do
-    id = String.to_integer(id)
-
-    selected_classes_ids =
-      [id | socket.assigns.selected_classes_ids]
-
-    selected_classes =
-      socket.assigns.all_classes
-      |> Enum.filter(&(&1.id in selected_classes_ids))
-
-    socket =
-      socket
-      |> assign(:selected_classes_ids, selected_classes_ids)
-      |> assign(:selected_classes, selected_classes)
-      |> assign_other_cycle_classes_options()
-      |> assign_validated_form(socket.assigns.form.params)
-
-    {:noreply, socket}
-  end
-
   def handle_event("validate", %{"student" => student_params}, socket),
     do: {:noreply, assign_validated_form(socket, student_params)}
 
diff --git a/lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex b/lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex
index 75da4554..549af625 100644
--- a/lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex
+++ b/lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex
@@ -11,6 +11,7 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
   # shared
 
   alias LantternWeb.Schools.StudentSearchComponent
+  alias LantternWeb.Schools.ClassesFieldComponent
 
   @impl true
   def render(assigns) do
@@ -48,6 +49,16 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
               <.error :for={{msg, _} <- @form[:students_ids].errors}><%= msg %></.error>
             </div>
           </div>
+          <.live_component
+            module={ClassesFieldComponent}
+            id="student-form-classes-picker"
+            label={gettext("Classes")}
+            school_id={@student_record.school_id}
+            current_cycle={@current_user.current_profile.current_school_cycle}
+            selected_classes_ids={@selected_classes_ids}
+            notify_component={@myself}
+            class="mb-6"
+          />
           <div class="mb-6">
             <.label><%= gettext("Record type") %></.label>
             <.badge_button_picker
@@ -177,11 +188,18 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
     {:ok, socket}
   end
 
+  def update(
+        %{action: {ClassesFieldComponent, {:changed, selected_classes_ids}}},
+        socket
+      ),
+      do: {:ok, assign(socket, :selected_classes_ids, selected_classes_ids)}
+
   def update(%{student_record: %StudentRecord{}} = assigns, socket) do
     socket =
       socket
       |> assign(assigns)
       |> assign_selected_students()
+      |> assign_selected_classes_ids()
       |> assign_form()
       |> assign_types()
       |> assign_statuses()
@@ -199,6 +217,14 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
     |> assign(:selected_students_ids, selected_students_ids)
   end
 
+  defp assign_selected_classes_ids(socket) do
+    selected_classes_ids =
+      socket.assigns.student_record.classes
+      |> Enum.map(& &1.id)
+
+    assign(socket, :selected_classes_ids, selected_classes_ids)
+  end
+
   defp assign_form(socket) do
     student_record = socket.assigns.student_record
     changeset = StudentsRecords.change_student_record(student_record)
@@ -304,6 +330,7 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
     |> Map.put("type_id", socket.assigns.selected_type_id)
     |> Map.put("status_id", socket.assigns.selected_status_id)
     |> Map.put("students_ids", socket.assigns.selected_students_ids)
+    |> Map.put("classes_ids", socket.assigns.selected_classes_ids)
   end
 
   defp save_student_record(socket, nil, student_record_params) do

From 1dfab41c821ee0511ed4a1a0031ed50b3854a0aa Mon Sep 17 00:00:00 2001
From: endoooo <eric.ehe@gmail.com>
Date: Mon, 16 Dec 2024 13:24:56 -0300
Subject: [PATCH 6/7] feat: added suport to class link on student select in
 student record form overlay

- created `Schools.list_classes_ids_for_student_in_date/2`
---
 lib/lanttern/schools.ex                       | 25 +++++++++++++++++++
 .../id/student_record_live.ex                 |  9 ++++++-
 .../students_records/students_records_live.ex |  4 ++-
 .../students_records_live.html.heex           |  2 +-
 .../student_record_form_overlay_component.ex  | 12 ++++++++-
 test/lanttern/schools_test.exs                | 22 ++++++++++++++++
 6 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/lib/lanttern/schools.ex b/lib/lanttern/schools.ex
index a2dcaa67..8f92dcc9 100644
--- a/lib/lanttern/schools.ex
+++ b/lib/lanttern/schools.ex
@@ -1305,4 +1305,29 @@ defmodule Lanttern.Schools do
 
     {:ok, response}
   end
+
+  @doc """
+  Returns a list of classes ids linked to student for the giving date,
+  using the relationship between class and cycle.
+
+  ## Examples
+
+      iex> list_classes_ids_for_student_in_date(student_id, ~D[2024-08-01])
+      [1, 2]
+
+  """
+  @spec list_classes_ids_for_student_in_date(student_id :: pos_integer(), date: Date.t()) :: [
+          pos_integer()
+        ]
+  def list_classes_ids_for_student_in_date(student_id, date) do
+    from(
+      c in Class,
+      join: s in assoc(c, :students),
+      on: s.id == ^student_id,
+      join: cy in assoc(c, :cycle),
+      where: cy.start_at <= ^date and cy.end_at >= ^date,
+      select: c.id
+    )
+    |> Repo.all()
+  end
 end
diff --git a/lib/lanttern_web/live/pages/students_records/id/student_record_live.ex b/lib/lanttern_web/live/pages/students_records/id/student_record_live.ex
index 042c20e9..23e2ca48 100644
--- a/lib/lanttern_web/live/pages/students_records/id/student_record_live.ex
+++ b/lib/lanttern_web/live/pages/students_records/id/student_record_live.ex
@@ -28,7 +28,14 @@ defmodule LantternWeb.StudentRecordLive do
   defp assign_student_record(socket, %{"id" => id}) do
     student_record =
       StudentsRecords.get_student_record(id,
-        preloads: [:students, :students_relationships, :type, :status, [classes: :cycle]]
+        preloads: [
+          :students,
+          :students_relationships,
+          :classes_relationships,
+          :type,
+          :status,
+          [classes: :cycle]
+        ]
       )
       |> put_students_ids()
 
diff --git a/lib/lanttern_web/live/pages/students_records/students_records_live.ex b/lib/lanttern_web/live/pages/students_records/students_records_live.ex
index 0c825352..02a21b30 100644
--- a/lib/lanttern_web/live/pages/students_records/students_records_live.ex
+++ b/lib/lanttern_web/live/pages/students_records/students_records_live.ex
@@ -89,10 +89,12 @@ defmodule LantternWeb.StudentsRecordsLive do
   def handle_params(params, _uri, socket) do
     student_record =
       case params do
-        %{"edit" => "new"} ->
+        %{"new" => "true"} ->
           %StudentRecord{
+            school_id: socket.assigns.current_user.current_profile.school_id,
             students: socket.assigns.selected_students,
             students_ids: socket.assigns.selected_students_ids,
+            classes: [],
             date: Date.utc_today()
           }
 
diff --git a/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex b/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
index 0cb9548d..2fc7067a 100644
--- a/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
+++ b/lib/lanttern_web/live/pages/students_records/students_records_live.html.heex
@@ -57,7 +57,7 @@
       </p>
       <.action
         type="link"
-        patch={~p"/students_records?edit=new"}
+        patch={~p"/students_records?new=true"}
         icon_name="hero-plus-circle-mini"
       >
         <%= gettext("New student record") %>
diff --git a/lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex b/lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex
index 549af625..c4d07ca5 100644
--- a/lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex
+++ b/lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex
@@ -7,6 +7,7 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
 
   alias Lanttern.StudentsRecords
   alias Lanttern.StudentsRecords.StudentRecord
+  alias Lanttern.Schools
 
   # shared
 
@@ -51,7 +52,7 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
           </div>
           <.live_component
             module={ClassesFieldComponent}
-            id="student-form-classes-picker"
+            id="student-record-form-classes-picker"
             label={gettext("Classes")}
             school_id={@student_record.school_id}
             current_cycle={@current_user.current_profile.current_school_cycle}
@@ -168,6 +169,14 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
 
     selected_students_ids = selected_students |> Enum.map(& &1.id)
 
+    # also add selected classes ids if possible
+    student_classes_ids =
+      Schools.list_classes_ids_for_student_in_date(student.id, socket.assigns.student_record.date)
+
+    selected_classes_ids =
+      (socket.assigns.selected_classes_ids ++ student_classes_ids)
+      |> Enum.uniq()
+
     # basically a manual "validate" event to update students ids
     params =
       socket.assigns.form.params
@@ -183,6 +192,7 @@ defmodule LantternWeb.StudentsRecords.StudentRecordFormOverlayComponent do
       socket
       |> assign(:selected_students, selected_students)
       |> assign(:selected_students_ids, selected_students_ids)
+      |> assign(:selected_classes_ids, selected_classes_ids)
       |> assign(:form, form)
 
     {:ok, socket}
diff --git a/test/lanttern/schools_test.exs b/test/lanttern/schools_test.exs
index 9829f29d..14378e2a 100644
--- a/test/lanttern/schools_test.exs
+++ b/test/lanttern/schools_test.exs
@@ -1167,4 +1167,26 @@ defmodule Lanttern.SchoolsTest do
       |> Lanttern.Repo.one!()
     end
   end
+
+  describe "list classes ids for student in date" do
+    test "list_classes_ids_for_student_in_date/2 returns the correct list" do
+      school = school_fixture()
+
+      cycle_2024 =
+        cycle_fixture(%{school_id: school.id, start_at: ~D[2024-01-01], end_at: ~D[2024-12-31]})
+
+      cycle_2025 =
+        cycle_fixture(%{school_id: school.id, start_at: ~D[2025-01-01], end_at: ~D[2025-12-31]})
+
+      class_2024 = class_fixture(%{school_id: school.id, cycle_id: cycle_2024.id})
+      class_2025 = class_fixture(%{school_id: school.id, cycle_id: cycle_2025.id})
+
+      student =
+        student_fixture(%{school_id: school.id, classes_ids: [class_2024.id, class_2025.id]})
+
+      assert Schools.list_classes_ids_for_student_in_date(student.id, ~D[2024-06-10]) == [
+               class_2024.id
+             ]
+    end
+  end
 end

From df995947303356d8a33de40934f2323326fbfb0c Mon Sep 17 00:00:00 2001
From: endoooo <eric.ehe@gmail.com>
Date: Mon, 16 Dec 2024 13:34:55 -0300
Subject: [PATCH 7/7] chore: updated version and translations

---
 mix.exs                                   |   2 +-
 priv/gettext/default.pot                  | 193 +++++++++++-----------
 priv/gettext/en/LC_MESSAGES/default.po    | 193 +++++++++++-----------
 priv/gettext/pt_BR/LC_MESSAGES/default.po | 193 +++++++++++-----------
 4 files changed, 292 insertions(+), 289 deletions(-)

diff --git a/mix.exs b/mix.exs
index 0fa44e09..d977e54d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Lanttern.MixProject do
   def project do
     [
       app: :lanttern,
-      version: "2024.12.12-alpha.39",
+      version: "2024.12.16-alpha.39",
       elixir: "~> 1.15",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index f00b4759..9831d6e3 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -11,9 +11,9 @@
 msgid ""
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:729
-#: lib/lanttern_web/components/core_components.ex:1665
-#: lib/lanttern_web/components/core_components.ex:1727
+#: lib/lanttern_web/components/core_components.ex:735
+#: lib/lanttern_web/components/core_components.ex:1671
+#: lib/lanttern_web/components/core_components.ex:1733
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
 msgid "Strands"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:860
+#: lib/lanttern_web/components/core_components.ex:866
 #: lib/lanttern_web/components/overlay_components.ex:78
 #: lib/lanttern_web/components/overlay_components.ex:334
 #, elixir-autogen, elixir-format
@@ -85,19 +85,17 @@ msgstr ""
 msgid "You're logged in as"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:53
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:67
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:58
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:33
 #: lib/lanttern_web/live/shared/filters/inline_filters_component.ex:33
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Apply filters"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:51
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:65
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:56
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:31
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:63
 #, elixir-autogen, elixir-format
 msgid "Applying filters..."
 msgstr ""
@@ -124,26 +122,24 @@ msgstr ""
 #: lib/lanttern_web/live/shared/assessments/entry_details_component.ex:269
 #: lib/lanttern_web/live/shared/attachments/attachment_area_component.ex:93
 #: lib/lanttern_web/live/shared/attachments/attachment_area_component.ex:126
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:45
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:59
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:50
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:25
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:57
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_entry_overlay_component.ex:64
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_final_entry_overlay_component.ex:66
 #: lib/lanttern_web/live/shared/notes/note_component.ex:60
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:51
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:113
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:58
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:104
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:131
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:71
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:143
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:41
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:55
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:46
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:21
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Clear filters"
 msgstr ""
@@ -186,8 +182,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:53
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:116
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:61
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:107
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:134
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:74
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
@@ -217,7 +213,7 @@ msgstr ""
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:51
 #: lib/lanttern_web/live/shared/reporting/report_card_form_component.ex:62
 #: lib/lanttern_web/live/shared/reporting/strand_report_form_component.ex:55
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:108
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:120
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -227,7 +223,7 @@ msgstr ""
 msgid "File \"%{file}\" is invalid."
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:56
+#: lib/lanttern_web/live/pages/school/students_component.ex:58
 #: lib/lanttern_web/live/shared/curricula/curriculum_item_form_component.ex:33
 #: lib/lanttern_web/live/shared/grades_reports/grades_report_form_component.ex:31
 #: lib/lanttern_web/live/shared/learning_context/moment_card_form_component.ex:39
@@ -235,8 +231,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:35
 #: lib/lanttern_web/live/shared/reporting/report_card_form_component.ex:55
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:34
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:41
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:100
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:44
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:112
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -259,8 +255,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:27
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:29
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:26
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:36
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:29
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:39
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:31
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
@@ -329,17 +325,17 @@ msgstr ""
 msgid "or drag and drop here"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:899
+#: lib/lanttern_web/components/core_components.ex:905
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:890
+#: lib/lanttern_web/components/core_components.ex:896
 #, elixir-autogen, elixir-format
 msgid "Error!"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:911
+#: lib/lanttern_web/components/core_components.ex:917
 #, elixir-autogen, elixir-format
 msgid "Hang in there while we get back on track"
 msgstr ""
@@ -349,17 +345,17 @@ msgstr ""
 msgid "Markdown supported"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:889
+#: lib/lanttern_web/components/core_components.ex:895
 #, elixir-autogen, elixir-format
 msgid "Success!"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:894
+#: lib/lanttern_web/components/core_components.ex:900
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:906
+#: lib/lanttern_web/components/core_components.ex:912
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr ""
@@ -399,8 +395,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_final_entry_overlay_component.ex:57
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:108
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:53
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:99
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:122
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:66
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:134
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
@@ -463,8 +459,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/notes/note_component.ex:53
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:106
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:51
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:97
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:120
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:64
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:132
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -495,7 +491,7 @@ msgid "Differentiation for %{name}"
 msgstr ""
 
 #: lib/lanttern_web/components/attachments_components.ex:112
-#: lib/lanttern_web/components/core_components.ex:1227
+#: lib/lanttern_web/components/core_components.ex:1233
 #: lib/lanttern_web/components/learning_context_components.ex:55
 #: lib/lanttern_web/live/pages/grades_report/grades_reports_live.html.heex:44
 #: lib/lanttern_web/live/pages/grades_report/id/grades_report_live.html.heex:39
@@ -541,7 +537,7 @@ msgstr ""
 msgid "Rubric"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:78
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:67
 #, elixir-autogen, elixir-format
 msgid "Select a class"
 msgstr ""
@@ -788,7 +784,7 @@ msgstr ""
 msgid "Moments"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:1615
+#: lib/lanttern_web/components/core_components.ex:1621
 #, elixir-autogen, elixir-format
 msgid "Move moment down"
 msgstr ""
@@ -1267,7 +1263,7 @@ msgstr ""
 msgid "Move down"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:1605
+#: lib/lanttern_web/components/core_components.ex:1611
 #: lib/lanttern_web/live/shared/grading/grade_composition_overlay_component.ex:154
 #, elixir-autogen, elixir-format
 msgid "Move up"
@@ -1375,8 +1371,8 @@ msgid "Recalculate grade"
 msgstr ""
 
 #: lib/lanttern_web/components/attachments_components.ex:117
-#: lib/lanttern_web/components/core_components.ex:172
-#: lib/lanttern_web/components/core_components.ex:1290
+#: lib/lanttern_web/components/core_components.ex:174
+#: lib/lanttern_web/components/core_components.ex:1296
 #: lib/lanttern_web/live/shared/grading/grade_composition_overlay_component.ex:183
 #, elixir-autogen, elixir-format
 msgid "Remove"
@@ -1541,8 +1537,9 @@ msgid "Student report card deleted"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/report_cards/id/report_card_live.html.heex:14
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:78
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:36
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:41
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:89
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:38
 #, elixir-autogen, elixir-format
 msgid "Students"
 msgstr ""
@@ -1571,7 +1568,7 @@ msgid "The parent cycle grade is calculated based on it's children cycles. E.g.
 msgstr ""
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:15
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:100
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:130
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:42
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -1612,7 +1609,7 @@ msgid "all years"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/curriculum/component/id/curriculum_component_live.html.heex:23
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:34
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "and"
 msgstr ""
@@ -1787,8 +1784,8 @@ msgstr ""
 msgid "Hey!"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:1348
-#: lib/lanttern_web/components/core_components.ex:1370
+#: lib/lanttern_web/components/core_components.ex:1354
+#: lib/lanttern_web/components/core_components.ex:1376
 #, elixir-autogen, elixir-format
 msgid "Selected"
 msgstr ""
@@ -2587,8 +2584,11 @@ msgstr ""
 
 #: lib/lanttern_web/live/pages/school/school_live.html.heex:8
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:36
-#: lib/lanttern_web/live/pages/school/students_component.ex:61
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:46
+#: lib/lanttern_web/live/pages/school/students_component.ex:63
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:55
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:105
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:51
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Classes"
 msgstr ""
@@ -2643,25 +2643,25 @@ msgstr ""
 msgid "All strand evidences"
 msgstr ""
 
-#: lib/lanttern/students_records/student_record.ex:80
+#: lib/lanttern/students_records/student_record.ex:91
 #, elixir-autogen, elixir-format
 msgid "At least 1 student is required"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:66
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:84
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:77
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:96
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:55
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:123
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:189
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:73
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:153
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:230
 #, elixir-autogen, elixir-format
 msgid "Edit student record"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:141
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "Filter records by student"
 msgstr ""
@@ -2671,80 +2671,80 @@ msgstr ""
 msgid "Invalid permissions"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:132
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:163
 #, elixir-autogen, elixir-format
 msgid "Load more records"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:52
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:190
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:63
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:231
 #, elixir-autogen, elixir-format
 msgid "New student record"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:63
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "No students records found for selected filters."
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:92
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:122
 #, elixir-autogen, elixir-format
 msgid "Record"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:52
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Record type"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:21
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:111
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:68
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:141
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Status"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:209
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:245
 #, elixir-autogen, elixir-format
 msgid "Student record created successfully"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:81
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:227
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:89
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:263
 #, elixir-autogen, elixir-format
 msgid "Student record deleted successfully"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:34
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:42
 #, elixir-autogen, elixir-format
 msgid "Student record details"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:72
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:218
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:80
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:254
 #, elixir-autogen, elixir-format
 msgid "Student record updated successfully"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:2
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:24
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:28
 #: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:3
 #: lib/lanttern_web/live/shared/menu_component.ex:425
 #, elixir-autogen, elixir-format
 msgid "Students records"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:148
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:180
 #, elixir-autogen, elixir-format
 msgid "Type the name of the student"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:44
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "all statuses"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:32
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "all student record types"
 msgstr ""
@@ -2754,17 +2754,17 @@ msgstr ""
 msgid "all students"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:168
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:209
 #, elixir-autogen, elixir-format
 msgid "Filter students records by status"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:154
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:195
 #, elixir-autogen, elixir-format
 msgid "Filter students records by type"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:91
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:103
 #, elixir-autogen, elixir-format
 msgid "Time"
 msgstr ""
@@ -2936,14 +2936,14 @@ msgstr ""
 msgid "Subcycle"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:94
+#: lib/lanttern_web/live/pages/school/students_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "1 student not linked to any class"
 msgid_plural "%{count} students not linked to any class"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:18
+#: lib/lanttern_web/live/pages/school/students_component.ex:20
 #, elixir-autogen, elixir-format
 msgid "Showing 1 student in"
 msgid_plural "Showing %{count} students in"
@@ -2955,7 +2955,7 @@ msgstr[1] ""
 msgid "Add class"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:42
+#: lib/lanttern_web/live/pages/school/students_component.ex:44
 #, elixir-autogen, elixir-format
 msgid "Add student"
 msgstr ""
@@ -2993,19 +2993,19 @@ msgstr ""
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:29
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:75
-#: lib/lanttern_web/live/pages/school/students_component.ex:75
-#: lib/lanttern_web/live/pages/school/students_component.ex:106
-#: lib/lanttern_web/live/pages/school/students_component.ex:305
+#: lib/lanttern_web/live/pages/school/students_component.ex:77
+#: lib/lanttern_web/live/pages/school/students_component.ex:109
+#: lib/lanttern_web/live/pages/school/students_component.ex:318
 #, elixir-autogen, elixir-format
 msgid "Edit student"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:120
+#: lib/lanttern_web/live/pages/school/students_component.ex:123
 #, elixir-autogen, elixir-format
 msgid "Filter students by class"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:297
+#: lib/lanttern_web/live/pages/school/students_component.ex:310
 #, elixir-autogen, elixir-format
 msgid "New student"
 msgstr ""
@@ -3020,24 +3020,24 @@ msgstr ""
 msgid "No students added to this class"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:52
+#: lib/lanttern_web/live/pages/school/students_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "No students found for selected filters."
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:150
+#: lib/lanttern_web/live/pages/school/students_component.ex:153
 #, elixir-autogen, elixir-format
 msgid "Student created successfully"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.ex:112
-#: lib/lanttern_web/live/pages/school/students_component.ex:202
+#: lib/lanttern_web/live/pages/school/students_component.ex:205
 #, elixir-autogen, elixir-format
 msgid "Student deleted successfully"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.ex:103
-#: lib/lanttern_web/live/pages/school/students_component.ex:183
+#: lib/lanttern_web/live/pages/school/students_component.ex:186
 #, elixir-autogen, elixir-format
 msgid "Student updated successfully"
 msgstr ""
@@ -3047,7 +3047,8 @@ msgstr ""
 msgid "Students in this class"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:33
+#: lib/lanttern_web/live/pages/school/students_component.ex:35
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "all classes"
 msgstr ""
@@ -3057,7 +3058,7 @@ msgstr ""
 msgid "\"A rubric is a coherent set of criteria for students' work that includes descriptions of levels of performance quality on the criteria.\""
 msgstr ""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:62
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "%{cycle} cycle classes"
 msgstr ""
@@ -3372,7 +3373,7 @@ msgstr ""
 msgid "No grades report linked to student"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:59
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:48
 #, elixir-autogen, elixir-format
 msgid "No linked classes"
 msgstr ""
@@ -3409,7 +3410,7 @@ msgstr ""
 msgid "Only starred"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:77
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:66
 #, elixir-autogen, elixir-format
 msgid "Other cycle classes"
 msgstr ""
@@ -3435,7 +3436,7 @@ msgstr ""
 msgid "Rubric deleted"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:48
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:50
 #, elixir-autogen, elixir-format
 msgid "Search all school classes"
 msgstr ""
@@ -3533,11 +3534,6 @@ msgstr ""
 msgid "Strands library"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:37
-#, elixir-autogen, elixir-format
-msgid "Student record of"
-msgstr ""
-
 #: lib/lanttern_web/live/pages/strands/moment/id/cards_component.ex:18
 #, elixir-autogen, elixir-format
 msgid "Use cards to add an extra layer of organization to moments"
@@ -3562,3 +3558,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Link strand to report"
 msgstr ""
+
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:188
+#, elixir-autogen, elixir-format
+msgid "Filter students records by class"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 5caf28ad..73e47035 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -11,9 +11,9 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/lanttern_web/components/core_components.ex:729
-#: lib/lanttern_web/components/core_components.ex:1665
-#: lib/lanttern_web/components/core_components.ex:1727
+#: lib/lanttern_web/components/core_components.ex:735
+#: lib/lanttern_web/components/core_components.ex:1671
+#: lib/lanttern_web/components/core_components.ex:1733
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
 msgid "Strands"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:860
+#: lib/lanttern_web/components/core_components.ex:866
 #: lib/lanttern_web/components/overlay_components.ex:78
 #: lib/lanttern_web/components/overlay_components.ex:334
 #, elixir-autogen, elixir-format
@@ -85,19 +85,17 @@ msgstr ""
 msgid "You're logged in as"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:53
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:67
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:58
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:33
 #: lib/lanttern_web/live/shared/filters/inline_filters_component.ex:33
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Apply filters"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:51
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:65
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:56
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:31
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:63
 #, elixir-autogen, elixir-format
 msgid "Applying filters..."
 msgstr ""
@@ -124,26 +122,24 @@ msgstr ""
 #: lib/lanttern_web/live/shared/assessments/entry_details_component.ex:269
 #: lib/lanttern_web/live/shared/attachments/attachment_area_component.ex:93
 #: lib/lanttern_web/live/shared/attachments/attachment_area_component.ex:126
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:45
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:59
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:50
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:25
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:57
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_entry_overlay_component.ex:64
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_final_entry_overlay_component.ex:66
 #: lib/lanttern_web/live/shared/notes/note_component.ex:60
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:51
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:113
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:58
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:104
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:131
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:71
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:143
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:41
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:55
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:46
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:21
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Clear filters"
 msgstr ""
@@ -186,8 +182,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:53
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:116
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:61
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:107
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:134
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:74
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
@@ -217,7 +213,7 @@ msgstr ""
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:51
 #: lib/lanttern_web/live/shared/reporting/report_card_form_component.ex:62
 #: lib/lanttern_web/live/shared/reporting/strand_report_form_component.ex:55
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:108
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:120
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -227,7 +223,7 @@ msgstr ""
 msgid "File \"%{file}\" is invalid."
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:56
+#: lib/lanttern_web/live/pages/school/students_component.ex:58
 #: lib/lanttern_web/live/shared/curricula/curriculum_item_form_component.ex:33
 #: lib/lanttern_web/live/shared/grades_reports/grades_report_form_component.ex:31
 #: lib/lanttern_web/live/shared/learning_context/moment_card_form_component.ex:39
@@ -235,8 +231,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:35
 #: lib/lanttern_web/live/shared/reporting/report_card_form_component.ex:55
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:34
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:41
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:100
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:44
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:112
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -259,8 +255,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:27
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:29
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:26
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:36
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:29
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:39
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:31
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
@@ -329,17 +325,17 @@ msgstr ""
 msgid "or drag and drop here"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:899
+#: lib/lanttern_web/components/core_components.ex:905
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:890
+#: lib/lanttern_web/components/core_components.ex:896
 #, elixir-autogen, elixir-format
 msgid "Error!"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:911
+#: lib/lanttern_web/components/core_components.ex:917
 #, elixir-autogen, elixir-format
 msgid "Hang in there while we get back on track"
 msgstr ""
@@ -349,17 +345,17 @@ msgstr ""
 msgid "Markdown supported"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:889
+#: lib/lanttern_web/components/core_components.ex:895
 #, elixir-autogen, elixir-format
 msgid "Success!"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:894
+#: lib/lanttern_web/components/core_components.ex:900
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:906
+#: lib/lanttern_web/components/core_components.ex:912
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr ""
@@ -399,8 +395,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_final_entry_overlay_component.ex:57
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:108
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:53
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:99
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:122
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:66
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:134
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
@@ -463,8 +459,8 @@ msgstr ""
 #: lib/lanttern_web/live/shared/notes/note_component.ex:53
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:106
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:51
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:97
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:120
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:64
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:132
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -495,7 +491,7 @@ msgid "Differentiation for %{name}"
 msgstr ""
 
 #: lib/lanttern_web/components/attachments_components.ex:112
-#: lib/lanttern_web/components/core_components.ex:1227
+#: lib/lanttern_web/components/core_components.ex:1233
 #: lib/lanttern_web/components/learning_context_components.ex:55
 #: lib/lanttern_web/live/pages/grades_report/grades_reports_live.html.heex:44
 #: lib/lanttern_web/live/pages/grades_report/id/grades_report_live.html.heex:39
@@ -541,7 +537,7 @@ msgstr ""
 msgid "Rubric"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:78
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:67
 #, elixir-autogen, elixir-format
 msgid "Select a class"
 msgstr ""
@@ -788,7 +784,7 @@ msgstr ""
 msgid "Moments"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:1615
+#: lib/lanttern_web/components/core_components.ex:1621
 #, elixir-autogen, elixir-format
 msgid "Move moment down"
 msgstr ""
@@ -1267,7 +1263,7 @@ msgstr ""
 msgid "Move down"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:1605
+#: lib/lanttern_web/components/core_components.ex:1611
 #: lib/lanttern_web/live/shared/grading/grade_composition_overlay_component.ex:154
 #, elixir-autogen, elixir-format
 msgid "Move up"
@@ -1375,8 +1371,8 @@ msgid "Recalculate grade"
 msgstr ""
 
 #: lib/lanttern_web/components/attachments_components.ex:117
-#: lib/lanttern_web/components/core_components.ex:172
-#: lib/lanttern_web/components/core_components.ex:1290
+#: lib/lanttern_web/components/core_components.ex:174
+#: lib/lanttern_web/components/core_components.ex:1296
 #: lib/lanttern_web/live/shared/grading/grade_composition_overlay_component.ex:183
 #, elixir-autogen, elixir-format
 msgid "Remove"
@@ -1541,8 +1537,9 @@ msgid "Student report card deleted"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/report_cards/id/report_card_live.html.heex:14
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:78
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:36
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:41
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:89
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:38
 #, elixir-autogen, elixir-format
 msgid "Students"
 msgstr ""
@@ -1571,7 +1568,7 @@ msgid "The parent cycle grade is calculated based on it's children cycles. E.g.
 msgstr ""
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:15
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:100
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:130
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:42
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -1612,7 +1609,7 @@ msgid "all years"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/curriculum/component/id/curriculum_component_live.html.heex:23
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:34
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "and"
 msgstr ""
@@ -1787,8 +1784,8 @@ msgstr ""
 msgid "Hey!"
 msgstr ""
 
-#: lib/lanttern_web/components/core_components.ex:1348
-#: lib/lanttern_web/components/core_components.ex:1370
+#: lib/lanttern_web/components/core_components.ex:1354
+#: lib/lanttern_web/components/core_components.ex:1376
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Selected"
 msgstr ""
@@ -2587,8 +2584,11 @@ msgstr ""
 
 #: lib/lanttern_web/live/pages/school/school_live.html.heex:8
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:36
-#: lib/lanttern_web/live/pages/school/students_component.ex:61
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:46
+#: lib/lanttern_web/live/pages/school/students_component.ex:63
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:55
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:105
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:51
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Classes"
 msgstr ""
@@ -2643,25 +2643,25 @@ msgstr ""
 msgid "All strand evidences"
 msgstr ""
 
-#: lib/lanttern/students_records/student_record.ex:80
+#: lib/lanttern/students_records/student_record.ex:91
 #, elixir-autogen, elixir-format
 msgid "At least 1 student is required"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:66
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:84
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:77
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:96
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:55
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:123
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:189
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:73
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:153
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:230
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit student record"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:141
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "Filter records by student"
 msgstr ""
@@ -2671,80 +2671,80 @@ msgstr ""
 msgid "Invalid permissions"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:132
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:163
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Load more records"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:52
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:190
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:63
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:231
 #, elixir-autogen, elixir-format
 msgid "New student record"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:63
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "No students records found for selected filters."
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:92
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Record"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:52
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Record type"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:21
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:111
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:68
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:141
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Status"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:209
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:245
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Student record created successfully"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:81
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:227
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:89
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:263
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Student record deleted successfully"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:34
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:42
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Student record details"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:72
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:218
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:80
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:254
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Student record updated successfully"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:2
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:24
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:28
 #: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:3
 #: lib/lanttern_web/live/shared/menu_component.ex:425
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Students records"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:148
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:180
 #, elixir-autogen, elixir-format
 msgid "Type the name of the student"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:44
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "all statuses"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:32
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "all student record types"
 msgstr ""
@@ -2754,17 +2754,17 @@ msgstr ""
 msgid "all students"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:168
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:209
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Filter students records by status"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:154
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:195
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Filter students records by type"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:91
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:103
 #, elixir-autogen, elixir-format
 msgid "Time"
 msgstr ""
@@ -2936,14 +2936,14 @@ msgstr ""
 msgid "Subcycle"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:94
+#: lib/lanttern_web/live/pages/school/students_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "1 student not linked to any class"
 msgid_plural "%{count} students not linked to any class"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:18
+#: lib/lanttern_web/live/pages/school/students_component.ex:20
 #, elixir-autogen, elixir-format
 msgid "Showing 1 student in"
 msgid_plural "Showing %{count} students in"
@@ -2955,7 +2955,7 @@ msgstr[1] ""
 msgid "Add class"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:42
+#: lib/lanttern_web/live/pages/school/students_component.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Add student"
 msgstr ""
@@ -2993,19 +2993,19 @@ msgstr ""
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:29
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:75
-#: lib/lanttern_web/live/pages/school/students_component.ex:75
-#: lib/lanttern_web/live/pages/school/students_component.ex:106
-#: lib/lanttern_web/live/pages/school/students_component.ex:305
+#: lib/lanttern_web/live/pages/school/students_component.ex:77
+#: lib/lanttern_web/live/pages/school/students_component.ex:109
+#: lib/lanttern_web/live/pages/school/students_component.ex:318
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit student"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:120
+#: lib/lanttern_web/live/pages/school/students_component.ex:123
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Filter students by class"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:297
+#: lib/lanttern_web/live/pages/school/students_component.ex:310
 #, elixir-autogen, elixir-format, fuzzy
 msgid "New student"
 msgstr ""
@@ -3020,24 +3020,24 @@ msgstr ""
 msgid "No students added to this class"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:52
+#: lib/lanttern_web/live/pages/school/students_component.ex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No students found for selected filters."
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:150
+#: lib/lanttern_web/live/pages/school/students_component.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Student created successfully"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.ex:112
-#: lib/lanttern_web/live/pages/school/students_component.ex:202
+#: lib/lanttern_web/live/pages/school/students_component.ex:205
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Student deleted successfully"
 msgstr ""
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.ex:103
-#: lib/lanttern_web/live/pages/school/students_component.ex:183
+#: lib/lanttern_web/live/pages/school/students_component.ex:186
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Student updated successfully"
 msgstr ""
@@ -3047,7 +3047,8 @@ msgstr ""
 msgid "Students in this class"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:33
+#: lib/lanttern_web/live/pages/school/students_component.ex:35
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:32
 #, elixir-autogen, elixir-format, fuzzy
 msgid "all classes"
 msgstr ""
@@ -3057,7 +3058,7 @@ msgstr ""
 msgid "\"A rubric is a coherent set of criteria for students' work that includes descriptions of levels of performance quality on the criteria.\""
 msgstr ""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:62
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "%{cycle} cycle classes"
 msgstr ""
@@ -3372,7 +3373,7 @@ msgstr ""
 msgid "No grades report linked to student"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:59
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:48
 #, elixir-autogen, elixir-format
 msgid "No linked classes"
 msgstr ""
@@ -3409,7 +3410,7 @@ msgstr ""
 msgid "Only starred"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:77
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:66
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Other cycle classes"
 msgstr ""
@@ -3435,7 +3436,7 @@ msgstr ""
 msgid "Rubric deleted"
 msgstr ""
 
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:48
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:50
 #, elixir-autogen, elixir-format
 msgid "Search all school classes"
 msgstr ""
@@ -3533,11 +3534,6 @@ msgstr ""
 msgid "Strands library"
 msgstr ""
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:37
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Student record of"
-msgstr ""
-
 #: lib/lanttern_web/live/pages/strands/moment/id/cards_component.ex:18
 #, elixir-autogen, elixir-format
 msgid "Use cards to add an extra layer of organization to moments"
@@ -3562,3 +3558,8 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Link strand to report"
 msgstr ""
+
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:188
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Filter students records by class"
+msgstr ""
diff --git a/priv/gettext/pt_BR/LC_MESSAGES/default.po b/priv/gettext/pt_BR/LC_MESSAGES/default.po
index 999ca8c4..c27beab4 100644
--- a/priv/gettext/pt_BR/LC_MESSAGES/default.po
+++ b/priv/gettext/pt_BR/LC_MESSAGES/default.po
@@ -11,9 +11,9 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#: lib/lanttern_web/components/core_components.ex:729
-#: lib/lanttern_web/components/core_components.ex:1665
-#: lib/lanttern_web/components/core_components.ex:1727
+#: lib/lanttern_web/components/core_components.ex:735
+#: lib/lanttern_web/components/core_components.ex:1671
+#: lib/lanttern_web/components/core_components.ex:1733
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr "Ações"
@@ -62,7 +62,7 @@ msgstr "Escola"
 msgid "Strands"
 msgstr "Trilhas"
 
-#: lib/lanttern_web/components/core_components.ex:860
+#: lib/lanttern_web/components/core_components.ex:866
 #: lib/lanttern_web/components/overlay_components.ex:78
 #: lib/lanttern_web/components/overlay_components.ex:334
 #, elixir-autogen, elixir-format
@@ -85,19 +85,17 @@ msgstr "Sair"
 msgid "You're logged in as"
 msgstr "Você está acessando como"
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:53
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:67
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:58
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:33
 #: lib/lanttern_web/live/shared/filters/inline_filters_component.ex:33
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Apply filters"
 msgstr "Aplicar filtros"
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:51
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:65
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:56
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:31
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:63
 #, elixir-autogen, elixir-format
 msgid "Applying filters..."
 msgstr "Aplicando filtros..."
@@ -124,26 +122,24 @@ msgstr "Aplicando filtros..."
 #: lib/lanttern_web/live/shared/assessments/entry_details_component.ex:269
 #: lib/lanttern_web/live/shared/attachments/attachment_area_component.ex:93
 #: lib/lanttern_web/live/shared/attachments/attachment_area_component.ex:126
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:45
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:59
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:50
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:25
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:57
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_entry_overlay_component.ex:64
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_final_entry_overlay_component.ex:66
 #: lib/lanttern_web/live/shared/notes/note_component.ex:60
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:51
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:113
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:58
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:104
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:131
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:71
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:143
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:41
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:55
 #: lib/lanttern_web/live/shared/filters/cycles_filter_overlay_component.ex:46
 #: lib/lanttern_web/live/shared/filters/filters_overlay_component.ex:21
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Clear filters"
 msgstr "Limpar filtros"
@@ -186,8 +182,8 @@ msgstr "Nova trilha"
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:53
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:116
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:61
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:107
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:134
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:74
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr "Salvar"
@@ -217,7 +213,7 @@ msgstr "Suas trilhas favoritas"
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:51
 #: lib/lanttern_web/live/shared/reporting/report_card_form_component.ex:62
 #: lib/lanttern_web/live/shared/reporting/strand_report_form_component.ex:55
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:108
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:120
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Descrição"
@@ -227,7 +223,7 @@ msgstr "Descrição"
 msgid "File \"%{file}\" is invalid."
 msgstr "O arquivo \"%{file}\" é inválido."
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:56
+#: lib/lanttern_web/live/pages/school/students_component.ex:58
 #: lib/lanttern_web/live/shared/curricula/curriculum_item_form_component.ex:33
 #: lib/lanttern_web/live/shared/grades_reports/grades_report_form_component.ex:31
 #: lib/lanttern_web/live/shared/learning_context/moment_card_form_component.ex:39
@@ -235,8 +231,8 @@ msgstr "O arquivo \"%{file}\" é inválido."
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:35
 #: lib/lanttern_web/live/shared/reporting/report_card_form_component.ex:55
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:34
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:41
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:100
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:44
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:112
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr "Nome"
@@ -259,8 +255,8 @@ msgstr "Nenhum ano selecionado"
 #: lib/lanttern_web/live/shared/rubrics/rubric_form_component.ex:27
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:29
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:26
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:36
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:29
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:39
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:31
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr "Oops, algo deu errado! Por favor, confira os erros abaixo."
@@ -329,17 +325,17 @@ msgstr "cancelar"
 msgid "or drag and drop here"
 msgstr "ou arraste e solte aqui"
 
-#: lib/lanttern_web/components/core_components.ex:899
+#: lib/lanttern_web/components/core_components.ex:905
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr "Tentando reconectar"
 
-#: lib/lanttern_web/components/core_components.ex:890
+#: lib/lanttern_web/components/core_components.ex:896
 #, elixir-autogen, elixir-format
 msgid "Error!"
 msgstr "Erro!"
 
-#: lib/lanttern_web/components/core_components.ex:911
+#: lib/lanttern_web/components/core_components.ex:917
 #, elixir-autogen, elixir-format
 msgid "Hang in there while we get back on track"
 msgstr "Aguente firme enquanto nos reconectamos"
@@ -349,17 +345,17 @@ msgstr "Aguente firme enquanto nos reconectamos"
 msgid "Markdown supported"
 msgstr "Suporta Markdown"
 
-#: lib/lanttern_web/components/core_components.ex:889
+#: lib/lanttern_web/components/core_components.ex:895
 #, elixir-autogen, elixir-format
 msgid "Success!"
 msgstr "Sucesso!"
 
-#: lib/lanttern_web/components/core_components.ex:894
+#: lib/lanttern_web/components/core_components.ex:900
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr "Não conseguimos nos conectar"
 
-#: lib/lanttern_web/components/core_components.ex:906
+#: lib/lanttern_web/components/core_components.ex:912
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr "Algo deu errado!"
@@ -399,8 +395,8 @@ msgstr "Não foi possível encontrar a trilha"
 #: lib/lanttern_web/live/shared/grades_reports/student_grades_report_final_entry_overlay_component.ex:57
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:108
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:53
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:99
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:122
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:66
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:134
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Deletar"
@@ -463,8 +459,8 @@ msgstr "Adicione suas anotações..."
 #: lib/lanttern_web/live/shared/notes/note_component.ex:53
 #: lib/lanttern_web/live/shared/schools/class_form_overlay_component.ex:106
 #: lib/lanttern_web/live/shared/schools/cycle_form_overlay_component.ex:51
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:97
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:120
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:64
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:132
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
@@ -495,7 +491,7 @@ msgid "Differentiation for %{name}"
 msgstr "Diferenciação para %{name}"
 
 #: lib/lanttern_web/components/attachments_components.ex:112
-#: lib/lanttern_web/components/core_components.ex:1227
+#: lib/lanttern_web/components/core_components.ex:1233
 #: lib/lanttern_web/components/learning_context_components.ex:55
 #: lib/lanttern_web/live/pages/grades_report/grades_reports_live.html.heex:44
 #: lib/lanttern_web/live/pages/grades_report/id/grades_report_live.html.heex:39
@@ -541,7 +537,7 @@ msgstr "Reordenar"
 msgid "Rubric"
 msgstr "Rubrica"
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:78
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:67
 #, elixir-autogen, elixir-format
 msgid "Select a class"
 msgstr "Selecione uma turma"
@@ -788,7 +784,7 @@ msgstr "Momento atualizado com sucesso"
 msgid "Moments"
 msgstr "Momentos"
 
-#: lib/lanttern_web/components/core_components.ex:1615
+#: lib/lanttern_web/components/core_components.ex:1621
 #, elixir-autogen, elixir-format
 msgid "Move moment down"
 msgstr "Mover momento para baixo"
@@ -1267,7 +1263,7 @@ msgstr "Card de momento atualizado com sucesso"
 msgid "Move down"
 msgstr "Mover para baixo"
 
-#: lib/lanttern_web/components/core_components.ex:1605
+#: lib/lanttern_web/components/core_components.ex:1611
 #: lib/lanttern_web/live/shared/grading/grade_composition_overlay_component.ex:154
 #, elixir-autogen, elixir-format
 msgid "Move up"
@@ -1375,8 +1371,8 @@ msgid "Recalculate grade"
 msgstr "Recalcular nota"
 
 #: lib/lanttern_web/components/attachments_components.ex:117
-#: lib/lanttern_web/components/core_components.ex:172
-#: lib/lanttern_web/components/core_components.ex:1290
+#: lib/lanttern_web/components/core_components.ex:174
+#: lib/lanttern_web/components/core_components.ex:1296
 #: lib/lanttern_web/live/shared/grading/grade_composition_overlay_component.ex:183
 #, elixir-autogen, elixir-format
 msgid "Remove"
@@ -1541,8 +1537,9 @@ msgid "Student report card deleted"
 msgstr "Report card de estudante deletado"
 
 #: lib/lanttern_web/live/pages/report_cards/id/report_card_live.html.heex:14
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:78
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:36
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:41
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:89
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:38
 #, elixir-autogen, elixir-format
 msgid "Students"
 msgstr "Estudantes"
@@ -1571,7 +1568,7 @@ msgid "The parent cycle grade is calculated based on it's children cycles. E.g.
 msgstr "A nota do ciclo pai é calculada com baseem seus sub ciclos. Ex: a nota de 2024 é baseada nas notas de 2024 1º, 2º, 3º e 4º bi."
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:15
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:100
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:130
 #: lib/lanttern_web/live/shared/learning_context/strand_form_component.ex:42
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -1612,7 +1609,7 @@ msgid "all years"
 msgstr "todos os anos"
 
 #: lib/lanttern_web/live/pages/curriculum/component/id/curriculum_component_live.html.heex:23
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:34
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "and"
 msgstr "e"
@@ -1787,8 +1784,8 @@ msgstr "Limpar seleção"
 msgid "Hey!"
 msgstr "Olá!"
 
-#: lib/lanttern_web/components/core_components.ex:1348
-#: lib/lanttern_web/components/core_components.ex:1370
+#: lib/lanttern_web/components/core_components.ex:1354
+#: lib/lanttern_web/components/core_components.ex:1376
 #, elixir-autogen, elixir-format
 msgid "Selected"
 msgstr "Selecionado"
@@ -2587,8 +2584,11 @@ msgstr "Sem avaliação do professor"
 
 #: lib/lanttern_web/live/pages/school/school_live.html.heex:8
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:36
-#: lib/lanttern_web/live/pages/school/students_component.ex:61
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:46
+#: lib/lanttern_web/live/pages/school/students_component.ex:63
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:55
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:105
+#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:51
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Classes"
 msgstr "Turmas"
@@ -2643,25 +2643,25 @@ msgstr "Possui evidências de aprendizagem"
 msgid "All strand evidences"
 msgstr "Todas as evidências da trilha"
 
-#: lib/lanttern/students_records/student_record.ex:80
+#: lib/lanttern/students_records/student_record.ex:91
 #, elixir-autogen, elixir-format
 msgid "At least 1 student is required"
 msgstr "Obrigatório vincular ao menos 1 estudante"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:66
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:84
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:77
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:96
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr "Data"
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:55
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:123
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:189
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:73
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:153
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:230
 #, elixir-autogen, elixir-format
 msgid "Edit student record"
 msgstr "Editar registro de estudante"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:141
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "Filter records by student"
 msgstr "Filtrar registros por estudante"
@@ -2671,80 +2671,80 @@ msgstr "Filtrar registros por estudante"
 msgid "Invalid permissions"
 msgstr "Permissões inválidas"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:132
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:163
 #, elixir-autogen, elixir-format
 msgid "Load more records"
 msgstr "Carregar mais registros"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:52
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:190
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:63
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:231
 #, elixir-autogen, elixir-format
 msgid "New student record"
 msgstr "Novo registro de estudante"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:63
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "No students records found for selected filters."
 msgstr "Nenhum registro de estudante encontrado para os filtros selecionados."
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:92
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:122
 #, elixir-autogen, elixir-format
 msgid "Record"
 msgstr "Registro"
 
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:52
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Record type"
 msgstr "Tipo de registro"
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:21
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:111
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:68
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:141
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Status"
 msgstr "Status"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:209
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:245
 #, elixir-autogen, elixir-format
 msgid "Student record created successfully"
 msgstr "Registro de estudante criado com sucesso"
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:81
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:227
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:89
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:263
 #, elixir-autogen, elixir-format
 msgid "Student record deleted successfully"
 msgstr "Registro de estudante deletado com sucesso"
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:34
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:42
 #, elixir-autogen, elixir-format
 msgid "Student record details"
 msgstr "Detalhe do registro de estudante"
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:72
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:218
+#: lib/lanttern_web/live/pages/students_records/id/student_record_live.ex:80
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:254
 #, elixir-autogen, elixir-format
 msgid "Student record updated successfully"
 msgstr "Registro de estudante atualizado com sucesso"
 
 #: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:2
-#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:24
+#: lib/lanttern_web/live/pages/students_records/students_records_live.ex:28
 #: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:3
 #: lib/lanttern_web/live/shared/menu_component.ex:425
 #, elixir-autogen, elixir-format
 msgid "Students records"
 msgstr "Registros de estudantes"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:148
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:180
 #, elixir-autogen, elixir-format
 msgid "Type the name of the student"
 msgstr "Digite o nome do estudante"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:44
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "all statuses"
 msgstr "todos os status"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:32
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "all student record types"
 msgstr "todos os tipos de registro de estudante"
@@ -2754,17 +2754,17 @@ msgstr "todos os tipos de registro de estudante"
 msgid "all students"
 msgstr "todos estudantes"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:168
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:209
 #, elixir-autogen, elixir-format
 msgid "Filter students records by status"
 msgstr "Filtrar registros de estudantes por status"
 
-#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:154
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:195
 #, elixir-autogen, elixir-format
 msgid "Filter students records by type"
 msgstr "Filtrar registros de estudantes por tipo"
 
-#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:91
+#: lib/lanttern_web/live/shared/students_records/student_record_form_overlay_component.ex:103
 #, elixir-autogen, elixir-format
 msgid "Time"
 msgstr "Horário"
@@ -2936,14 +2936,14 @@ msgstr "Valores normalizados são utilizados para calcular notas finais — quan
 msgid "Subcycle"
 msgstr "Subciclo"
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:94
+#: lib/lanttern_web/live/pages/school/students_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "1 student not linked to any class"
 msgid_plural "%{count} students not linked to any class"
 msgstr[0] "1 estudante não vinculado a nenhuma turma"
 msgstr[1] "%{count} estudantes não vinculados a nenhuma turma"
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:18
+#: lib/lanttern_web/live/pages/school/students_component.ex:20
 #, elixir-autogen, elixir-format
 msgid "Showing 1 student in"
 msgid_plural "Showing %{count} students in"
@@ -2955,7 +2955,7 @@ msgstr[1] "Exibindo %{count} estudantes em"
 msgid "Add class"
 msgstr "Adicionar turma"
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:42
+#: lib/lanttern_web/live/pages/school/students_component.ex:44
 #, elixir-autogen, elixir-format
 msgid "Add student"
 msgstr "Adicionar estudante"
@@ -2993,19 +2993,19 @@ msgstr "Editar turma"
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:29
 #: lib/lanttern_web/live/pages/school/students/id/student_live.html.heex:75
-#: lib/lanttern_web/live/pages/school/students_component.ex:75
-#: lib/lanttern_web/live/pages/school/students_component.ex:106
-#: lib/lanttern_web/live/pages/school/students_component.ex:305
+#: lib/lanttern_web/live/pages/school/students_component.ex:77
+#: lib/lanttern_web/live/pages/school/students_component.ex:109
+#: lib/lanttern_web/live/pages/school/students_component.ex:318
 #, elixir-autogen, elixir-format
 msgid "Edit student"
 msgstr "Editar estudante"
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:120
+#: lib/lanttern_web/live/pages/school/students_component.ex:123
 #, elixir-autogen, elixir-format
 msgid "Filter students by class"
 msgstr "Filtrar estudantes por turma"
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:297
+#: lib/lanttern_web/live/pages/school/students_component.ex:310
 #, elixir-autogen, elixir-format
 msgid "New student"
 msgstr "Novo estudante"
@@ -3020,24 +3020,24 @@ msgstr "Nenhuma turma correspondente aos filtros selecionados"
 msgid "No students added to this class"
 msgstr "Nenhum estudante adicionado à esta turma"
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:52
+#: lib/lanttern_web/live/pages/school/students_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "No students found for selected filters."
 msgstr "Nenhum estudante encontrado para os filtros selecionados."
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:150
+#: lib/lanttern_web/live/pages/school/students_component.ex:153
 #, elixir-autogen, elixir-format
 msgid "Student created successfully"
 msgstr "Estudante criado com sucesso"
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.ex:112
-#: lib/lanttern_web/live/pages/school/students_component.ex:202
+#: lib/lanttern_web/live/pages/school/students_component.ex:205
 #, elixir-autogen, elixir-format
 msgid "Student deleted successfully"
 msgstr "Estudante deletado com sucesso"
 
 #: lib/lanttern_web/live/pages/school/students/id/student_live.ex:103
-#: lib/lanttern_web/live/pages/school/students_component.ex:183
+#: lib/lanttern_web/live/pages/school/students_component.ex:186
 #, elixir-autogen, elixir-format
 msgid "Student updated successfully"
 msgstr "Estudante atualizado com sucesso"
@@ -3047,7 +3047,8 @@ msgstr "Estudante atualizado com sucesso"
 msgid "Students in this class"
 msgstr "Estudantes nesta turma"
 
-#: lib/lanttern_web/live/pages/school/students_component.ex:33
+#: lib/lanttern_web/live/pages/school/students_component.ex:35
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "all classes"
 msgstr "todas as turmas"
@@ -3057,7 +3058,7 @@ msgstr "todas as turmas"
 msgid "\"A rubric is a coherent set of criteria for students' work that includes descriptions of levels of performance quality on the criteria.\""
 msgstr "\"A rubrica é um conjunto de critérios coerentes em relação ao trabalho de estudantes, que incluem descritores dos niveis de qualidade de performance para os critérios.\""
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:62
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "%{cycle} cycle classes"
 msgstr "Turmas do ciclo %{cycle}"
@@ -3372,7 +3373,7 @@ msgstr "Nenhum ciclo registrado"
 msgid "No grades report linked to student"
 msgstr "Nennhum relatório de notas vinculado ao estudante"
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:59
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:48
 #, elixir-autogen, elixir-format
 msgid "No linked classes"
 msgstr "Nenhuma turma vinculada"
@@ -3409,7 +3410,7 @@ msgstr "Nenhum report card de estudante criado no ciclo selecionado ainda."
 msgid "Only starred"
 msgstr "Somente favoritos"
 
-#: lib/lanttern_web/live/shared/schools/student_form_overlay_component.ex:77
+#: lib/lanttern_web/live/shared/schools/classes_field_component.ex:66
 #, elixir-autogen, elixir-format
 msgid "Other cycle classes"
 msgstr "Turmas de outros ciclos"
@@ -3435,7 +3436,7 @@ msgstr "Imagem de capa do report card"
 msgid "Rubric deleted"
 msgstr "Rubrica deletada"
 
-#: lib/lanttern_web/live/shared/filters/strand_classes_filter_overlay_component.ex:48
+#: lib/lanttern_web/live/shared/filters/classes_filter_overlay_component.ex:50
 #, elixir-autogen, elixir-format
 msgid "Search all school classes"
 msgstr "Buscar todas as turmas da escola"
@@ -3533,11 +3534,6 @@ msgstr "Trilha sem imagem de capa"
 msgid "Strands library"
 msgstr "Biblioteca de trilhas"
 
-#: lib/lanttern_web/live/pages/students_records/id/student_record_live.html.heex:37
-#, elixir-autogen, elixir-format
-msgid "Student record of"
-msgstr "Registro de estudante de"
-
 #: lib/lanttern_web/live/pages/strands/moment/id/cards_component.ex:18
 #, elixir-autogen, elixir-format
 msgid "Use cards to add an extra layer of organization to moments"
@@ -3562,3 +3558,8 @@ msgstr "turmas"
 #, elixir-autogen, elixir-format
 msgid "Link strand to report"
 msgstr "Vincular trilha ao report"
+
+#: lib/lanttern_web/live/pages/students_records/students_records_live.html.heex:188
+#, elixir-autogen, elixir-format
+msgid "Filter students records by class"
+msgstr "Filtrar registros de estudantes por turma"