added mapdashboard and singlegraph links

webmaster444 · Sep 14, 2017 · be6a775 · be6a775
1 parent ee6671b
commit be6a775
Show file tree

Hide file tree

Showing 12 changed files with 227 additions and 1 deletion.
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
@@ -210,6 +210,12 @@ def ctg
 			end
 		end
 	end
+
+	def viewsinglegraph
+	end
+
+	def mapdashboard
+	end
 	private
 	def map_params
 		params.require(:map).permit(:datapoints, :maptitle)

diff --git a/app/views/maps/mapdashboard.html.erb b/app/views/maps/mapdashboard.html.erb
@@ -0,0 +1,91 @@
+<div class='row'>
+<h4> Population Correlation Matrix: <%= @map.maptitle %> </h4>
+<span> Select Data for Map Group Data Summary </span>
+<button type="button" class="btn btn-primary pull-right" data-toggle="modal" data-target="#ctgmodal"> Create Trait Group </button>
+</div>
+<div class='row'>
+<div class='col-sm-6'>
+ <fieldset>
+  <legend align="center">GROUPS</legend>
+  Include Groups: <textarea id="inGroups" name='tags2' placeholder='Add Groups'></textarea><br>
+  Exclude Groups: <textarea id="exGroups" name='tags2' placeholder='Add Groups'></textarea><br>  
+ </fieldset>
+</div>
+<div class='col-sm-6'>
+ <fieldset>
+  <legend align="center">TAGS</legend>
+  Include Tags: <textarea id="inTags" name='tags2' placeholder='Add Tags'></textarea><br>
+  Exclude Tags: <textarea id="exTags" name='tags2' placeholder='Add Tags'></textarea><br>  
+ </fieldset>
+</div>
+</div>
+
+<div class='row'>
+<div class='col-sm-6'>
+ <fieldset>
+  <legend align="center">TRAITS</legend>
+  Include Traits: <textarea id="inTraits" name='tags2' placeholder='Add Traits'></textarea><br>
+  Exclude Traits: <textarea id="exTraits" name='tags2' placeholder='Add Traits'></textarea><br>  
+ </fieldset>
+</div>
+
+<div class='col-sm-6'>
+ <fieldset>
+  <legend align="center">STATISTICS</legend>
+  Include Traits: <textarea id="inStats" name='tags2' placeholder='Add Statistics'></textarea><br>
+  Exclude Traits: <textarea id="exStats" name='tags2' placeholder='Add Statistics'></textarea><br>  
+ </fieldset>
+</div>
+</div>
+<input id="traitValues" value='<%= @trait.trait %>' type="hidden" /> 
+<input id="traitgroupValues" value='<%= @group_array %>' type="hidden" /> 
+<div id="matrix">
+    <div style="display:inline-block;" id="legend"></div>
+    <div style="display:inline-block; float:left" id="container"></div>
+</div>
+
+<!-- Modal -->
+<div id="ctgmodal" class="modal fade" role="dialog">
+  <div class="modal-dialog">
+
+    <!-- Modal content-->
+    <%= form_tag ctg_maps_path, :id => 'ctg_modal', multipart: true do %>
+  
+  <%= hidden_field_tag :id, @map.id%>
+  <%= hidden_field_tag :selected_traits, @map.id%>
+
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">&times;</button>
+        <h4 class="modal-title">Create/Manage Trait Group</h4>
+      </div>
+      <div class="modal-body">
+        <div class="form-group">          
+          <div class="col-12">            
+            <%= text_field_tag :trait_group_name, :autofocus => true, class: 'form-control', :required=>'required' %>
+          </div>
+          <div class="col-12">
+          <br/>
+          <p> Click to Select Traits to Include in Group </p>
+          </div>
+        </div>             
+        <% csv_headers = @csv_table.headers
+          csv_headers.shift(4)
+        %>
+        <div id="checkbox_wrapper">
+        <% csv_headers.each do |button| %>
+        <span class="button-checkbox">
+          <button type="button" class="btn" data-color="default"><%= button %></button>
+          <input type="checkbox" class="hidden" checked />
+        </span>                       
+        <% end %>   
+        </div>
+      </div>
+      <div class="modal-footer">
+        <%= submit_tag "Save", class: "btn btn-primary"%>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  <% end %>
+  </div>
+</div>
diff --git a/app/views/maps/viewsinglegraph.html.erb b/app/views/maps/viewsinglegraph.html.erb
@@ -0,0 +1,91 @@
+<div class='row'>
+<h4> Population Correlation Matrix: <%= @map.maptitle %> </h4>
+<span> Select Data for Map Group Data Summary </span>
+<button type="button" class="btn btn-primary pull-right" data-toggle="modal" data-target="#ctgmodal"> Create Trait Group </button>
+</div>
+<div class='row'>
+<div class='col-sm-6'>
+ <fieldset>
+  <legend align="center">GROUPS</legend>
+  Include Groups: <textarea id="inGroups" name='tags2' placeholder='Add Groups'></textarea><br>
+  Exclude Groups: <textarea id="exGroups" name='tags2' placeholder='Add Groups'></textarea><br>  
+ </fieldset>
+</div>
+<div class='col-sm-6'>
+ <fieldset>
+  <legend align="center">TAGS</legend>
+  Include Tags: <textarea id="inTags" name='tags2' placeholder='Add Tags'></textarea><br>
+  Exclude Tags: <textarea id="exTags" name='tags2' placeholder='Add Tags'></textarea><br>  
+ </fieldset>
+</div>
+</div>
+
+<div class='row'>
+<div class='col-sm-6'>
+ <fieldset>
+  <legend align="center">TRAITS</legend>
+  Include Traits: <textarea id="inTraits" name='tags2' placeholder='Add Traits'></textarea><br>
+  Exclude Traits: <textarea id="exTraits" name='tags2' placeholder='Add Traits'></textarea><br>  
+ </fieldset>
+</div>
+
+<div class='col-sm-6'>
+ <fieldset>
+  <legend align="center">STATISTICS</legend>
+  Include Traits: <textarea id="inStats" name='tags2' placeholder='Add Statistics'></textarea><br>
+  Exclude Traits: <textarea id="exStats" name='tags2' placeholder='Add Statistics'></textarea><br>  
+ </fieldset>
+</div>
+</div>
+<input id="traitValues" value='<%= @trait.trait %>' type="hidden" /> 
+<input id="traitgroupValues" value='<%= @group_array %>' type="hidden" /> 
+<div id="matrix">
+    <div style="display:inline-block;" id="legend"></div>
+    <div style="display:inline-block; float:left" id="container"></div>
+</div>
+
+<!-- Modal -->
+<div id="ctgmodal" class="modal fade" role="dialog">
+  <div class="modal-dialog">
+
+    <!-- Modal content-->
+    <%= form_tag ctg_maps_path, :id => 'ctg_modal', multipart: true do %>
+  
+  <%= hidden_field_tag :id, @map.id%>
+  <%= hidden_field_tag :selected_traits, @map.id%>
+
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">&times;</button>
+        <h4 class="modal-title">Create/Manage Trait Group</h4>
+      </div>
+      <div class="modal-body">
+        <div class="form-group">          
+          <div class="col-12">            
+            <%= text_field_tag :trait_group_name, :autofocus => true, class: 'form-control', :required=>'required' %>
+          </div>
+          <div class="col-12">
+          <br/>
+          <p> Click to Select Traits to Include in Group </p>
+          </div>
+        </div>             
+        <% csv_headers = @csv_table.headers
+          csv_headers.shift(4)
+        %>
+        <div id="checkbox_wrapper">
+        <% csv_headers.each do |button| %>
+        <span class="button-checkbox">
+          <button type="button" class="btn" data-color="default"><%= button %></button>
+          <input type="checkbox" class="hidden" checked />
+        </span>                       
+        <% end %>   
+        </div>
+      </div>
+      <div class="modal-footer">
+        <%= submit_tag "Save", class: "btn btn-primary"%>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  <% end %>
+  </div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -16,5 +16,7 @@
 		get "maps/:id/vsd", to:"maps#vsd"
 		get "maps/:id/vgs", to:"maps#vgs" , as: "groupsummary"		
 		get "maps/:id/vcm", to:"maps#vcm" , as: "correlationmatrix"		
+		get "maps/:id/vsg", to:"maps#viewsinglegraph" , as: "singlegraph"
+		get "maps/:id/md", to:"maps#mapdashboard" , as: "mapdashboard"
 	end	
 end
diff --git a/log/development.log b/log/development.log
@@ -77839,3 +77839,37 @@ Processing by MapsController#vcm as HTML
 Completed 200 OK in 290ms (Views: 286.8ms | ActiveRecord: 0.4ms)
 
 
+Started GET "/maps/14/vcm" for 127.0.0.1 at 2017-09-14 11:54:25 +0300
+Processing by MapsController#vcm as HTML
+  Parameters: {"id"=>"14"}
+  [1m[36mMap Load (0.1ms)[0m  [1m[34mSELECT  "maps".* FROM "maps" WHERE "maps"."id" = ? LIMIT ?[0m  [["id", 14], ["LIMIT", 1]]
+  [1m[36mTrait Load (0.1ms)[0m  [1m[34mSELECT  "traits".* FROM "traits" WHERE "traits"."id" = ? LIMIT ?[0m  [["id", 12], ["LIMIT", 1]]
+  Rendering maps/vcm.html.erb within layouts/application
+  Rendered maps/vcm.html.erb within layouts/application (1.2ms)
+  Rendered maps/_detaillink.html.erb (0.6ms)
+  Rendered layouts/_sidebar.html.erb (1.9ms)
+  Rendered layouts/_navigation_links.html.erb (0.3ms)
+  [1m[36mUser Load (0.2ms)[0m  [1m[34mSELECT  "users".* FROM "users" WHERE "users"."id" = ? ORDER BY "users"."id" ASC LIMIT ?[0m  [["id", 1], ["LIMIT", 1]]
+  Rendered layouts/_nav_links_for_auth.html.erb (1.6ms)
+  Rendered layouts/_navigation.html.erb (3.0ms)
+  Rendered layouts/_messages.html.erb (0.4ms)
+  Rendered layouts/_settings.html.erb (0.2ms)
+Completed 200 OK in 89ms (Views: 86.8ms | ActiveRecord: 0.4ms)
+
+
+Started GET "/" for 127.0.0.1 at 2017-09-14 11:57:44 +0300
+  [1m[35m (0.2ms)[0m  [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
+Processing by VisitorsController#index as HTML
+  Rendering visitors/index.html.erb within layouts/application
+  Rendered visitors/index.html.erb within layouts/application (0.8ms)
+  [1m[36mMap Load (0.2ms)[0m  [1m[34mSELECT "maps".* FROM "maps" ORDER BY updated_at DESC[0m
+  Rendered layouts/_sidebar.html.erb (22.9ms)
+  Rendered layouts/_navigation_links.html.erb (0.5ms)
+  [1m[36mUser Load (0.5ms)[0m  [1m[34mSELECT  "users".* FROM "users" WHERE "users"."id" = ? ORDER BY "users"."id" ASC LIMIT ?[0m  [["id", 1], ["LIMIT", 1]]
+  Rendered layouts/_nav_links_for_auth.html.erb (94.7ms)
+  Rendered layouts/_navigation.html.erb (98.7ms)
+  Rendered layouts/_messages.html.erb (3.0ms)
+  Rendered layouts/_settings.html.erb (0.3ms)
+Completed 200 OK in 713ms (Views: 686.0ms | ActiveRecord: 1.9ms)
+
+
diff --git a/tmp/cache/assets/sprockets/v3.0/62/62rZx92b3ZnL9NSr8WbOopzvVnPw1_IbNrj2SHn3sEw.cache b/tmp/cache/assets/sprockets/v3.0/62/62rZx92b3ZnL9NSr8WbOopzvVnPw1_IbNrj2SHn3sEw.cache
diff --git a/tmp/cache/assets/sprockets/v3.0/9N/9NkdY9IjymslZPkXCXX2hV6hG6RPtd2GQpM1rUpTseQ.cache b/tmp/cache/assets/sprockets/v3.0/9N/9NkdY9IjymslZPkXCXX2hV6hG6RPtd2GQpM1rUpTseQ.cache
@@ -0,0 +1 @@
+I"�app/assets/javascripts/application.js?type=application/javascript&id=a9e777ab5549cd1bcaa31d7183407e9abf3125e348179418688d5b0060b22bf5:ET
diff --git a/tmp/cache/assets/sprockets/v3.0/DO/DOa9HuRXE1P2xMtJSFeCzEHlGfY_-3nPjDl4-URF4hA.cache b/tmp/cache/assets/sprockets/v3.0/DO/DOa9HuRXE1P2xMtJSFeCzEHlGfY_-3nPjDl4-URF4hA.cache
diff --git a/tmp/cache/assets/sprockets/v3.0/GS/GS2wDQS1dt1G46svSevtgAL25vqBGjHQsPXUs3mdvDc.cache b/tmp/cache/assets/sprockets/v3.0/GS/GS2wDQS1dt1G46svSevtgAL25vqBGjHQsPXUs3mdvDc.cache
diff --git a/tmp/cache/assets/sprockets/v3.0/hw/hwxLsowAHK-Igmkq38dv_npk3O926ugKjZWgmL_6858.cache b/tmp/cache/assets/sprockets/v3.0/hw/hwxLsowAHK-Igmkq38dv_npk3O926ugKjZWgmL_6858.cache
diff --git a/tmp/cache/assets/sprockets/v3.0/m_/m_XS9tze8rFJPGGy3TrnXi-5Ndx-o_bL9RK-5b74Wn0.cache b/tmp/cache/assets/sprockets/v3.0/m_/m_XS9tze8rFJPGGy3TrnXi-5Ndx-o_bL9RK-5b74Wn0.cache
@@ -0,0 +1 @@
+I"}app/assets/stylesheets/application.css.scss?type=text/css&id=2a810a11c14b9ca0ab2134ad445d5e798cef1543dfb4d373a1192709054a5eca:ET
diff --git a/tmp/pids/server.pid b/tmp/pids/server.pid
@@ -1 +1 @@
-6873
+19384