qalam_merit 4.5.04 → 4.5.05
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/merit/generators/merit_generator.rb +4 -2
- data/lib/merit/models/active_record/qalam_score.rb +11 -5
- data/qalam_merit.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 36dd98bb62a667ae5b42ca9edb1a6aa9d547a139d268f9da523476937d61d077
|
|
4
|
+
data.tar.gz: 3d36fe5887fc5844b4e13f342e73216d7fc8ab1f6d70e1a458437c9b86fd247e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b797616130749f3f74ad7b2737dc32461866896547f32f9039d56474f309d20a07113a42f0fa3dd0af105450b511455ff4b769a517d5656885cdfc56194c6780
|
|
7
|
+
data.tar.gz: 26bc8ce7e1adcee901aaa6f929a0e89d73d22b7088c30cc5321c1369ca4528593417a48336ff6e31b5c03d94505adc6df3701a92bd9f825e1828db0da6d3638b
|
|
@@ -8,8 +8,10 @@ module Merit
|
|
|
8
8
|
def inject_merit_content
|
|
9
9
|
if model_exists?
|
|
10
10
|
inject_into_class(model_path, class_name, " ### END ###\n\n")
|
|
11
|
-
inject_into_class(model_path, class_name, " has_many :created_badges, class_name: 'Merit::Badge'\n")
|
|
12
|
-
inject_into_class(model_path, class_name, "
|
|
11
|
+
inject_into_class(model_path, class_name, " has_many :created_badges, class_name: 'Merit::Badge', :dependent => :destroy\n")
|
|
12
|
+
inject_into_class(model_path, class_name, " has_many :assigned_badges, through: :sash, source: :badges, :dependent => :destroy\n")
|
|
13
|
+
inject_into_class(model_path, class_name, " has_many :badges_sashes, through: :sash, source: :badges_sashes, :dependent => :destroy\n")
|
|
14
|
+
inject_into_class(model_path, class_name, " belongs_to :sash, foreign_key: 'sash_id', class_name: 'Merit::Sash', :dependent => :destroy\n")
|
|
13
15
|
inject_into_class(model_path, class_name, " has_merit\n")
|
|
14
16
|
inject_into_class(model_path, class_name, " ### QALAM_MERIT ###\n")
|
|
15
17
|
end
|
|
@@ -1,18 +1,24 @@
|
|
|
1
1
|
module Merit::Models::ActiveRecord
|
|
2
2
|
class QalamScore < ActiveRecord::Base
|
|
3
3
|
self.table_name = :merit_scores
|
|
4
|
-
belongs_to :sash
|
|
4
|
+
belongs_to :sash,
|
|
5
|
+
foreign_key: "sash_id",
|
|
6
|
+
class_name: 'Merit::Sash'
|
|
5
7
|
has_many :score_points,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
+
dependent: :destroy,
|
|
9
|
+
foreign_key: "score_id",
|
|
10
|
+
class_name: 'Merit::QalamScore::Point'
|
|
8
11
|
|
|
9
12
|
def points
|
|
10
13
|
score_points.group(:score_id).sum(:num_points).values.first || 0
|
|
11
14
|
end
|
|
12
15
|
|
|
13
16
|
class Point < ActiveRecord::Base
|
|
14
|
-
|
|
15
|
-
|
|
17
|
+
self.table_name = :merit_score_points
|
|
18
|
+
belongs_to :score,
|
|
19
|
+
foreign_key: "score_id",
|
|
20
|
+
class_name: 'Merit::QalamScore'
|
|
21
|
+
has_one :sash, through: :score, source: :sash
|
|
16
22
|
has_many :activity_logs,
|
|
17
23
|
class_name: 'Merit::ActivityLog',
|
|
18
24
|
as: :related_change
|
data/qalam_merit.gemspec
CHANGED
|
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
|
|
|
6
6
|
s.files = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
|
|
7
7
|
s.test_files = `git ls-files -- test/*`.split("\n")
|
|
8
8
|
s.license = 'MIT'
|
|
9
|
-
s.version = '4.5.
|
|
9
|
+
s.version = '4.5.05'
|
|
10
10
|
s.authors = ["Tute Costa", "Ahmed Abdelhamid"]
|
|
11
11
|
s.email = ['tutecosta@gmail.com', 'a.hamid@nezam.io']
|
|
12
12
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: qalam_merit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.5.
|
|
4
|
+
version: 4.5.05
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Tute Costa
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2021-
|
|
12
|
+
date: 2021-03-01 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: zeitwerk
|