next_sges 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f45f4687f1117338ffd1c165b005dd44fe0cb08e
-  data.tar.gz: f821d67bf1ede7599003d67a75bf6762916202b5
+  metadata.gz: 5705f53ab15600584e06babc0bca55d3f25b2976
+  data.tar.gz: ad46b931f15b7ba67430281329cf02ba32f09d30
 SHA512:
-  metadata.gz: 46c6a372160b8411784b921442d316bb476418d03c1629aade08233cc068ffaef6949011726318f20edb8e4cffb99a4737924a97f73f85ece1d552a3bd2c704b
-  data.tar.gz: 8baa5de47b4a149174e742c05b6bc05b6fec71e88c908b85d5d3efbd215dd8e6198efae0a5087b514f99d1be4d0783c1680c10a3c75dc7e3845a9718ab57ea47
+  metadata.gz: '058c6df08526616b9f8ef1b8a55e86776a654dffe10e47ff38ada2a853b39d125b200f1bd4edab5fdb11c770548af3623e0d0cea4e244891327f153819ffc951'
+  data.tar.gz: 3fdab0c54c7caa6f371ef8d4aad2f87668df67899abaa4be9cab248a68f2cb65670383517e26df4bf02eb5f76e45e3764fc78dbedda4391d7539cfd7e42b67d6

data/app/models/next_sges/collection_type.rb

@@ -9,6 +9,11 @@ module NextSges
     enum status: {inactive: 0, active: 1}
     # END
 
+    def self.latest_codes
+      latest_ids = NextSges::CollectionType.all.group_by{|type| type.code}.map{|code, types| types.sort_by{|type| type.created_at}.last.id}.flatten.compact.uniq
+      where(id: latest_ids)
+    end
+
     # BEGIN instance methods
     def map_for_select(method_name = :name)
       super(:name)
@@ -23,8 +28,8 @@ module NextSges
     # END
 
     # BEGIN Validations
-    validates_presence_of :name, :value, :frequency, :category, :school_id, :status
-    validates_uniqueness_of :name
+    validates_presence_of :name, :value, :frequency, :category, :school_id, :status, :code
+    # validates_uniqueness_of :name, scope: [:school_id]
     validates :value, numericality: {greater_than: 0}
     validates :first_fine_percentage, :first_fine_after, :second_fine_percentage, :second_fine_after, :second_child_discount, :third_child_discount, :annual_payment_discount, numericality: {greater_then_or_equal: 0}
     # END
@@ -32,5 +37,14 @@ module NextSges
     # BEGIN Validation methods
     # END
 
+    before_create :increment_code
+
+
+    def increment_code
+      if code == 0 || code.nil?
+        self.code = (NextSges::CollectionType.all.sort_by(&:code).last&.code || 0) + 1
+      end
+    end
+
   end
 end

data/app/models/next_sges/student.rb

@@ -8,7 +8,7 @@ module NextSges
     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}
+    enum identification_type: {identification_card: 0, identification: 1, passport: 2}
     enum gender: {male: 0, female: 1}
 
     attr_accessor :aux_types_ids

data/db/migrate/20180301082915_add_code_to_next_sges_collection_types.rb

@@ -0,0 +1,8 @@
+class AddCodeToNextSgesCollectionTypes < ActiveRecord::Migration[5.1]
+  def change
+    add_column :next_sges_collection_types, :code, :integer, default: 0, null: false
+    NextSges::CollectionType.all.each_with_index do |type, index|
+      type.update_columns(code: index + 1)
+    end
+  end
+end

data/lib/next_sges/version.rb

@@ -1,3 +1,3 @@
 module NextSges
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_sges
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - NEXTBSS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -199,6 +199,7 @@ files:
 - db/migrate/20180227075126_fix_responisble_on_deposit.rb
 - db/migrate/20180227232928_add_colletion_date_to_next_sges_schools.rb
 - db/migrate/20180228104835_add_email_text_settings_to_next_sges_schools.rb
+- db/migrate/20180301082915_add_code_to_next_sges_collection_types.rb
 - lib/next_sges.rb
 - lib/next_sges/engine.rb
 - lib/next_sges/version.rb