unidom-score 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cfeebbf96334fb6987b64e4e7e3f0381ebf88b4
-  data.tar.gz: 19b1d37f28aef129b3a1f417a218b018be2a53dd
+  metadata.gz: 2c9e9abc9735560e70d40caaaab8208a16dc313e
+  data.tar.gz: 455934053a55e4826d4a250de25764f214af6ee8
 SHA512:
-  metadata.gz: bc1eb6fbf42fba9c165a2d5016f6263bc1e19419599b56160856930776053290c7977038f52a5cf22e14fc91cfa25de3b0bebc961f28d43528d047511c43d022
-  data.tar.gz: f84108fd3345b3ca4801ac0a00550dd8eda61cb01641b09f478f5c6bea2670decd053d43855dc8920ed6c56fb91e6c6a7d37c2a4f774318bee22fb5d2a2f0df7
+  metadata.gz: b335368d1bddabf333377fefb56a9a72158a66000ddf91f0af06b9ba5fdba0e97d0b7b55815e6277e693e35e48992046774309c58b61c22bc7ec6c6a7d6998e3
+  data.tar.gz: 361ff3c5a773d5c322065b6e5cc7dfb12ac6368f267f7f1edec93a589432a3896cb9382d5584d7c62e47c94646a27a0408f525b6c48e02778fa91e070321a40f

data/README.md

@@ -36,7 +36,14 @@ The migration versions start with 200601.
 ## Call the Model
 
 ```ruby
+company  = Unidom::Party::Company.create! name: 'Xerox'
+template = Unidom::Score::ScoreSheetTemplate.create! subject: company, name: 'Survey 2003', total_score: 100
+
 scorer       = Unidom::Party::Person.create! name: 'Tim'
 score_keeper = Unidom::Party::Shop.create!   name: 'WalMart'
-score_sheet  = Unidom::Score::ScoreSheet.score! scorer: scorer, score_keeper: score_keeper, template: nil, name: nil, score: 98, scored_on: Date.current, opened_at: Time.now, description: nil, instruction: nil
+score_sheet  = Unidom::Score::ScoreSheet.score! scorer: scorer, score_keeper: score_keeper, template: template, name: nil, score: 98, scored_on: Date.current, opened_at: Time.now, description: nil, instruction: nil
+# The template could be nil
+
+item_1 = Unidom::Score::ScoreItem.score! sheet: score_sheet, scorer: score_sheet.try(:scorer), template: nil, title: template.try(:title), score: 59, scored_on: Date.current, opened_at: Time.now, description: nil, instruction: nil
+item_2 = Unidom::Score::ScoreItem.score! sheet: score_sheet, scorer: score_sheet.try(:scorer), template: nil, title: template.try(:title), score: 39, scored_on: Date.current, opened_at: Time.now, description: nil, instruction: nil
 ```

data/app/models/unidom/score/score_item.rb

@@ -20,8 +20,8 @@ class Unidom::Score::ScoreItem < Unidom::Score::ApplicationRecord
   scope :template_is, ->(template) { where template_id: to_id(template) }
   scope :scored_by,   ->(scorer)   { where scorer:      scorer          }
 
-  def self.score!(sheet: nil, scorer: nil, template: nil, name: template.try(:name), score: 0, scored_on: Date.current, opened_at: Time.now, description: nil, instruction: nil)
-    create! sheet: sheet, scorer: scorer, template: template, name: name, score: score, scored_on: scored_on, opened_at: opened_at, description: description, instruction: instruction
+  def self.score!(sheet: nil, scorer: sheet.try(:scorer), template: nil, title: template.try(:title), score: 0, scored_on: Date.current, opened_at: Time.now, description: nil, instruction: nil)
+    create! sheet: sheet, scorer: scorer, template: template, title: title, score: score, scored_on: scored_on, opened_at: opened_at, description: description, instruction: instruction
   end
 
 end

data/app/models/unidom/score/score_sheet.rb

@@ -16,7 +16,7 @@ class Unidom::Score::ScoreSheet < Unidom::Score::ApplicationRecord
   belongs_to :scorer,       polymorphic: true
   belongs_to :score_keeper, polymorphic: true
 
-  has_many :score_items, class_name: 'Unidom::Score::ScoreItem'
+  has_many :items, class_name: 'Unidom::Score::ScoreItem', foreign_key: :score_sheet_id
 
   scope :template_is,   ->(template)     { where template_id:  to_id(template) }
   scope :scored_by,     ->(scorer)       { where scorer:       scorer          }

data/app/models/unidom/score/score_sheet_template.rb

@@ -0,0 +1,21 @@
+# Score Sheet Tempalte 是评分表模版。
+# #template 是评分表模版。
+# #scorer 是评分者。
+# #score_keeper 是得分者。
+
+class Unidom::Score::ScoreSheetTemplate < Unidom::Score::ApplicationRecord
+
+  self.table_name = 'unidom_score_sheet_templates'
+
+  include Unidom::Common::Concerns::ModelExtension
+
+  validates :name,        allow_blank: true, length: { in: 2..columns_hash['name'].limit }
+  validates :total_score, presence:    true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+
+  belongs_to :subject, polymorphic: true
+
+  has_many :sheets, class_name: 'Unidom::Score::ScoreSheet'
+
+  scope :subject_is, ->(subject) { where subject: subject }
+
+end

data/db/migrate/20060101000000_create_unidom_score_sheet_templates.rb

@@ -0,0 +1,30 @@
+class CreateUnidomScoreSheetTemplates < ActiveRecord::Migration
+
+  def change
+
+    create_table :unidom_score_sheet_templates, id: :uuid do |t|
+
+      t.references :subject, type: :uuid, null: false,
+        polymorphic: { null: false, default: '', limit: 200 }
+
+      t.string  :name,        null: true,  default: nil, limit:     200
+      t.decimal :total_score, null: false, default: 0.0, precision: 12, scale: 2
+
+      t.text :description
+      t.text :instruction
+
+      t.column   :state, 'char(1)', null: false, default: 'C'
+      t.datetime :opened_at,        null: false, default: Time.utc(1970)
+      t.datetime :closed_at,        null: false, default: Time.utc(3000)
+      t.boolean  :defunct,          null: false, default: false
+      t.jsonb    :notation,         null: false, default: {}
+
+      t.timestamps null: false
+
+    end
+
+    add_index :unidom_score_sheet_templates, :subject_id
+
+  end
+
+end

data/db/migrate/20060112000000_create_unidom_score_items.rb

@@ -26,9 +26,9 @@ class CreateUnidomScoreItems < ActiveRecord::Migration
 
     end
 
-    add_index :unidom_score_sheets, :score_sheet_id
-    add_index :unidom_score_sheets, :score_item_template_id
-    add_index :unidom_score_sheets, :scorer_id
+    add_index :unidom_score_items, :score_sheet_id
+    add_index :unidom_score_items, :score_item_template_id
+    add_index :unidom_score_items, :scorer_id
 
   end
 

data/lib/unidom/score/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Score
-    VERSION = '0.2'.freeze
+    VERSION = '0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-score
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -46,8 +46,10 @@ files:
 - app/models/unidom/score/application_record.rb
 - app/models/unidom/score/score_item.rb
 - app/models/unidom/score/score_sheet.rb
+- app/models/unidom/score/score_sheet_template.rb
 - app/views/layouts/unidom/score/application.html.erb
 - config/routes.rb
+- db/migrate/20060101000000_create_unidom_score_sheet_templates.rb
 - db/migrate/20060111000000_create_unidom_score_sheets.rb
 - db/migrate/20060112000000_create_unidom_score_items.rb
 - lib/tasks/score_tasks.rake