Merge branch '2.3.x'

emoreth · Jul 31, 2013 · 62b985b · 62b985b
2 parents 437994f + 8ee3a43
commit 62b985b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/app/controllers/course_classes_controller.rb b/app/controllers/course_classes_controller.rb
@@ -5,6 +5,7 @@
 class CourseClassesController < ApplicationController
   authorize_resource
   include NumbersHelper
+  helper :class_enrollments
 
   active_scaffold :course_class do |config|
 

diff --git a/app/controllers/enrollments_controller.rb b/app/controllers/enrollments_controller.rb
@@ -7,6 +7,7 @@ class EnrollmentsController < ApplicationController
   authorize_resource
   include NumbersHelper
   include ApplicationHelper
+  helper :class_enrollments
 
 
   active_scaffold :enrollment do |config|
@@ -58,7 +59,7 @@ class EnrollmentsController < ApplicationController
     config.columns[:student].form_ui = :record_select
     config.create.columns = [:enrollment_number, :admission_date, :level, :enrollment_status, :obs, :student, :advisements, :accomplishments, :deferrals, :scholarship_durations, :dismissal, :class_enrollments]
     config.update.columns = [:enrollment_number, :admission_date, :level, :enrollment_status, :obs, :student, :advisements, :accomplishments, :deferrals, :scholarship_durations, :dismissal, :class_enrollments]
-    config.show.columns = [:enrollment_number, :admission_date, :level, :enrollment_status, :obs, :student, :advisements, :accomplishments, :deferrals, :scholarship_durations, :dismissal]
+    config.show.columns = [:enrollment_number, :admission_date, :level, :enrollment_status, :obs, :student, :advisements, :accomplishments, :deferrals, :scholarship_durations, :dismissal, :class_enrollments]
   end
   record_select :per_page => 10, :search_on => [:enrollment_number], :order_by => 'enrollment_number', :full_text_search => true
 

diff --git a/app/helpers/class_enrollments_helper.rb b/app/helpers/class_enrollments_helper.rb
@@ -2,4 +2,8 @@
 # This file is part of SAPOS. Please, consult the license terms in the LICENSE file.
 
 module ClassEnrollmentsHelper
+  def grade_form_column(record, options)
+    options = options.merge({:maxlength => 5, :class => "grade-input numeric-input text-input"})
+    text_field :record, :grade_to_view, options
+  end
 end
diff --git a/app/models/class_enrollment.rb b/app/models/class_enrollment.rb
@@ -47,6 +47,10 @@ def grade=(new_grade)
     super(new_grade)
   end
 
+  def grade_to_view
+    grade.nil? ? nil : (grade/10.0)
+  end
+
   private
   def grade_for_situation
     if course_has_grade