Merge branch 'develop' into f_equivilancies

app/controllers/cc_questions_controller.rb

@@ -9,6 +9,15 @@ def variables
     render 'variables/index'
   end
 
+  def tq
+    @collection = collection.order(:id)
+    @collection.each { |v| v.strand }
+    respond_to do |format|
+      format.text { render 'tq.txt.erb', layout: false, content_type: 'text/plain' }
+      format.json  {}
+    end
+  end
+
   def set_topic
     topic = Topic.find params[:topic_id]
 

app/controllers/datasets_controller.rb

@@ -1,13 +1,12 @@
 class DatasetsController < BasicController
   include Importers::Controller
 
-  only_set_object { %i{ questions latest_document } }
+  only_set_object { %i{ questions latest_document dv } }
 
   has_importers({
                     dv: ImportJob::DV,
                     topicv: ImportJob::TopicV
                 })
-#   only_set_object { %i{member_imports} }
 
   @model_class = Dataset
   @params_list = [:name]
@@ -27,6 +26,13 @@ def show
     end
   end
 
+  def dv
+    respond_to do |format|
+      format.text { render 'dv.txt.erb', layout: false, content_type: 'text/plain' }
+      format.json  {}
+    end
+  end
+
   def import
     files = params[:files].nil? ? [] : params[:files]
     options = {}

app/controllers/instruments_controller.rb

@@ -6,7 +6,7 @@ class InstrumentsController < BasicController
                     qvmapping: ImportJob::Mapping,
                     topicq: ImportJob::TopicQ
                 })
-  only_set_object { %i{copy response_domains response_domain_codes reorder_ccs stats export mapper member_imports variables} }
+  only_set_object { %i{copy response_domains response_domain_codes reorder_ccs stats export mapper mapping member_imports variables} }
 
   @model_class = Instrument
   @params_list = %i{agency version prefix label study files import_question_grids}

app/controllers/variables_controller.rb

@@ -5,6 +5,15 @@ class VariablesController < BasicController
   @model_class = Variable
   @params_list = [:name, :label, :var_type, :dataset_id]
 
+  def tv
+    @collection = collection.order(:id)
+    @collection.each { |v| v.strand }
+    respond_to do |format|
+      format.text { render 'tv.txt.erb', layout: false, content_type: 'text/plain' }
+      format.json  {}
+    end
+  end
+
   def set_topic
     topic = Topic.find_by_id params[:topic_id]
 

app/models/qv_mapping.rb

@@ -3,4 +3,8 @@ class QvMapping < ActiveRecord::Base
 
   belongs_to :dataset
   belongs_to :instrument
+
+  def question_with_cell
+    self.question + ((self.x.nil? || self.y.nil?) ? '' : "$#{self.x};#{self.y}")
+  end
 end

app/models/strand.rb

@@ -160,7 +160,6 @@ def save (do_eval = false)
       @id = Strand.redis.incr SCOPE + ':count'
       self.class.active[@id.to_i] = self
     end
-    puts @members.map(&:typed_id).inspect
     Strand.redis.sadd SCOPE + ':' + @id.to_s, @members.map(&:typed_id)
     @members.each do |member|
       Strand.redis.hset LOOKUP, member.typed_id, @id.to_s

app/views/cc_questions/tq.txt.erb

@@ -0,0 +1,3 @@
+<% @collection.each do |qc| %>
+<%= qc.label %><%= "\t" %><%= qc.fully_resolved_topic_code %>
+<% end %>

app/views/datasets/dv.txt.erb

@@ -0,0 +1,3 @@
+<% @object.dv_mappings.order(id: 'ASC').each do |map| %>
+<%= map.variable %><%= "\t" %><%= map.source %>
+<% end %>

app/views/instruments/mapping.txt.erb

@@ -0,0 +1,3 @@
+<% @object.qv_mappings.order(id: 'ASC').each do |map| %>
+<%= map.question_with_cell %><%= "\t" %><%= map.variable %>
+<% end %>

app/views/variables/tv.txt.erb

@@ -0,0 +1,3 @@
+<% @collection.each do |v| %>
+<%= v.name %><%= "\t" %><%= v.fully_resolved_topic_code %>
+<% end %>

config/initializers/version.rb

@@ -1,6 +1,6 @@
 module Archivist
   class Application
-    VERSION = '8.1.8'
+    VERSION = '8.2.1'
     BETA = false
   end
 end

config/routes.rb

@@ -38,7 +38,12 @@
       get 'external'
     end
   end
-  resources :datasets, constraints: -> (r) { (r.format == :json || r.format == :xml) } do
+
+  request_processor = lambda do |request|
+    [:json, :xml, :text].include?(request.format.symbol)
+  end
+
+  resources :datasets, constraints: request_processor do
     resources :variables do
       member do
         post 'set_topic', to: 'variables#set_topic'
@@ -49,14 +54,10 @@
     member do
       match 'imports', to: 'datasets#member_imports', via: [:post, :put]
       get 'questions', to: 'datasets#questions'
+      get 'dv', to: 'datasets#dv'
     end
   end
-
-  request_processor = lambda do |request|
-    # binding.pry if request.path =~ %r{/instruments/13/imports}
-    # 1
-    [:json, :xml, :text].include?(request.format.symbol)
-  end
+  get 'datasets/:dataset_id/tv', to: 'variables#tv', constraints: request_processor
 
   resources :instruments, constraints: request_processor do
     resources :cc_sequences
@@ -88,10 +89,12 @@
       get 'stats', to: 'instruments#stats'
       get 'export', to: 'instruments#export'
       get 'mapper', to: 'instruments#mapper'
+      get 'mapping', to: 'instruments#mapping'
       match 'imports', to: 'instruments#member_imports', via: [:post, :put]
       get 'variables', to: 'instruments#variables'
     end
   end
+  get 'instruments/:instrument_id/tq', to: 'cc_questions#tq', constraints: request_processor
 
   get 'instruments/:id/export', to: 'instruments#latest_document'
   get 'datasets/:id/export', to: 'datasets#latest_document'

lib/linkable.rb

@@ -60,5 +60,9 @@ def get_suggested_topic
       cluster = Cluster.find_by_member self
       cluster&.suggested_topic
     end
+
+    def fully_resolved_topic_code
+      (get_topic || get_suggested_topic)&.code&.to_s || '0'
+    end
   end
 end