ecm_courses2 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dfc6e912f248798cf1e9e130eb64eaf4b7ebf02
-  data.tar.gz: f00491ee08728287b419a2ed3332f03a849975cd
+  metadata.gz: 2cfb632553f3c624e4c94d9961d47bc958e9e8a7
+  data.tar.gz: 8da46502e8fb5b7672170588d3212749f3e04f00
 SHA512:
-  metadata.gz: 16fa484f0ee0f796eefe4fd020e13803c8fe9ae3c49a210f8819a2955e098bae065229fc3d0c9a5a555352109e7826d05a7fa8dd0e27b74089b35801829c872a
-  data.tar.gz: d4b2df587eb85e7aac20b640917a4eba8453f67b4949e3cf6377ddfc7ffbe789f9efb76f33ec492034542352caf5a6003a8b7e4913f6f76bd7238ac635108dcb
+  metadata.gz: 662f30155d99a49766c06f19a971142dacee6ddd79e9e687b150e0c4d6025f29b8ebd792bc9a4530070f6f819d7ed853f96d04acf0d61322e4cdc0dc72deffa1
+  data.tar.gz: 8869d2009c0823a02b5ad1016d308042406c215284443557c57f3abfb38dd40a5ee46b49f98e972d0258c9e15b726c409171653d19e7400db4be021ba116f545

data/app/helpers/ecm/courses/application_helper.rb

@@ -1,6 +1,9 @@
 module Ecm
   module Courses
     module ApplicationHelper
+      def free_places_label_for(course)
+        render partial: 'ecm/courses/course_categories/free_seats', locals: { course: course }
+      end
     end
   end
 end

data/app/models/ecm/courses/course.rb

@@ -16,6 +16,47 @@ module Ecm::Courses
 
     include Icalendar
 
+    module Seats
+      extend ActiveSupport::Concern
+
+      included do
+        after_initialize :set_seats_defaults, if: :new_record?
+        before_validation :calculate_free_seats
+
+        validates :used_seats, numericality: { greater_than_or_equal_to: 0 }
+      end
+
+      def free_seats_percentage
+        percentage = free_seats.to_f / seats.to_f * 100
+        percentage.nan? ? 0 : percentage
+      end
+
+      def free_seats_level
+        Ecm::Courses::Configuration.free_seats_level_for(self)
+      end
+
+      def free_seats_level_properties
+        free_seats_level.values.first
+      end
+
+      def free_seats_level_range
+        free_seats_level.keys.first
+      end
+   
+      private
+
+      def set_seats_defaults
+        self.seats      ||= 0
+        self.free_seats ||= 0
+      end
+
+      def calculate_free_seats
+        self.free_seats = seats - used_seats
+      end
+    end
+
+    include Seats
+
     # acts as list
     acts_as_list scope: :course_category
 

data/app/views/ecm/courses/course_categories/_free_seats.haml

@@ -0,0 +1,9 @@
+= "#{course.class.human_attribute_name(:free_seats)}:"
+%span{ class: "label label-#{course.free_seats_level_properties[:css_class]}" }
+  - if course.free_seats_level_range.last == 100
+    - percentage = number_to_percentage(course.free_seats_level_range.first, precision: 0)
+    = t('.less_than', percentage: percentage)
+
+  - else 
+    - percentage = number_to_percentage(course.free_seats_level_range.last, precision: 0)
+    = t('.greater_than', percentage: percentage)

data/app/views/ecm/courses/courses/_course.haml

@@ -1,6 +1,9 @@
 .course{:id => "course-#{course.to_param}"}
   %span.course-title
     %h1= course.heading_name
+  - if Ecm::Courses::Configuration.show_free_places
+    .free-seats.bottom-margin-1
+      = free_places_label_for(course)
   - unless course.description.blank?
     .course-description
       %p= course.description

data/config/locales/de.yml

@@ -12,32 +12,48 @@ de:
         other: Kurse
     attributes:
       ecm/courses/course_category:
-        description: Beschreibung
-        courses_count: Kurse
+        children: Unterkategorien
+        created_at: Erstellt am
         courses: Kurse
+        courses_count: Kurse
+        created_at: Erstellt am
+        depth: Level
+        description: Beschreibung
+        lft: Links
         locale: Sprache
         name: Name
         parent: Überliegende Kategorie
         parent_id: Überliegende Kategorie
-        created_at: Erstellt am
+        position: Position
+        rgt: Rechts
+        slug: Freundliche ID
         updated_at: Aktualisiert am
       ecm/courses/course_date:
+        created_at: Erstellt am
         description: Beschreibung
+        duration_in_minutes: Dauer
+        course_category: Kategorie
         course: Kurs
         course_id: Kurs
         end_at: Endet am
+        name: Name
         start_at: Beginnt am
-        created_at: Erstellt am
         updated_at: Aktualisiert am
       ecm/courses/course:
-        description: Beschreibung
         course_category: Kategorie
         course_category_id: Kategorie
+        course_dates: Termine
         course_dates_count: Termine
+        created_at: Erstellt am
+        description: Beschreibung
+        free_seats: Freie Plätze
         locale: Sprache
         name: Name
-        created_at: Erstellt am
+        position: Position
+        seats: Plätze
+        slug: Freundliche ID
         updated_at: Aktualisiert am
+        used_seats: Belegte Plätze
   date:
     formats:
       month_with_year: '%B %Y'
@@ -47,6 +63,9 @@ de:
         show:
           back: 'Zurück'
       course_categories:
+        free_seats:
+          greater_than: "> %{percentage}"
+          less_than: "< %{percentage}"
         index:
           back: 'Zurück'
         show:

data/config/locales/en.yml

@@ -0,0 +1,86 @@
+en:
+  activerecord:
+    models:
+      ecm/courses/course_category:
+        one: "course category"
+        other: "course_categories"
+      ecm/courses/course:
+        one: "Course"
+        other: "Courses"
+      ecm/courses/course_date:
+        one: "course date"
+        other: "course dates"
+    attributes:
+      ecm/courses/course_category:
+        children: sub categories
+        created_at: Created at
+        courses: Courses
+        courses_count: Courses
+        created_at: created at
+        depth: depth
+        description: description
+        lft: left
+        locale: language
+        name: name
+        parent: parent category
+        parent_id: parent cateogory
+        position: position
+        rgt: right
+        slug: friendly id
+        updated_at: updated at
+      ecm/courses/course_date:
+        created_at: created at
+        description: description
+        duration_in_minutes: duration
+        course_category: course category
+        course: course
+        course_id: course
+        end_at: end at
+        name: name
+        start_at: begin at
+        updated_at: updated at
+      ecm/courses/course:
+        course_category: category
+        course_category_id: category
+        course_dates: dates
+        course_dates_count: dates
+        created_at: created at
+        description: description
+        free_seats: Free seats
+        locale: language
+        name: name
+        position: position
+        seats: Seats
+        slug: friendly id
+        updated_at: updated at
+        used_seats: used seats
+  date:
+    formats:
+      month_with_year: '%B %Y'
+  ecm:
+    courses:
+      courses:
+        show:
+          back: 'Back'
+      course_categories:
+        free_seats:
+          greater_than: "> %{percentage}"
+          less_than: "< %{percentage}"
+        index:
+          back: 'Back'
+        show:
+          calendar_heading: 'Calendar for %{month}'
+      course_dates:
+        show:
+          back: Back
+      course_category:
+        actions:
+          back_to_index: 'Back'
+      pages:
+        course_categories:
+          index: Course categories
+  routes:
+    ecm_courses_engine: 'courses'
+    courses: 'courses'
+    course_categories: 'categories'
+    course_dates: 'dates'

data/db/migrate/20180227204631_add_seats_columns_to_ecm_courses_courses.rb

@@ -0,0 +1,7 @@
+class AddSeatsColumnsToEcmCoursesCourses < ActiveRecord::Migration[4.2]
+  def change
+    add_column :ecm_courses_courses, :seats, :integer
+    add_column :ecm_courses_courses, :used_seats, :integer
+    add_column :ecm_courses_courses, :free_seats, :integer
+  end
+end

data/db/migrate/20180227210548_initialize_seats_columns_in_ecm_courses_courses.rb

@@ -0,0 +1,11 @@
+class InitializeSeatsColumnsInEcmCoursesCourses < ActiveRecord::Migration[4.2]
+  class Ecm::Courses::Courses < ActiveRecord::Base; end
+
+  def up
+    Ecm::Courses::Courses.update_all(seats: 0, used_seats: 0, free_seats: 0)
+  end
+
+  def down
+    Ecm::Courses::Courses.update_all(seats: nil, used_seats: nil, free_seats: nil)
+  end
+end

data/lib/ecm/courses/configuration.rb

@@ -6,6 +6,22 @@ module Ecm
       end
 
       mattr_accessor(:base_controller) { '::ApplicationController' }
+
+      mattr_accessor(:show_free_places) { false }
+
+      mattr_accessor(:free_seats_level_proc) do
+        lambda do |course|
+          {
+            0..9    => { color: 'red' },
+            10..69  => { color: 'yellow' },
+            70..100 => { color: 'green' }
+          }
+        end
+      end
+
+      def self.free_seats_level_for(course)
+        free_seats_level_proc.call(course).select { |percentage| percentage === course.free_seats_percentage }
+      end
     end
   end
 end

data/lib/ecm/courses/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Courses
-    VERSION = '1.0.3'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/lib/generators/ecm/courses/install/install_generator.rb

@@ -6,8 +6,8 @@ module Ecm
 
         source_root File.expand_path('../templates', __FILE__) 
         
-        def generate_intializer
-          copy_file "ecm_courses.rb", "config/initializers/ecm_courses.rb"
+        def generate_initializer
+          copy_file "initializer.rb", "config/initializers/ecm_courses.rb"
         end   
 
         def generate_routes

data/lib/generators/ecm/courses/install/templates/ecm_courses.rb

@@ -4,4 +4,30 @@ Ecm::Courses.configure do |config|
   # Default: config.base_controller = '::ApplicationController'
   #
   config.base_controller = '::ApplicationController'
+
+  # Set the colours and thresholds for free seats.
+  #
+  # Default:
+  #
+  #     config.free_seats_levels_proc = ->(course) do
+  #       {
+  #         0..9    => { css_class: 'danger' },
+  #         10..69  => { css_class: 'warning' },
+  #         70..100 => { css_class: 'success' }
+  #       }
+  #     end
+  #
+  config.free_seats_level_proc = ->(course) do
+    {
+      0..9    => { css_class: 'danger' },
+      10..69  => { css_class: 'warning' },
+      70..100 => { css_class: 'success' }
+    }
+  end
+
+  # Show the free places label when displaying a course.
+  #
+  # Default: config.show_free_places = false
+  #
+  config.show_free_places = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_courses2
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-23 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -340,6 +340,7 @@ files:
 - app/models/ecm/courses/course_category.rb
 - app/models/ecm/courses/course_date.rb
 - app/views/ecm/courses/course_categories/_course_category.haml
+- app/views/ecm/courses/course_categories/_free_seats.haml
 - app/views/ecm/courses/course_categories/index.haml
 - app/views/ecm/courses/course_categories/show.haml
 - app/views/ecm/courses/course_dates/_course_date.haml
@@ -351,11 +352,7 @@ files:
 - app/views/ecm/courses/courses/show.haml
 - app/views/layouts/ecm/courses/application.html.erb
 - config/locales/de.yml
-- config/locales/locales/ecm.courses.course.en.yml
-- config/locales/locales/ecm.courses.course_category.en.yml
-- config/locales/locales/ecm.courses.course_date.en.yml
-- config/locales/locales/ecm.courses.en.yml
-- config/locales/locales/ecm.courses.routes.en.yml
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/001_create_ecm_courses_course_categories.rb
 - db/migrate/002_create_ecm_courses_courses.rb
@@ -364,6 +361,8 @@ files:
 - db/migrate/20160927142037_remove_ecm_courses_course_dates_count_from_ecm_courses_courses.rb
 - db/migrate/20160927142238_change_ecm_courses_course_category_id_to_course_category_id_on_ecm_courses_courses.rb
 - db/migrate/20160927142425_change_ecm_courses_course_id_to_course_id_on_ecm_courses_course_date.rb
+- db/migrate/20180227204631_add_seats_columns_to_ecm_courses_courses.rb
+- db/migrate/20180227210548_initialize_seats_columns_in_ecm_courses_courses.rb
 - lib/ecm/courses.rb
 - lib/ecm/courses/configuration.rb
 - lib/ecm/courses/engine.rb
@@ -372,7 +371,6 @@ files:
 - lib/generators/ecm/courses/install/install_generator.rb
 - lib/generators/ecm/courses/install/templates/ecm_courses.rb
 - lib/generators/ecm/courses/install/templates/routes.source
-- lib/generators/ecm/courses/locales/locales_generator.rb
 - lib/tasks/ecm/courses_tasks.rake
 - spec/factories/ecm/courses/course_category_factories.rb
 - spec/factories/ecm/courses/course_date_factories.rb

data/config/locales/locales/ecm.courses.course.en.yml

@@ -1,25 +0,0 @@
----
-en:
-  activerecord:
-    attributes:
-      ecm/courses/course:
-        created_at: created at
-        description: description
-        ecm_courses_course_category: course category
-        ecm_courses_course_category_id: course category
-        ecm_courses_course_dates_count: course dates
-        ecm_courses_course_dates: course dates
-        locale: language
-        name: name
-        position: position
-        slug: friendly id
-        updated_at: updated at
-    models:
-      ecm/courses/course:
-        one: "Course"
-        other: "Courses"
-  formtastic:
-    hints:
-      ecm/courses/course:
-        name: "i.e. Cooking for beginners"
-

data/config/locales/locales/ecm.courses.course_category.en.yml

@@ -1,25 +0,0 @@
----
-en:
-  activerecord:
-    attributes:
-      ecm/courses/course_category:
-        children: "sub categories"
-        created_at: created at
-        depth: depth
-        description: description
-        ecm_courses_courses_count: courses
-        ecm_courses_courses: courses
-        lft: left
-        locale: language
-        name: name
-        parent_id: parent cateogory
-        parent: parent category
-        position: position
-        rgt: right
-        slug: friendly id
-        updated_at: updated at
-    models:
-      ecm/courses/course_category:
-        one: "course category"
-        other: "course_categories"
-

data/config/locales/locales/ecm.courses.course_date.en.yml

@@ -1,20 +0,0 @@
----
-en:
-  activerecord:
-    attributes:
-      ecm/courses/course_date:
-        created_at: created at
-        description: description
-        duration_in_minutes: duration
-        ecm_courses_course_category: course category
-        ecm_courses_course: course
-        ecm_courses_course_id: course
-        end_at: end at
-        name: name
-        start_at: begin at
-        updated_at: updated at
-    models:
-      ecm/courses/course_date:
-        one: "course date"
-        other: "course dates"
-

data/config/locales/locales/ecm.courses.en.yml

@@ -1,18 +0,0 @@
-en:
-  date:
-    formats:
-      month_with_year: %B %Y
-  ecm:
-    courses:
-      active_admin:
-        menu: "courses"
-      course:
-        messages:
-          not_found: "Course \"%{name}\" not found."
-      course_category:
-        actions:
-          back_to_index: "Back to the index"
-        messages:
-          not_found: "Course category \"%{name}\" not found."
-          no_courses_available: "There are now courses in this category."
-

data/config/locales/locales/ecm.courses.routes.en.yml

@@ -1,6 +0,0 @@
-en:
-  resources:
-    courses: "courses"
-    course_categories: "course-categories"
-    course_dates: "course-dates"
-

data/lib/generators/ecm/courses/locales/locales_generator.rb

@@ -1,29 +0,0 @@
-module Ecm
-  module Courses
-    module Generators
-      class LocalesGenerator < Rails::Generators::Base
-        desc "Copies the locale files to your application"
-
-        source_root File.expand_path('../../../../../../config/locales', __FILE__)
-
-        def generate_locales
-          copy_file "ecm.courses.en.yml", "config/locales/ecm.courses.en.yml"
-          copy_file "ecm.courses.de.yml", "config/locales/ecm.courses.de.yml"
-
-          copy_file "ecm.courses.course.en.yml", "config/locales/ecm.courses.course.en.yml"
-          copy_file "ecm.courses.course.de.yml", "config/locales/ecm.courses.course.de.yml"
-
-          copy_file "ecm.courses.course_category.en.yml", "config/locales/ecm.courses.course_category.en.yml"
-          copy_file "ecm.courses.course_category.de.yml", "config/locales/ecm.courses.course_category.de.yml"
-
-          copy_file "ecm.courses.course_date.en.yml", "config/locales/ecm.courses.course_date.en.yml"
-          copy_file "ecm.courses.course_date.de.yml", "config/locales/ecm.courses.course_date.de.yml"
-
-          copy_file "ecm.courses.routes.en.yml", "config/locales/ecm.courses.routes.en.yml"
-          copy_file "ecm.courses.routes.de.yml", "config/locales/ecm.courses.routes.de.yml"
-        end
-      end
-    end
-  end
-end
-