qalam_merit 4.5.02 → 4.5.07

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21d74a55846470b62cdd1e64d58c11c047e9b56482c6a9c1eacf9db5ea636fcd
-  data.tar.gz: 4946a1d94267fb8f4f6150db6e38150d9bd1ca2f0a4e55978ac535fdc05bae40
+  metadata.gz: 18ab3c2aa42a726a285563b7bb673735df7b5a6b1018b797e8f0a17278c038fd
+  data.tar.gz: c188b2ceb645906ab83c32aaef4722e0c3d73ac5e4771a7a0561b412acaff8e1
 SHA512:
-  metadata.gz: f4ce2b946fd4d7774b5bfd6af4abe87633e2ef76d6d2f04a83432d7a5d4a5950a08b78c2015af76e6f7c378a43373b99b75e78b304164289e2de58eafcc92bf5
-  data.tar.gz: 3297fdeaef38f6c391fd26f931e059a478772715a6ab0aa2e131bd078c65a62e33e985477487f9f542f8aa67381a1fb9493ab09d9c845e8756b80f7048c2a387
+  metadata.gz: 75dae6966612454a115ff99146709ff7aab85f7b10467ea5e8a259e2a54426f78b12a1ebc034a28e6d7c9396894d54479c785a61bfd5f7ca111d51f22ec4c556
+  data.tar.gz: 5460dcaf5db6bf795547af04f8eb8fea07c51a4a05fcaea8141f2d41178c873d4999f993530d890116d15c96f81bdc5ca328b33698f03ece4a2504dec2a754a5

data/lib/merit/class_methods.rb

@@ -16,7 +16,7 @@ module Merit
 
     # Delegate methods from meritable models to their sash
     def _merit_delegate_methods_to_sash
-      methods = %w(badge_ids badges points add_badge rm_badge
+      methods = %w(badge_ids badges points add_badge add_qalam_badge rm_badge
                    add_points subtract_points score_points)
       methods.each { |method| delegate method, to: :_sash }
     end

data/lib/merit/generators/merit_generator.rb

@@ -8,8 +8,10 @@ module Merit
       def inject_merit_content
         if model_exists?
           inject_into_class(model_path, class_name, "  ### END ###\n\n")
-          inject_into_class(model_path, class_name, "  has_many :created_badges, class_name: 'Merit::Badge'\n")
-          inject_into_class(model_path, class_name, "  belongs_to :sash, foreign_key: 'sash_id', class_name: 'Merit::Sash'\n")
+          inject_into_class(model_path, class_name, "  has_many :created_badges, class_name: 'Merit::Badge', :dependent => :destroy\n")
+          inject_into_class(model_path, class_name, "  has_many :assigned_badges, through: :sash, source: :badges, :dependent => :destroy\n")
+          inject_into_class(model_path, class_name, "  has_many :badges_sashes, through: :sash, source: :badges_sashes, :dependent => :destroy\n")
+          inject_into_class(model_path, class_name, "  belongs_to :sash, foreign_key: 'sash_id', class_name: 'Merit::Sash', :dependent => :destroy\n")
           inject_into_class(model_path, class_name, "  has_merit\n")
           inject_into_class(model_path, class_name, "  ### QALAM_MERIT ###\n")
         end

data/lib/merit/models/active_record/badges_sash.rb

@@ -6,6 +6,7 @@ module Merit::Models::ActiveRecord
     has_many :activity_logs,
              class_name: 'Merit::ActivityLog',
              as: :related_change
+    belongs_to :course, foreign_key: "course_id", class_name: 'Course'
 
     validates_presence_of :badge_id, :sash
   end

data/lib/merit/models/active_record/qalam_score.rb

@@ -1,18 +1,24 @@
 module Merit::Models::ActiveRecord
   class QalamScore < ActiveRecord::Base
     self.table_name = :merit_scores
-    belongs_to :sash
+    belongs_to :sash,
+              foreign_key: "sash_id", 
+              class_name: 'Merit::Sash'
     has_many :score_points,
-             dependent: :destroy,
-             class_name: 'Merit::QalamScore::Point'
+              dependent: :destroy,
+              foreign_key: "score_id",
+              class_name: 'Merit::QalamScore::Point'
 
     def points
       score_points.group(:score_id).sum(:num_points).values.first || 0
     end
 
     class Point < ActiveRecord::Base
-      belongs_to :score, class_name: 'Merit::Score'
-      has_one :sash, through: :score
+      self.table_name = :merit_score_points
+      belongs_to :score, 
+                  foreign_key: "score_id", 
+                  class_name: 'Merit::QalamScore'
+      has_one :sash, through: :score, source: :sash
       has_many :activity_logs,
                class_name: 'Merit::ActivityLog',
                as: :related_change

data/lib/merit/models/sash_concern.rb

@@ -8,16 +8,31 @@ module Merit::Models
       badges_sashes.map(&:badge_id)
     end
 
-    def add_badge(badge_id)
-      bs = Merit::BadgesSash.new(badge_id: badge_id.to_i)
-      badges_sashes << bs
-      bs
+    def add_badge(badge_id, options = {})
+      if (course_id = options[:course_id])
+        bs = Merit::BadgesSash.new(badge_id: badge_id.to_i, course_id: course_id.to_i)
+      else
+        bs = Merit::BadgesSash.new(badge_id: badge_id.to_i)
+      end
+        badges_sashes << bs
+        bs
     end
 
-    def rm_badge(badge_id)
-      badges_sashes.where(badge_id: badge_id.to_i).first.try(:destroy)
+    def rm_badge(badge_id, options = {})
+      if (course_id = options[:course_id])
+        badges_sashes.where(badge_id: badge_id.to_i, course_id: course_id.to_i).first.try(:destroy)
+      else
+        badges_sashes.where(badge_id: badge_id.to_i).first.try(:destroy)
+      end
     end
 
+    ########################QALAM_DEV#########################
+    def add_qalam_badge(badge_id, course_id)
+      bs = Merit::BadgesSash.new(badge_id: badge_id.to_i, course_id: course_id.to_i)
+      badges_sashes << bs
+      bs
+    end
+    ########################END###################################
     # Retrieve the number of points from a category
     # By default all points are summed up
     # @param category [String] The category

data/qalam_merit.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.test_files  = `git ls-files -- test/*`.split("\n")
   s.license     = 'MIT'
-  s.version     = '4.5.02'
+  s.version     = '4.5.07'
   s.authors     = ["Tute Costa", "Ahmed Abdelhamid"]
   s.email       = ['tutecosta@gmail.com', 'a.hamid@nezam.io']
 

data/test/unit/qalam_score_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-describe Merit::Score do
+describe Merit::QalamScore do
   it 'Point#sash_id delegates to Score' do
     score = Merit::QalamScore.new
     score.sash_id = 33

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_merit
 version: !ruby/object:Gem::Version
-  version: 4.5.02
+  version: 4.5.07
 platform: ruby
 authors:
 - Tute Costa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk