subj_models 0.5.3 → 0.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 958eb3c88e4357f059d9a8927db46350878a4f17
4
- data.tar.gz: 582937b4853a504f34e6a33f21ec3232dfa19094
3
+ metadata.gz: 6582d499a1655d61b1817f445f144415b70bfaff
4
+ data.tar.gz: 14572b5ce0dbad50f1e0fa1906cfa0de99efa002
5
5
  SHA512:
6
- metadata.gz: e693532fbe0e4c003034b410e54b5032fdaae5c18da50d38e42ecee6e5a71f42d1330dd1845c372ef91c5637980547077ddf5616fa25e55badc99054128906f6
7
- data.tar.gz: 7c44584ddde51d6ddaf9f4fd782138ab4d919406a4697d01c414f25277184f8d9f4bb93c6dd1f31898a7f2f808d8f6395c7c5497d0a3f63bbe61a56777b970f9
6
+ metadata.gz: 718f54ad42d977202c058ab280bfddce429401e2c06127cffd071d555d769a92229bf84253799bfe59d53f1d0309e83650323804809cadc6736b702645b9f341
7
+ data.tar.gz: d17abfbaf6b9650d35ca258ba04fc05f8d1883866e78f28c44c22edc4b3840e16ea6b53c92432b4b0ef22f8bad7a3631df9bc72f2f37aaedb284b801ffbe4dd2
@@ -43,6 +43,10 @@ module SubjModels
43
43
  end
44
44
  end
45
45
 
46
+ scope :has_events, -> do
47
+ joins(events: :event_schedule).where('event_schedules.event_date >= ?', DateTime.now.beginning_of_day).uniq
48
+ end
49
+
46
50
  end
47
51
 
48
52
  end
@@ -28,8 +28,8 @@ module SubjModels
28
28
  validates :document_file, :title, presence: true
29
29
 
30
30
  scope :from_today, -> {
31
- joins(:event_schedule).where('event_schedules.event_date >= ?', DateTime.now.beginning_of_day )
32
- .order( 'event_schedules.event_date ASC' )
31
+ Event.joins(:event_schedule).where('event_schedules.event_date >= ?', DateTime.now.beginning_of_day )
32
+ .includes(:event_schedule).order( 'event_schedules.event_date ASC' ).uniq
33
33
  }
34
34
 
35
35
  scope :where_nomenclature_ids, -> (ids) do
@@ -1,3 +1,3 @@
1
1
  module SubjModels
2
- VERSION = "0.5.3"
2
+ VERSION = "0.5.4"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: subj_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.3
4
+ version: 0.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Denys Dvoriashyn
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-12-01 00:00:00.000000000 Z
11
+ date: 2016-12-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler