Skip to content

Mostrar el progreso de los créditos de cada grupo en el planner #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rodrigogordienko wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Mostrar el progreso de los créditos de cada grupo en el planner #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e2acfc
Implement credit calculation and display for subject groups in subjec…
rodrigogordienko Jan 14, 2026
dacb1f7
Fix Rubocop warning.
rodrigogordienko Jan 14, 2026
bb785f8
Fix lint error.
rodrigogordienko Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions app/controllers/subject_plans_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,24 @@ def set_planned_and_not_planned_subjects
.ordered_by_category
.ordered_by_short_or_full_name
.load

# Calculate credits only from planned subjects (those positioned in semesters)
planned_credits_by_group = @planned_subjects
.group_by(&:group_id)
.transform_values { |subjects| subjects.sum(&:credits) }

@groups_and_credits = current_degree.subject_groups.find_each.map do |subject_group|
credits = planned_credits_by_group[subject_group.id] || 0
{
subject_group:,
credits:,
credits_needed_reached: credits >= subject_group.credits_needed,
}
end
@groups_and_credits.sort_by! { |group_and_credits| group_and_credits[:subject_group].name }
Comment on lines +57 to +70
Copy link
Copy Markdown
Collaborator

@santiagorodriguez96 santiagorodriguez96 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No es un blocker pero me pregunto si habrá una forma prolija de reutilizar la lógica que ya tenemos para calcular los créditos que se tienen y que se precisan de cada grupo


@all_group_credits_met = @groups_and_credits.all? { |group_and_credits| group_and_credits[:credits_needed_reached] }
@total_credits = @groups_and_credits.pluck(:credits).sum
end

def subject_plan_params
Expand Down
4 changes: 4 additions & 0 deletions app/views/subject_plans/update.turbo_stream.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
<%= turbo_stream.replace "not-planned-subjects", method: :morph do %>
<%= render "subjects/not_planned_subjects_list", subjects: @not_planned_approved_subjects %>
<% end %>

<%= turbo_stream.replace "groups-credits", method: :morph do %>
<%= render "subjects/groups_credits_list", groups_and_credits: @groups_and_credits, all_group_credits_met: @all_group_credits_met, total_credits: @total_credits %>
<% end %>
<% end %>

<% @semesters_to_refresh.each do |semester| %>
Expand Down
23 changes: 23 additions & 0 deletions app/views/subjects/_groups_credits_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<div id="groups-credits">
<% if groups_and_credits.any? %>
<div data-controller="collapsible" class="bg-white rounded-lg border border-gray-100 shadow-sm">
<a data-action="click->collapsible#toggle" class="flex items-center h-10 px-4 bg-gray-50 rounded-lg cursor-pointer">
<span class="material-icons pr-2" data-collapsible-target="button" data-turbo-permanent>chevron_right</span>
<span class="flex-1 text-sm font-bold">Créditos planificados por grupo</span>
</a>

<ul class="hidden divide-y divide-gray-200" data-collapsible-target="collapsible" data-action="turbo:before-morph-attribute->collapsible#preventToggle">
<% groups_and_credits.each do |group| %>
<li>
<%= link_to subject_group_path(group[:subject_group]), class: "flex items-center justify-between px-4 py-3 hover:bg-gray-50 gap-4" do %>
<span class="text-sm text-gray-900"><%= group[:subject_group].name %></span>
<span class="text-sm <%= group[:credits_needed_reached] ? "font-bold" : "" %>">
<%= group[:credits] %> / <%= group[:subject_group].credits_needed %>
</span>
<% end %>
</li>
<% end %>
</ul>
</div>
<% end %>
</div>
2 changes: 2 additions & 0 deletions app/views/subjects/_planned_subjects_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<%= render partial: "subjects/groups_credits_list", locals: { groups_and_credits: @groups_and_credits, all_group_credits_met: @all_group_credits_met, total_credits: @total_credits } %>

<%= render partial: "subjects/not_planned_subjects_list", locals: { subjects: @not_planned_approved_subjects } %>

<% (1..current_user.planned_semesters).each do |semester| %>
Expand Down