qalam_merit 4.5.05 → 4.5.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36dd98bb62a667ae5b42ca9edb1a6aa9d547a139d268f9da523476937d61d077
-  data.tar.gz: 3d36fe5887fc5844b4e13f342e73216d7fc8ab1f6d70e1a458437c9b86fd247e
+  metadata.gz: d32a4d56924a23f24741b8aa276cd54f32767ad51d8c04df8d138f4c82d2c427
+  data.tar.gz: 5202cdc4c9c90323f07dffe90eb1db4a6690df92dce156fb7466f30526482bf5
 SHA512:
-  metadata.gz: b797616130749f3f74ad7b2737dc32461866896547f32f9039d56474f309d20a07113a42f0fa3dd0af105450b511455ff4b769a517d5656885cdfc56194c6780
-  data.tar.gz: 26bc8ce7e1adcee901aaa6f929a0e89d73d22b7088c30cc5321c1369ca4528593417a48336ff6e31b5c03d94505adc6df3701a92bd9f825e1828db0da6d3638b
+  metadata.gz: 3a64775d9aa10271625631b8bbad64482a3fc09c1776652a7fba52bdafb3a78da0a87ea5c1a7b3fd6d8f4c20dace827087c2c4790578fcd4eeb1d2634608e031
+  data.tar.gz: 73a2d727db358c669dccdf8e9f73212410c563ce50262e20052ab6b8cd73111f932cfb09aa1ae8fdc00edeaa68018278d0a99baaf9421d62492b5a8fa26679f4

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/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/sash_concern.rb

@@ -8,16 +8,27 @@ 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)
     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.05'
+  s.version     = '4.5.06'
   s.authors     = ["Tute Costa", "Ahmed Abdelhamid"]
   s.email       = ['tutecosta@gmail.com', 'a.hamid@nezam.io']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_merit
 version: !ruby/object:Gem::Version
-  version: 4.5.05
+  version: 4.5.06
 platform: ruby
 authors:
 - Tute Costa