next_sges 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76ef9e87db3d81905ab791e4bca8b56ebb5dd63
-  data.tar.gz: 0d12af3d531db1444101ffc945cd16f8951eac87
+  metadata.gz: 4e1e2fe476e2ed414447d2286d54973b0d7c003b
+  data.tar.gz: c4276ba6b82c64ae53846c956d832d53f333290e
 SHA512:
-  metadata.gz: 017c73a922067cff90ef9bc92a45ebcccaf16cb9b01ae970831c49a78e2699e31cd0014d5156ec28ddaa610d81d0e2f7e6b91befaaa53ce057af633af58c7086
-  data.tar.gz: 4ac56e9fea706fe7fb5b2746f4a522cc4104736fb092f6855dd64496c72d080ead94ebd63ac9eb939bf48d2ee44c3bf8cac4e034def62cb772af569d9cb1f415
+  metadata.gz: 9096ebdb1db942dffd62a05fa213908103d531bad8f2cc6aef88ca59240cb312a56deae35146ffd875ec966a89c85871734c626c2b670bcb3dbd121f7d6104cf
+  data.tar.gz: e7a319c7e438ad373ccfe3ee0afa84179ae0ff525c992fd47ed0177e12fe369f524eab70b92be890e04fca6dd7a9e9d5114222a46ebec4c9ad9850eee77eff9b

data/app/models/next_sges/school.rb

@@ -12,11 +12,17 @@ module NextSges
     has_many :student_responsible_periods, through: :student_responsibles, class_name: StudentResponsiblePeriod.name
     has_many :bank_accounts, as: :owner
 
-    has_many :other_services, dependent: :destroy, class_name: OtherService.name
     has_many :cycles, dependent: :destroy, class_name: Cycle.name
     has_many :class_rooms, dependent: :destroy, class_name: ClassRoom.name
     has_many :student_class_rooms, through: :class_rooms, class_name: StudentClassRoom.name
 
+    has_many :collaborator_schools, dependent: :destroy, class_name: CollaboratorSchool.name
+    has_many :collaborators, through: :collaborator_schools, class_name: Collaborator.name
+    has_many :collaborator_class_rooms, dependent: :destroy, class_name: CollaboratorClassRoom.name
+
+
+    # has_and_belongs_to_many :collaborators, association_foreign_key: :collaborator_id, foreign_key: :next_sges_school_id
+
 
 
     INITIAL_LETTER = "C"

data/app/models/next_sges/student.rb

@@ -12,13 +12,25 @@ module NextSges
     has_many :responsibles, through: :student_responsibles, class_name: Responsible.name
     has_many :student_responsible_periods, through: :student_responsibles, class_name: StudentResponsiblePeriod.name
     has_and_belongs_to_many :collection_types, association_foreign_key: :next_sges_collection_type_id, foreign_key: :next_sges_student_id
+
     enum relation: {son: 0, other: 1}
     enum identification_type: {identification_card: 0, identification: 1, passport: 2}
     enum gender: {male: 0, female: 1}
+    enum status: {active: 0, inactive: 1}
+
     scope :student_name, -> (data) {data.present? ? where(id: [data].flatten.compact.uniq.map{|f| f.split(',,,')}.flatten.uniq) : all}
     scope :student_number, -> (data) {data.present? ? where(number: [data].flatten.compact.uniq.map{|f| f.split(',,,')}.flatten.uniq) : all}
 
+    scope :student_cycle, -> (data) {data.present? ? where(id: Cycle.find_by(id: [data].flatten.compact.uniq.map{|f| f.split(',,,')}.flatten.uniq).students.ids) : all}
+    scope :student_class_room_id, -> (data) {data.present? ? where(id: [data].flatten.compact.uniq.map{|f| f.split(',,,')}.flatten.uniq) : all}
+    scope :student_status, -> (data){data.present? ? where(status: data) : all}
+
+
+
 
+    # def self.student_cycle(l)
+    #   # where('extract(year from updated_at) = ?', DateTime.now.year)
+    # end
 
     attr_accessor :aux_types_ids
     INITIAL_LETTER = "A"

data/lib/next_sges/version.rb

@@ -1,3 +1,3 @@
 module NextSges
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_sges
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - NEXTBSS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails