Added SushiApp.employee, sushi_fabric.gem ver.1.0.6

uzh · Feb 5, 2021 · 2155d3b · 2155d3b
1 parent d39b86d
commit 2155d3b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/master/Gemfile.lock b/master/Gemfile.lock
@@ -206,7 +206,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    sushi_fabric (1.0.5)
+    sushi_fabric (1.0.6)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref

diff --git a/master/app/controllers/application_controller.rb b/master/app/controllers/application_controller.rb
@@ -73,6 +73,7 @@ def [](x)
           sushi_app_entry.required_columns = sushi_app_instance.required_columns
           sushi_app_entry.next_dataset_keys = sushi_app_instance.next_dataset.keys
           sushi_app_entry.description = sushi_app_instance.description
+          sushi_app_entry.employee = sushi_app_instance.employee
           sushi_app_entry.save
         rescue => err
           warn err
@@ -99,6 +100,13 @@ def runnable_application(data_set_headers, refresh = true)
       (app.required_columns - data_set_headers.map{|colname| colname.to_s.gsub(/\[.+\]/,'').strip}).empty?
     end
   end
+  def employee_apps
+    apps = {}
+    SushiApplication.all.select{|app| app.employee}.each do |app|
+      apps[app.class_name.to_s] = true
+    end
+    apps
+  end
   def sample_path(data_set)
     paths = []
     data_set.samples.each do |sample|

diff --git a/master/app/controllers/data_set_controller.rb b/master/app/controllers/data_set_controller.rb
@@ -243,6 +243,7 @@ def show
         set_runnable_apps(false)
       end
 
+      @employee_apps = employee_apps
       @sushi_apps = @data_set.runnable_apps
       @sushi_apps_category = @sushi_apps.keys.sort
     else

diff --git a/master/app/views/data_set/_sushi_application_list.html.erb b/master/app/views/data_set/_sushi_application_list.html.erb
@@ -10,7 +10,9 @@
         <tr><td><%= category %></td>
           <td style="padding: 2px;">
             <% @sushi_apps[category].each do |app| %>
-              <%= submit_tag app.to_s, :name=>'app', :class=>"btn btn-info btn-sm raised", :style=>"padding: 2px" %>
+              <% if (session['employee'] and @employee_apps[app]) or !@employee_apps[app] %>
+                <%= submit_tag app.to_s, :name=>'app', :class=>"btn btn-info btn-sm raised", :style=>"padding: 2px" %>
+              <% end %>
             <% end %>
           </td>
         </tr>

diff --git a/master/db/migrate/20210205145436_add_employee_to_sushi_application.rb b/master/db/migrate/20210205145436_add_employee_to_sushi_application.rb
@@ -0,0 +1,5 @@
+class AddEmployeeToSushiApplication < ActiveRecord::Migration[5.2]
+  def change
+    add_column :sushi_applications, :employee, :boolean
+  end
+end
diff --git a/master/lib/WordCountApp.rb b/master/lib/WordCountApp.rb
@@ -9,6 +9,7 @@
 class WordCountApp < SushiFabric::SushiApp
   def initialize
     super
+    @employee = true
     @name = 'Word_Count'
     @description = "test applicaiton #{GlobalVariables::SUSHI}"
     @analysis_category = 'Stats'