From 813a6b88d9dc04ed7e56ff9f125e2eb0a68a106d Mon Sep 17 00:00:00 2001 From: rulingcom Date: Fri, 22 May 2026 15:47:54 +0800 Subject: [PATCH] Add course_class url --- .../personal_courses_controller.rb | 10 +++++++-- app/models/course.rb | 20 +++++++++++++++++- app/views/admin/courses/_form.html.erb | 21 ++++++++++++++++++- config/locales/en.yml | 4 +++- config/locales/zh_tw.yml | 4 +++- 5 files changed, 53 insertions(+), 6 deletions(-) diff --git a/app/controllers/personal_courses_controller.rb b/app/controllers/personal_courses_controller.rb index 8ed9b10..73ddd2c 100644 --- a/app/controllers/personal_courses_controller.rb +++ b/app/controllers/personal_courses_controller.rb @@ -7,9 +7,11 @@ class PersonalCoursesController < ApplicationController { "year" => course.year, "title" => course.title, + "course_class" => (course.course_class rescue ""), "category" => (course.course_category.title rescue ""), "semester" => (course.course_semester.title rescue ""), - "authors" => ("" + member.name + ""), + "authors" => ("" + member.name + ""), + "url" => (course.url.blank? ? "" : "#{course.url}"), "link_to_show" => OrbitHelper.url_to_show(course.to_param) } end @@ -19,9 +21,11 @@ class PersonalCoursesController < ApplicationController "widget-title" => t("module_name.personal_course"), "th_year" => t('personal_course.year'), "th_course_title" => t("personal_course.title"), + "th_course_class" => t("personal_course.course_class"), "th_course_category" => t("personal_course.course_category"), "th_course_semester" => t("personal_course.course_semester"), - "th_authors" => t('users.name') + "th_authors" => t('users.name'), + "th_url" => t("personal_course.url") }, "total_pages" => courses.total_pages } @@ -33,10 +37,12 @@ class PersonalCoursesController < ApplicationController fields_to_show = [ "year", "course_category", + "course_class", "course_code", "title", "objective", "course_semester", + "url", "course_syllabus_file", "course_progress_file", "course_activity_file", diff --git a/app/models/course.rb b/app/models/course.rb index 8a26299..838275e 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -7,9 +7,11 @@ class Course field :title, as: :slug_title, type: String, localize: true field :objective, localize: true + field :course_class, type: String, localize: true field :year, type: Integer field :student_ids, type: Array, default: [] field :course_code, type: String, default: "" + field :url field :rss2_id has_many :course_syllabus_files, :dependent => :destroy, :autosave => true has_many :course_progress_files, :dependent => :destroy, :autosave => true @@ -36,6 +38,7 @@ class Course index({year: -1, _id: -1}, { unique: false, background: false }) scope :sort_year, ->{ order_by(:year => "desc", :id=>"desc") } scope :sort_for_frontend, ->{ where(:is_hidden=>false).order_by(:year=>'desc', :id=>"desc") } + before_validation :add_http before_save do |record| selected_course = SelectedCourse rescue nil if selected_course @@ -69,9 +72,11 @@ class Course fields_to_show = [ "course_category", - "course_code", + "course_code", "title", + "course_class", "year", + "url" ] fields_to_remove = [] @@ -102,6 +107,9 @@ class Course pd_data << { "data_title" => (url_to_plugin_show_blank ? tmp_title : "#{tmp_title}") } elsif t == "course_category" pd_data << {"data_title" => (p.course_category.title rescue "")} + elsif t == "url" + url_value = p.send(t) rescue "" + pd_data << {"data_title" => (url_value.blank? ? "" : "#{url_value}")} else pd_data << { "data_title" => p.send(t) } end @@ -135,6 +143,8 @@ class Course value = self.course_category.title rescue "" when "course_semester" value = self.course_semester.title rescue "" + when "course_class" + value = self.course_class rescue "" when "course_syllabus_file", "course_progress_file", "course_activity_file", "course_multimedia_file", "course_material_file", "course_supplement_file", "course_evaluation_file" files = [] self.send(field.pluralize).each do |file| @@ -150,6 +160,8 @@ class Course value = "#{self.member_profile.name}" when "students" value = self.display_students + when "url" + value = self.url rescue "" else value = self.send(field) rescue "" end @@ -164,5 +176,11 @@ class Course "value"=>value } end + protected + def add_http + unless self.url.blank? || self.url[/^http:\/\//] || self.url[/^https:\/\//] + self.url = 'http://' + self.url + end + end end diff --git a/app/views/admin/courses/_form.html.erb b/app/views/admin/courses/_form.html.erb index 3b3bc5b..1e81aad 100644 --- a/app/views/admin/courses/_form.html.erb +++ b/app/views/admin/courses/_form.html.erb @@ -66,6 +66,17 @@ <% end %> + + +
+ +
+ <%= f.fields_for :course_class_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_course.course_class"), value: (@course.course_class_translations[locale] rescue nil) %> + <% end %> +
+
+ <% end %> @@ -172,6 +183,14 @@ + +
+ +
+ <%= f.text_field :url, :class => "span6" %> +
+
+ @@ -226,4 +245,4 @@ $(this).parents('.start-line').hide(); } }); - \ No newline at end of file + diff --git a/config/locales/en.yml b/config/locales/en.yml index 9a4967d..d174f0a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -19,10 +19,12 @@ en: students: Students year: Year title: Course Title + course_class: Class objective: Objective course_assignment: Assignments course_semester: Semester course_category: Category + url: Reference Link course_syllabus_file: Syllabus Files course_progress_file: Progress Files course_activity_file: Activity Files @@ -30,4 +32,4 @@ en: course_material_file: Material Files course_supplement_file: Supplement File course_evaluation_file: Evaluation File - graph_by : "Graph By" \ No newline at end of file + graph_by : "Graph By" diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 792cfa4..245e959 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -19,10 +19,12 @@ zh_tw: students: 學生 year: 年度 title: 課程名稱 + course_class: 上課班級 objective: 課程目標 course_assignment: 作業 course_category: 課程類別 course_semester: 學期 + url: 參考連結 course_syllabus_file: 教學大綱 course_progress_file: 教學進度表 course_activity_file: 教學活動設計 @@ -30,4 +32,4 @@ zh_tw: course_material_file: 自編教材 course_supplement_file: 補充教材 course_evaluation_file: 評量紀錄 - graph_by : "Graph By" \ No newline at end of file + graph_by : "Graph By"