qalam_merit 4.5.03 → 4.5.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386d3c62bf3b26c03ad135cb78787e94dcba50aa9ff8e00901fff50f1970816a
-  data.tar.gz: 16d3cf72df7b2a8418577409d475ed76feeb01fb262f2652c83072ddda0c05e0
+  metadata.gz: 3d1f73f153930fdd73e1ba773d40feb481ab847a7d6857623779de05eacb8817
+  data.tar.gz: 62ddf64eecbb98665f47c841476fc1d5045813ff97db1bcf9c8fe8347c026f57
 SHA512:
-  metadata.gz: aab0e7d069c2e76f8cf494cf066b912526ffbab7a85a460db9b0c4b1217a9040ca0285435905ed50626eb8c7036c73aa4fe8a65f2eca3ee23957bcd2563a7f0c
-  data.tar.gz: c65518af9ab3c4beee883147a93a50edcd2884d65f27d1d939245c8e13895a2508f899f65f281e5efc8f4a2059cfc0b451a5922fbc8c80f939b90dac4c211bbb
+  metadata.gz: 8e1b99abd43904c894b2e75d590c0d901ab090a24a5f5d83fdd16af6c0307301a74ee93752e5c30f52a3281e763bb8132bb0a4ae14195ec546b29613c3cb6cb5
+  data.tar.gz: e976e63ad65c74580397199ea05e8f413a17a51834226066774b83c24517f8feb62cff128be39bb1e6c7e3ceccb338f15d21bfcd1e6121bc38ca94e183abb292

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/active_record/templates/create_merit_badges.erb

@@ -9,7 +9,6 @@ class CreateMeritBadges < ActiveRecord::Migration<%= migration_version %>
       t.string :difficulty
       t.boolean :active, default: true
       t.references :user, limit: 8, foreign_key: true, index: true, null: true
-      t.references :root_account, foreign_key: { to_table: 'accounts'}, limit: 8, null: false, index: true
 
       t.timestamps
     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/generators/templates/badge.erb

@@ -1,6 +1,9 @@
 ### QALAM_MERIT ###
 class Merit::Badge < ActiveRecord::Base
+  # include Workflow
+  # include Context
   self.table_name = "merit_badges"
+  @valid_images = ["image/jpeg", "image/png", "image/bmp", "image/jpg"]
 
   before_validation :strip_whitespace
   def strip_whitespace
@@ -8,19 +11,27 @@ class Merit::Badge < ActiveRecord::Base
     self.description = self.description.strip unless self.description.nil?
   end
 
-  validates :root_account_id, presence: true
-  validates :name, presence: true, length: { minimum: 3, maximum: 10 }
+  validates :name, presence: true, length: { minimum: 3, maximum: 20 }
   validates :points, presence: true, numericality: true, :inclusion => 1..100
-  validates :description, presence: false, length: { maximum: 50 }
+  validates :description, presence: true, length: { minimum: 3, maximum: 50 }
 
   has_one :image, :class_name => 'Attachment', :as => :context, :inverse_of => :context, :dependent => :destroy
-  belongs_to :root_account, foreign_key: "root_account_id", class_name: 'Account'
   belongs_to :created_by, foreign_key: "user_id", class_name: 'User'
-  has_many :badges_sashes, class_name: 'Merit::QalamBadgeSash'
-  has_many :sashes, through: :badges_sashes, source: :sash
 
   def image_url
-    # self.image.public_url if self.image
+    if self.image
+      return self.image.public_url
+    else
+      return '/images/apple-touch-icon.png' 
+    end
+  end
+
+  def self.valid_images
+    @valid_images
+  end
+
+  def badges_sashes
+    Merit::BadgesSash.where(badge_id: self.id)
   end
 
   class << self
@@ -47,9 +58,6 @@ class Merit::Badge < ActiveRecord::Base
       badge
     end
 
-    # Defines Badge#meritable_models method, to get related
-    # entries with certain badge. For instance, Badge.find(3).users
-    # orm-specified
     def _define_related_entries_method(meritable_class_name)
       define_method(:"#{meritable_class_name.underscore.pluralize}") do
         sashes = Merit::QalamBadgeSash.where(badge_id: id).pluck(:sash_id)
@@ -58,11 +66,19 @@ class Merit::Badge < ActiveRecord::Base
     end
 
     def create_with_attachment(account, badge, attachment)
-      account.shard.activate do
-        att = Attachment.create_data_attachment(badge, attachment)
-        badge.image = att
-        badge.save!
-        badge
+      return true if ((attachment.nil? || attachment.to_s == "null") || account.nil? || badge.nil?)
+      if attachment.content_type && @valid_images.include?(attachment.content_type)
+        account.shard.activate do
+          att = Attachment.create_data_attachment(badge, attachment)
+          badge.image = att
+          badge.save!
+          badge
+        end
+        return true
+      else
+        badge.errors.add(:image, :invalid_format, message: 'invalid image format')
+        badge.destroy if badge.id
+        return false
       end
     end
   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::QalamScore'
-      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.03'
+  s.version     = '4.5.08'
   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.03
+  version: 4.5.08
 platform: ruby
 authors:
 - Tute Costa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk