semesters to planner

app/controllers/planned_subjects_controller.rb

@@ -7,7 +7,7 @@ def index
   end
 
   def create
-    current_user.planned_subjects.create(subject_id: params[:subject_id])
+    current_user.planned_subjects.create(subject_id: params[:subject_id], semester: params[:semester])
 
     redirect_to planned_subjects_path
   end
@@ -26,8 +26,9 @@ def ensure_feature_enabled!
   end
 
   def set_planned_and_not_planned_subjects
-    @planned_subjects, @not_planned_subjects = TreePreloader.new.preload.partition do |subject|
-      current_student.approved?(subject) || current_user.planned?(subject)
-    end
+    @planned_subjects = current_user.planned_subjects.includes(:subject).order(:semester)
+    @not_planned_approved_subjects, @not_planned_subjects = TreePreloader.new.preload.reject { |subject|
+      current_user.planned?(subject)
+    }.partition { |subject| current_student.approved?(subject) }
   end
 end

app/helpers/subjects_helper.rb

@@ -18,6 +18,21 @@ def formatted_category(category)
     end
   end
 
+  def semester_display_name(semester)
+    case semester
+    when 1 then 'Primer semestre'
+    when 2 then 'Segundo semestre'
+    when 3 then 'Tercer semestre'
+    when 4 then 'Cuarto semestre'
+    when 5 then 'Quinto semestre'
+    when 6 then 'Sexto semestre'
+    when 7 then 'Séptimo semestre'
+    when 8 then 'Octavo semestre'
+    when 9 then 'Noveno semestre'
+    when 10 then 'Décimo semestre'
+    end
+  end
+
   def display_name(subject)
     "#{subject.code} - #{subject.short_name || subject.name}"
   end

app/javascript/controllers/autosave_check_controller.js

@@ -1,9 +1,13 @@
-import { Controller } from "@hotwired/stimulus"
-import { Turbo } from "@hotwired/turbo-rails"
+import { Controller } from "@hotwired/stimulus";
+import { Turbo } from "@hotwired/turbo-rails";
 
 export default class extends Controller {
   update(e) {
     e.preventDefault();
-    Turbo.navigator.submitForm(this.element)
+    Turbo.navigator.submitForm(this.element);
+  }
+
+  stopPropagation(e) {
+    e.preventDefault();
   }
 }

app/views/planned_subjects/_credits_counter.html.erb

@@ -1,8 +1,4 @@
 <div class="mdc-deprecated-list-group__subheader mdc-typography--subtitle2">
-  <strong> Créditos actuales:</strong> <%= current_student.total_credits %>
-</div>
-
-<div class="mdc-deprecated-list-group__subheader mdc-typography--subtitle2">
-  <% planned_approvable_ids = planned_subjects.map { |subject| [subject.course.id, subject.exam&.id] }.flatten.compact %>
+  <% planned_approvable_ids = planned_subjects.map { |planned_subject| [planned_subject.subject.course.id, planned_subject.subject.exam&.id] }.flatten.compact %>
   <strong> Créditos planeados:</strong> <%= Subject.approved_credits(planned_approvable_ids) %>
 </div>

app/views/planned_subjects/index.html.erb

@@ -3,14 +3,23 @@
 <% end %>
 
 <div class="mdc-deprecated-list-group subjects-list">
-  <h3 class="mdc-deprecated-list-group__subheader mdc-typography--subtitle2">
-    Materias planeadas
-  </h3>
+  <div class="subject-group-header">
+    <h3 class="mdc-deprecated-list-group__subheader mdc-typography--subtitle2">
+      Materias planeadas
+    </h3>
+    <%= render partial: "credits_counter", locals: { planned_subjects: @planned_subjects } %>
+  </div>
 
-  <%= render partial: "subjects/planned_subjects_list", locals: { subjects: @planned_subjects } %>
+  <%= render partial: "subjects/planned_subjects_list", locals: { planned_subjects: @planned_subjects } %>
+
+  <hr class="mdc-deprecated-list-divider">
 
-  <%= render partial: "credits_counter", locals: { planned_subjects: @planned_subjects } %>
+  <% if @not_planned_approved_subjects.any? %> 
+    <h3 class="mdc-deprecated-list-group__subheader mdc-typography--subtitle2">Materias aprobadas sin semestre asignado</h3>
 
+    <%= render partial: "subjects/not_planned_subjects_list", locals: { subjects: @not_planned_approved_subjects } %>
+  <% end %>
+
   <hr class="mdc-deprecated-list-divider">
 
   <h3 class="mdc-deprecated-list-group__subheader mdc-typography--subtitle2">

app/views/subjects/_not_planned_subjects_list.html.erb

@@ -13,6 +13,11 @@
         class: 'd-flex',
         local: false
       ) do |form| %>
+        <select name="semester" data-action="click->autosave-check#stopPropagation">
+          <% (1..10).each do |semester| %>
+            <option value="<%= semester %>"> Sem. <%= semester %></option>
+          <% end %>
+        </select>
         <span class="mdc-deprecated-list-item__meta material-icons" data-action="click->autosave-check#update">add_circle_outline</button>
       <% end %>
     <% end %>

app/views/subjects/_planned_subjects_list.html.erb

@@ -1,25 +1,33 @@
 <div class="mdc-deprecated-list">
-  <% subjects.each do |subject| %>
-    <%= link_to subject_path(subject), :class => "mdc-deprecated-list-item" do %>
-      <span class="mdc-deprecated-list-item__ripple"></span>
-      <span class="mdc-deprecated-list-item__text">
-        <%= display_name(subject) %>
-      </span>
-      <% if current_student.approved?(subject) %>
-        <span class="mdc-deprecated-list-item__meta material-icons">done</span>
-      <% else %>
-        <%= form_with(
-          model: subject,
-          url: planned_subject_path(subject_id: subject.id),
-          method: :delete,
-          data: { controller: "autosave-check" },
-          class: 'd-flex',
-          locale: false,
-        ) do |form| %>
-          <span class="mdc-deprecated-list-item__meta material-icons" data-action="click->autosave-check#update">remove_circle_outline</span>
-        <% end %>
-        <% if !current_student.available?(subject) %>
-          <span class="mdc-deprecated-list-item__meta material-icons">lock</span>
+  <% planned_subjects.group_by(&:semester).each do |semester, planned_subjects| %>
+    <div class="subject-group-header">
+      <h3 class="mdc-deprecated-list-group__subheader mdc-typography--subtitle2">
+        <%= semester_display_name(semester) %>
+      </h3>
+      <%= render partial: "credits_counter", locals: { planned_subjects: planned_subjects } %>
+    </div>
+    <% planned_subjects.each do |planned_subject| %>
+      <%= link_to subject_path(planned_subject.subject), :class => "mdc-deprecated-list-item" do %>
+        <span class="mdc-deprecated-list-item__ripple"></span>
+        <span class="mdc-deprecated-list-item__text">
+          <%= display_name(planned_subject.subject) %>
+        </span>
+        <% if current_student.approved?(planned_subject.subject) %>
+          <span class="mdc-deprecated-list-item__meta material-icons">done</span>
+        <% else %>
+          <%= form_with(
+            model: planned_subject.subject,
+            url: planned_subject_path(subject_id: planned_subject.subject.id),
+            method: :delete,
+            data: { controller: "autosave-check" },
+            class: 'd-flex',
+            locale: false,
+          ) do |form| %>
+            <span class="mdc-deprecated-list-item__meta material-icons" data-action="click->autosave-check#update">remove_circle_outline</span>
+          <% end %>
+          <% if !current_student.available?(planned_subject.subject) %>
+            <span class="mdc-deprecated-list-item__meta material-icons">lock</span>
+          <% end %>
         <% end %>
       <% end %>
     <% end %>

db/migrate/20241228220307_add_semester_to_planned_subjects.rb

@@ -0,0 +1,5 @@
+class AddSemesterToPlannedSubjects < ActiveRecord::Migration[8.0]
+  def change
+    add_column :planned_subjects, :semester, :integer
+  end
+end