Added question label constaints

CLOSER-Cohorts · Oct 27, 2016 · 1477e70 · 1477e70
1 parent 76c1b9e
commit 1477e70
Show file tree

Hide file tree

Showing 21 changed files with 108,641 additions and 4 deletions.
diff --git a/app/assets/javascripts/lib/data_manager.coffee b/app/assets/javascripts/lib/data_manager.coffee
@@ -365,6 +365,8 @@ data_manager.factory(
                 console.log obj
                 for key, value of row
                   obj[key] = row[key]
+                if ['CcLoop','CcCondition','CcQuestion','CcStatement','CcSequence'].indexOf(obj.type) != -1
+                  obj.type = Map.translate(obj.type)
                 console.log obj
                 arr.push obj
 

diff --git a/app/controllers/instruments_controller.rb b/app/controllers/instruments_controller.rb
@@ -22,8 +22,8 @@ def reorder_ccs
     unless params[:updates].nil?
       params[:updates].each do |u|
         unless u[:type].nil? || u[:id].nil? || u[:parent].nil?
-          cc = @object.send(u[:type] + 's').find(u[:id])
-          parent = @object.send(u[:parent][:type] + 's').find(u[:parent][:id])
+          cc = @object.send(u[:type].tableize).find(u[:id])
+          parent = @object.send(u[:parent][:type].tableize).find(u[:parent][:id])
           unless cc.nil? or parent.nil?
             cc.position = u[:position]
             cc.parent = parent

diff --git a/config/initializers/version.rb b/config/initializers/version.rb
@@ -1,6 +1,6 @@
 module Archivist
   class Application
-    VERSION = '6.1.2'
+    VERSION = '6.1.3'
     BETA = false
   end
 end
diff --git a/db/migrate/20161027133806_add_question_label_constraints.rb b/db/migrate/20161027133806_add_question_label_constraints.rb
@@ -0,0 +1,9 @@
+class AddQuestionLabelConstraints < ActiveRecord::Migration[5.0]
+  def change
+    change_column_null :question_items, :label, false
+    change_column_null :question_grids, :label, false
+
+    add_index :question_grids, [:label, :instrument_id], unique: true
+    add_index :question_items, [:label, :instrument_id], unique: true
+  end
+end
diff --git a/lib/question.rb b/lib/question.rb
@@ -15,6 +15,8 @@ module Question::Model
 
     include Realtime::RtUpdate
 
+    validates :label, uniqueness: { scope: :instrument_id }
+
     alias constructs cc_questions
 
     def response_domains

diff --git a/public/assets/.sprockets-manifest-c8afa92b9e8c4efe6ad4209764445c77.json b/public/assets/.sprockets-manifest-c8afa92b9e8c4efe6ad4209764445c77.json
diff --git a/...gs-regular-6c94d6f93e3405b8e5264e0c38a4f53c257d1bbc584623e093b5a675010eff21.svg b/...gs-regular-6c94d6f93e3405b8e5264e0c38a4f53c257d1bbc584623e093b5a675010eff21.svg
diff --git a/...halflings-regular-6c94d6f93e3405b8e5264e0c38a4f53c257d1bbc584623e093b5a675010eff21.svg.gz b/...halflings-regular-6c94d6f93e3405b8e5264e0c38a4f53c257d1bbc584623e093b5a675010eff21.svg.gz
diff --git a/...ns-halflings-regular-bd18efd3efd70fec8ad09611a20cdbf99440b2c1d40085c29be036f891d65358.ttf b/...ns-halflings-regular-bd18efd3efd70fec8ad09611a20cdbf99440b2c1d40085c29be036f891d65358.ttf
diff --git a/...halflings-regular-bd18efd3efd70fec8ad09611a20cdbf99440b2c1d40085c29be036f891d65358.ttf.gz b/...halflings-regular-bd18efd3efd70fec8ad09611a20cdbf99440b2c1d40085c29be036f891d65358.ttf.gz
diff --git a/...ns-halflings-regular-f495f34e4f177cf0115af995bbbfeb3fcabc88502876e76fc51a4ab439bc8431.eot b/...ns-halflings-regular-f495f34e4f177cf0115af995bbbfeb3fcabc88502876e76fc51a4ab439bc8431.eot
diff --git a/...halflings-regular-f495f34e4f177cf0115af995bbbfeb3fcabc88502876e76fc51a4ab439bc8431.eot.gz b/...halflings-regular-f495f34e4f177cf0115af995bbbfeb3fcabc88502876e76fc51a4ab439bc8431.eot.gz
diff --git a/...s-halflings-regular-fc969dc1c6ff531abcf368089dcbaf5775133b0626ff56b52301a059fc0f9e1e.woff b/...s-halflings-regular-fc969dc1c6ff531abcf368089dcbaf5775133b0626ff56b52301a059fc0f9e1e.woff