next_sges 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357f59de966cac997f49fd28d49021d3a01838a7
-  data.tar.gz: 810c6356f03577e216708500f8eb1a5ba20d81fa
+  metadata.gz: 11b37e38c792857537cad669d29eeea53c0d19fa
+  data.tar.gz: 35a541d412bb53d91f2ff3c3ace9e3d03fb8bd04
 SHA512:
-  metadata.gz: 208b89055b0c8d9ddb2f4c4a4b276917260d17c50a352ceeb758cd8069354c7994f19a83ad19fec0afd6e4a88fecff422832921c8abdced8f127cb7585954832
-  data.tar.gz: 3da2da001ac7b8df04b042c297602419c71686e40158a1b5675078a1967bd1c4cbe3af39ddba40c2bebbd3e21b49cef005e6c5d54150bf855b44fdddc013f025
+  metadata.gz: 49f60b7bd91581f8204b42a8ab97013676155a1aca6fe7a1887413ac65b1db3bbfe6291b93cdbab03a3369b7364a20b1bd393c629084137a6f9cb5688ffa09a9
+  data.tar.gz: fd5540dc5846c88544f4603377c361e2d71a49ca8dfcfb9477b8b680e127b5dfb43c0eb81d6a88535a5b9691f4991578d45ffc0fb6d1ca23b5a6d2a2d569624e

data/app/models/next_sges/collection_note.rb

@@ -4,6 +4,8 @@ module NextSges
     belongs_to :school
     has_many :collection_note_items, dependent: :destroy
     has_many :deposits
+    has_many :responsibles, through: :student
+    has_many :collection_note_responsibles
 
     enum status: {inactive: 0, active: 1, paid: 2}
     INITIAL_LETTER = "F"
@@ -25,8 +27,7 @@ module NextSges
         active!
       elsif paid?
         if active!
-          encharged = student.parent
-          encharged.update_columns(account_balance: encharged.account_balance + value)
+          collection_note_responsibles.each(&:destroy)
         end
         # TODO, Make code to return money address
       end
@@ -38,14 +39,21 @@ module NextSges
       inactive!
     end
 
+
     # Mark collection note to paid
-    def pay
+    def pay(responsible)
       return unless can_pay?
       if paid!
-        encharged = student.parent
-        encharged.update_columns(account_balance: encharged.account_balance - value)
+        responsible.update_columns(account_balance: responsible.account_balance - value)
+      end
+    end
+
+    # pays the collection note with this responsible balance
+    def responsible_pay(responsible)
+      return unless can_responsible_pay?(responsible)
+      if paid!
+        ::CollectionNoteResponsible.create(responsible_id: responsible.id, collection_note_id: id, value: value)
       end
-      # Make Code to move money
     end
 
     # Set Collection note to active
@@ -58,10 +66,19 @@ module NextSges
       active?
     end
 
-    # Mark Collection note to paid
+    #TODO, Remove## Mark Collection note to paid
     def can_pay?
-      active? && student.parent.account_balance >= value
+      active? #&& student.parent.account_balance >= value
     end
+
+    def can_responsible_pay?(responsible)
+      active? && responsible.account_balance >= value
+    end
+
+    def responsibles_that_can_pay
+      responsibles.active.where("account_balance >= ?", value)
+    end
+
     validates_presence_of :student_id, :school_id
     before_create :create_number
   end

data/app/models/next_sges/collection_note_item.rb

@@ -116,7 +116,7 @@ module NextSges
       ob_coll_type = collection_type
       ob_student = student
       ob_school = school
-      students_number = student.parent.students.size
+      students_number = 0#student.number #parent.students.size
       discount = 0
       desc = ''
 

data/app/models/next_sges/deposit.rb

@@ -1,6 +1,6 @@
 module NextSges
   class Deposit < NextSges::ApplicationRecord
-    belongs_to :parent
+    belongs_to :responsible, class_name: ::Responsible.name
     belongs_to :school
     belongs_to :collection_note, optional: true
 
@@ -9,7 +9,7 @@ module NextSges
 
     INITIAL_LETTER = "D"
 
-    validates_presence_of :value, :school_id
+    validates_presence_of :value, :school_id, :responsible_id
     validates_numericality_of :value, greater_than: 0
 
     before_create :create_number
@@ -18,12 +18,12 @@ module NextSges
 
     private
     def increase_parent_balance
-      encharged = parent
+      encharged = responsible
       encharged.update_columns(account_balance: encharged.account_balance + value)
     end
 
     def decrease_parent_balance
-      encharged = parent
+      encharged = responsible
       encharged.update_columns(account_balance: encharged.account_balance - value)
     end
 

data/app/models/next_sges/school.rb

@@ -1,12 +1,16 @@
 module NextSges
   class School < NextSges::ApplicationRecord
-    has_many :parents, dependent: :destroy
+    #has_many :parents, dependent: :destroy
     has_many :students, dependent: :destroy
     has_many :collection_types, dependent: :destroy
     has_many :collection_notes, dependent: :destroy
     has_many :collection_note_items, dependent: :destroy
     has_many :deposits, dependent: :destroy
-    has_many :responsible_others, dependent: :destroy
+    #has_many :responsible_others, dependent: :destroy
+    has_many :responsibles, dependent: :destroy, class_name: Responsible.name
+    has_many :student_responsibles, through: :responsibles, class_name: StudentResponsible.name
+    has_many :student_responsible_periods, through: :student_responsibles, class_name: StudentResponsiblePeriod.name
+    
     INITIAL_LETTER = "C"
 
     def name_and_number

data/app/models/next_sges/student.rb

@@ -1,7 +1,11 @@
 module NextSges
   class Student < NextSges::ApplicationRecord
-    belongs_to :parent, optional: true
+    #belongs_to :parent, optional: true
     belongs_to :school
+    has_many :collection_notes
+    has_many :student_responsibles, dependent: :destroy, class_name: StudentResponsible.name
+    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: DEFAULT_IDENTIFICATION_ENUM
@@ -22,6 +26,10 @@ module NextSges
       "#{number} - #{first_and_last_name}"
     end
 
+    def not_associated_responsibles
+      ::Responsible.where(school_id: school_id).where.not(id: responsibles.ids)
+    end
+
     # validates_presence_of :parent_id
     validate :student_services
     before_create :create_number

data/db/migrate/20180221140558_add_responsible_to_next_sges_deposits.rb

@@ -0,0 +1,5 @@
+class AddResponsibleToNextSgesDeposits < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :next_sges_deposits, :responsible, foreign_key: {to_table: :next_sges_deposits}
+  end
+end

data/db/migrate/20180227075126_fix_responisble_on_deposit.rb

@@ -0,0 +1,6 @@
+class FixResponisbleOnDeposit < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :next_sges_deposits, :responsible_id
+    add_reference :next_sges_deposits, :responsible, foreign_key: {to_table: :responsibles}
+  end
+end

data/lib/next_sges/version.rb

@@ -1,3 +1,3 @@
 module NextSges
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_sges
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - NEXTBSS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,6 +195,8 @@ files:
 - db/migrate/20180216140129_add_collection_note_to_deposits.rb
 - db/migrate/20180219135538_add_birthday_to_parents.rb
 - db/migrate/20180219135554_add_gender_to_students.rb
+- db/migrate/20180221140558_add_responsible_to_next_sges_deposits.rb
+- db/migrate/20180227075126_fix_responisble_on_deposit.rb
 - lib/next_sges.rb
 - lib/next_sges/engine.rb
 - lib/next_sges/version.rb