Skip to content

feat: Add progress updates to CSV #303

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

Merged
KisuHypee merged 1 commit into from
Apr 10, 2026
+31 −14
Merged

feat: Add progress updates to CSV #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 31 additions & 14 deletions app/controllers/courses_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,8 @@ def create_db_entries_grouped(hash_map, parent_course, unregistered_students, re
role: :student
)

user_project_group_ids = ProjectGroupMember.where(user: new_user).pluck(:project_group_id)
new_group_member = ProjectGroupMember.joins(:project_group).find_by(user: new_user, project_groups: { course: parent_course } )
ProjectGroupMember.where(user: new_user).pluck(:project_group_id)
new_group_member = ProjectGroupMember.joins(:project_group).find_by(user: new_user, project_groups: { course: parent_course })

if new_group_member
new_group_member.update!(project_group: new_group)
Expand Down Expand Up @@ -568,6 +568,13 @@ def build_csv_headers(template_fields)
project_fields.each do |field|
headers << field.label
end

if @course.use_progress_updates?
(1..@course.number_of_updates.to_i).each do |num|
headers << "Update #{num}"
end
end

headers
end

Expand All @@ -577,6 +584,7 @@ def build_group_rows(group, template_fields)
supervisor = project&.supervisor
project_status = project&.current_status || 'not_submitted'
field_values = get_project_details_values(current_instance, template_fields)
progress_updates_values = get_progress_updates_values(project)
rows = []

group.project_group_members.each do |member|
Expand All @@ -591,7 +599,9 @@ def build_group_rows(group, template_fields)
project&.current_title || '',
project_status.humanize
]

row.concat(field_values)
row.concat(progress_updates_values)
rows << row
end
rows
Expand All @@ -603,6 +613,7 @@ def build_student_rows(student, template_fields)
supervisor = project&.supervisor
project_status = project&.current_status || 'not_submitted'
field_values = get_project_details_values(current_instance, template_fields)
progress_updates_values = get_progress_updates_values(project)

row = [
student.name || '',
Expand All @@ -615,6 +626,7 @@ def build_student_rows(student, template_fields)
]

row.concat(field_values)
row.concat(progress_updates_values)
[row]
end

Expand Down Expand Up @@ -648,6 +660,19 @@ def get_project_details_values(current_instance, template_fields)
end
end

def get_progress_updates_values(project)
return [] unless @course.use_progress_updates?

total_num = @course.number_of_updates.to_i
return Array.new(total_num, '') unless project

progress_updates = project.progress_updates.order(:created_at).to_a

(0..total_num).map do |index|
progress_updates[index]&.rating&.titleize || ''
end
end

# Lecturer capcity helpers

def lecturer_approved_proposals_count(lecturer, course)
Expand Down Expand Up @@ -815,13 +840,9 @@ def filtered_group_list
group_list = group_list.select { |g| ids.include?(g.id) }
end

if params[:status_filter].present? && params[:status_filter] != 'all'
group_list = @course.groups_with_status(params[:status_filter], group_list)
end
group_list = @course.groups_with_status(params[:status_filter], group_list) if params[:status_filter].present? && params[:status_filter] != 'all'

if params[:search_query].present?
group_list = search_groups(group_list, params[:search_query])
end
group_list = search_groups(group_list, params[:search_query]) if params[:search_query].present?

sorted_list = group_list.sort_by { |group| sort_value_for_group(group) }
sort_descending? ? sorted_list.reverse : sorted_list
Expand All @@ -834,13 +855,9 @@ def filtered_student_list
student_list = student_list.select { |s| ids.include?(s.id) }
end

if params[:status_filter].present? && params[:status_filter] != 'all'
student_list = @course.students_with_status(params[:status_filter], student_list)
end
student_list = @course.students_with_status(params[:status_filter], student_list) if params[:status_filter].present? && params[:status_filter] != 'all'

if params[:search_query].present?
student_list = search_students(student_list, params[:search_query])
end
student_list = search_students(student_list, params[:search_query]) if params[:search_query].present?

sorted_list = student_list.sort_by { |student| sort_value_for_student(student) }
sort_descending? ? sorted_list.reverse : sorted_list
Expand Down
Loading