unidom-score 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9e9abc9735560e70d40caaaab8208a16dc313e
-  data.tar.gz: 455934053a55e4826d4a250de25764f214af6ee8
+  metadata.gz: 3d8181349266ef32d4541da8cc80fbd3f99bb0cc
+  data.tar.gz: 7efba97555ffc2d5b331aefa9c0fa217ab989ae5
 SHA512:
-  metadata.gz: b335368d1bddabf333377fefb56a9a72158a66000ddf91f0af06b9ba5fdba0e97d0b7b55815e6277e693e35e48992046774309c58b61c22bc7ec6c6a7d6998e3
-  data.tar.gz: 361ff3c5a773d5c322065b6e5cc7dfb12ac6368f267f7f1edec93a589432a3896cb9382d5584d7c62e47c94646a27a0408f525b6c48e02778fa91e070321a40f
+  metadata.gz: dc6599866a95d476f255d623716f6b4f74aaf7f4fde739bcf5327157297346bda71923c87500e7ca9b908440d020a1f301686008f57b2f30f2c8cf4ce98859ed
+  data.tar.gz: a8713c30552a6870496b66f60c3d5d9d71475e5ed8a7af324c87040d9c90c6f7419ec7e321fbe3be4174bda3e59e917f85b99c0eb56f821e7d3747c9f9015963

data/README.md

@@ -37,13 +37,17 @@ The migration versions start with 200601.
 
 ```ruby
 company  = Unidom::Party::Company.create! name: 'Xerox'
-template = Unidom::Score::ScoreSheetTemplate.create! subject: company, name: 'Survey 2003', total_score: 100
+sheet_template = Unidom::Score::ScoreSheetTemplate.create! subject: company, name: 'Survey 2003', total_score: 100
+
+item_template_1 = Unidom::Score::ScoreItemTemplate.create! sheet: sheet_template, title: 'Q1: What is your name?', score: 60
+item_template_2 = Unidom::Score::ScoreItemTemplate.create! sheet: sheet_template, title: 'Q2: How old are you?', score: 40
 
 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: template, 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: sheet_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
+item_1 = Unidom::Score::ScoreItem.score! sheet: score_sheet, scorer: score_sheet.try(:scorer), template: item_template_1, title: item_template_1.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: item_template_2, title: item_template_2.try(:title), score: 39, scored_on: Date.current, opened_at: Time.now, description: nil, instruction: nil
+# The template could be nil
 ```

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

@@ -1,7 +1,7 @@
 # Score Item 是评分项。
+# #sheet 是评分表。
 # #template 是评分项模版。
 # #scorer 是评分者。
-# #score_keeper 是得分者。
 
 class Unidom::Score::ScoreItem < Unidom::Score::ApplicationRecord
 
@@ -12,11 +12,11 @@ class Unidom::Score::ScoreItem < Unidom::Score::ApplicationRecord
   validates :title, allow_blank: true, length: { in: 2..columns_hash['title'].limit }
   validates :score, presence:    true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
 
-  belongs_to :sheet,    class_name:  'Unidom::Score::ScoreSheet',        foreign_key: :score_sheet_id
-  belongs_to :template, class_name:  'Unidom::Score::ScoreItemTemplate', foreign_key: :score_item_template_id
+  belongs_to :sheet,    class_name:  'Unidom::Score::ScoreSheet',        foreign_key: :sheet_id
+  belongs_to :template, class_name:  'Unidom::Score::ScoreItemTemplate', foreign_key: :template_id
   belongs_to :scorer,   polymorphic: true
 
-  scope :sheet_is,    ->(sheet)    { where sheet:       sheet           }
+  scope :sheet_is,    ->(sheet)    { where sheet_id:    to_id(sheet)    }
   scope :template_is, ->(template) { where template_id: to_id(template) }
   scope :scored_by,   ->(scorer)   { where scorer:      scorer          }
 

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

@@ -0,0 +1,20 @@
+# Score Item Tempalte 是评分项模版。
+# #sheet 是评分表模版。
+# #scorings 是评分项。
+
+class Unidom::Score::ScoreItemTemplate < Unidom::Score::ApplicationRecord
+
+  self.table_name = 'unidom_score_item_templates'
+
+  include Unidom::Common::Concerns::ModelExtension
+
+  validates :title, presence: true, length: { in: 2..columns_hash['title'].limit }
+  validates :score, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+
+  belongs_to :sheet, class_name: 'Unidom::Score::ScoreSheetTemplate'
+
+  has_many :scorings, class_name: 'Unidom::Score::ScoreItem', foreign_key: :template_id
+
+  scope :sheet_is, ->(sheet) { where sheet_id: to_id(sheet) }
+
+end

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

@@ -2,6 +2,7 @@
 # #template 是评分表模版。
 # #scorer 是评分者。
 # #score_keeper 是得分者。
+# #items 是评分项。
 
 class Unidom::Score::ScoreSheet < Unidom::Score::ApplicationRecord
 
@@ -12,11 +13,11 @@ class Unidom::Score::ScoreSheet < Unidom::Score::ApplicationRecord
   validates :name,  allow_blank: true, length: { in: 2..columns_hash['name'].limit }
   validates :score, presence:    true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
 
-  belongs_to :template,     class_name:  'Unidom::Score::ScoreSheetTemplate', foreign_key: :score_sheet_template_id
+  belongs_to :template,     class_name:  'Unidom::Score::ScoreSheetTemplate', foreign_key: :template_id
   belongs_to :scorer,       polymorphic: true
   belongs_to :score_keeper, polymorphic: true
 
-  has_many :items, class_name: 'Unidom::Score::ScoreItem', foreign_key: :score_sheet_id
+  has_many :items, class_name: 'Unidom::Score::ScoreItem', foreign_key: :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

@@ -1,7 +1,7 @@
 # Score Sheet Tempalte 是评分表模版。
-# #template 是评分表模版。
-# #scorer 是评分者。
-# #score_keeper 是得分者。
+# #subject 是主题。
+# #items 是评分项模版。
+# #scorings 是评分表。
 
 class Unidom::Score::ScoreSheetTemplate < Unidom::Score::ApplicationRecord
 
@@ -14,7 +14,8 @@ class Unidom::Score::ScoreSheetTemplate < Unidom::Score::ApplicationRecord
 
   belongs_to :subject, polymorphic: true
 
-  has_many :sheets, class_name: 'Unidom::Score::ScoreSheet'
+  has_many :items,    class_name: 'Unidom::Score::ScoreItemTemplate', foreign_key: :sheet_id
+  has_many :scorings, class_name: 'Unidom::Score::ScoreSheet',        foreign_key: :template_id
 
   scope :subject_is, ->(subject) { where subject: subject }
 

data/db/migrate/20060102000000_create_unidom_score_item_templates.rb

@@ -0,0 +1,29 @@
+class CreateUnidomScoreItemTemplates < ActiveRecord::Migration
+
+  def change
+
+    create_table :unidom_score_item_templates, id: :uuid do |t|
+
+      t.references :sheet, type: :uuid, null: false
+
+      t.string  :title, null: false, default: '',  limit:     200
+      t.decimal :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_item_templates, :sheet_id
+
+  end
+
+end

data/db/migrate/20060111000000_create_unidom_score_sheets.rb

@@ -4,10 +4,10 @@ class CreateUnidomScoreSheets < ActiveRecord::Migration
 
     create_table :unidom_score_sheets, id: :uuid do |t|
 
-      t.references :score_sheet_template, type: :uuid, null: true
-      t.references :scorer,               type: :uuid, null: false,
+      t.references :template,     type: :uuid, null: true
+      t.references :scorer,       type: :uuid, null: false,
         polymorphic: { null: false, default: '', limit: 200 }
-      t.references :score_keeper,         type: :uuid, null: false,
+      t.references :score_keeper, type: :uuid, null: false,
         polymorphic: { null: false, default: '', limit: 200 }
 
       t.string  :name,      null: true,  default: nil, limit:     200
@@ -27,7 +27,7 @@ class CreateUnidomScoreSheets < ActiveRecord::Migration
 
     end
 
-    add_index :unidom_score_sheets, :score_sheet_template_id
+    add_index :unidom_score_sheets, :template_id
     add_index :unidom_score_sheets, :scorer_id
     add_index :unidom_score_sheets, :score_keeper_id
 

data/db/migrate/20060112000000_create_unidom_score_items.rb

@@ -4,9 +4,9 @@ class CreateUnidomScoreItems < ActiveRecord::Migration
 
     create_table :unidom_score_items, id: :uuid do |t|
 
-      t.references :score_sheet,         type: :uuid, null: false
-      t.references :score_item_template, type: :uuid, null: true
-      t.references :scorer,              type: :uuid, null: false,
+      t.references :sheet,    type: :uuid, null: false
+      t.references :template, type: :uuid, null: true
+      t.references :scorer,   type: :uuid, null: false,
         polymorphic: { null: false, default: '', limit: 200 }
 
       t.string  :title,     null: true,  default: nil, limit:     200
@@ -26,8 +26,8 @@ class CreateUnidomScoreItems < ActiveRecord::Migration
 
     end
 
-    add_index :unidom_score_items, :score_sheet_id
-    add_index :unidom_score_items, :score_item_template_id
+    add_index :unidom_score_items, :sheet_id
+    add_index :unidom_score_items, :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.3'.freeze
+    VERSION = '0.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-score
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -45,11 +45,13 @@ files:
 - app/mailers/unidom/score/application_mailer.rb
 - app/models/unidom/score/application_record.rb
 - app/models/unidom/score/score_item.rb
+- app/models/unidom/score/score_item_template.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/20060102000000_create_unidom_score_item_templates.rb
 - db/migrate/20060111000000_create_unidom_score_sheets.rb
 - db/migrate/20060112000000_create_unidom_score_items.rb
 - lib/tasks/score_tasks.rake