Task info section improvements

app/assets/stylesheets/application.scss

@@ -20,3 +20,4 @@
 @import "ajax-bootstrap-select.min";
 @import "extend/bootstrap";
 @import "themes/scinote";
+@import "my_modules/protocols/*"

app/assets/stylesheets/my_modules/protocols/index.scss

@@ -0,0 +1,44 @@
+@import "constants";
+@import "mixins";
+
+.my-modules-protocols-index {
+  padding-top: 15px !important;
+
+  .first-row {
+    max-height: 40px;
+
+    .date-block {
+      max-width: 250px;
+    }
+
+    div {
+      height: 45px;
+    }
+
+    .complete-button-container {
+      float: right;
+      max-width: 165px;
+
+      .my_module-state-buttons {
+        padding-top: 0;
+      }
+    }
+  }
+
+  .well {
+    border: 0;
+    box-shadow: none;
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .badge-icon {
+    background: transparent;
+    color: $color-silver;
+    padding-right: 5px;
+
+    + .well-sm {
+      margin-left: 32px;
+    }
+  }
+}

app/views/my_modules/_module_header.html.erb

@@ -1,5 +1,5 @@
-<div class="row">
+<div class="row first-row">
-  <div class="col-xs-6 col-sm-6 col-md-4">
+  <div class="col-xs-6 col-sm-6 col-md-4 col-lg-4 date-block">
     <div class="badge-icon">
       <span class="fas fa-calendar-alt"></span>
     </div>
@@ -9,7 +9,7 @@
     </div>
   </div>
 
-  <div class="col-xs-6 col-sm-6 col-md-4 help_tooltips"
+  <div class="col-xs-6 col-sm-6 col-md-4 col-lg-4 help_tooltips date-block"
        data-tooltiplink="<%= I18n.t('tooltips.link.task.due_date_specific') %>"
        data-tooltipcontent="<%= I18n.t('tooltips.text.task.due_date_specific') %>">
     <div class="badge-icon">
@@ -39,9 +39,13 @@
     </div>
   </div>
 
-  <div class="col-xs-6 col-sm-6 col-md-4">
+  <div class="col-xs-6 col-sm-6 col-md-3  complete-button-container">
+    <%= render partial: "my_modules/state_buttons.html.erb" %>
+  </div>
+
+  <div class="col-xs-6 col-sm-6 col-md-4 col-lg-3">
     <div class="badge-icon">
-      <span class="fas fa-check"></span>
+      <span class="fas fa-tachometer-alt"></span>
     </div>
     <div class="well well-sm">
       <span class="task-state-label">
@@ -50,6 +54,7 @@
       </span>
     </div>
   </div>
+
 </div>
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-12" id="module-tags" data-module-tags-url="<%= my_module_my_module_tags_url(@my_module, format: :json) %>">

app/views/my_modules/protocols.html.erb

@@ -4,7 +4,7 @@
 <%= render partial: "shared/sidebar", locals: { current_task: @my_module, page: 'task' } %>
 <%= render partial: "shared/secondary_navigation" %>
 
-<div class="content-pane">
+<div class="content-pane my-modules-protocols-index">
   <%= render partial: "module_header" %>
 
   <div>
@@ -12,7 +12,6 @@
       <%= render partial: "my_modules/protocols/protocol_status_bar.html.erb" %>
     </div>
     <%= render partial: "my_modules/protocols/protocol_buttons.html.erb" %>
-    <%= render partial: "my_modules/state_buttons.html.erb" %>
   </div>
 
   <div data-role="steps-container">

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190125123107) do
+ActiveRecord::Schema.define(version: 20190213064847) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -19,19 +19,26 @@ ActiveRecord::Schema.define(version: 20190125123107) do
 
   create_table "activities", force: :cascade do |t|
     t.bigint "my_module_id"
-    t.bigint "user_id"
+    t.bigint "owner_id"
     t.integer "type_of", null: false
-    t.string "message", null: false
+    t.string "message"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.bigint "project_id", null: false
     t.bigint "experiment_id"
+    t.string "subject_type"
+    t.bigint "subject_id"
+    t.bigint "team_id"
+    t.integer "group_type"
+    t.json "values"
     t.index ["created_at"], name: "index_activities_on_created_at"
     t.index ["experiment_id"], name: "index_activities_on_experiment_id"
     t.index ["my_module_id"], name: "index_activities_on_my_module_id"
+    t.index ["owner_id"], name: "index_activities_on_owner_id"
     t.index ["project_id"], name: "index_activities_on_project_id"
+    t.index ["subject_type", "subject_id"], name: "index_activities_on_subject_type_and_subject_id"
+    t.index ["team_id"], name: "index_activities_on_team_id"
     t.index ["type_of"], name: "index_activities_on_type_of"
-    t.index ["user_id"], name: "index_activities_on_user_id"
   end
 
   create_table "asset_text_data", force: :cascade do |t|
@@ -916,7 +923,7 @@ ActiveRecord::Schema.define(version: 20190125123107) do
   add_foreign_key "activities", "experiments"
   add_foreign_key "activities", "my_modules"
   add_foreign_key "activities", "projects"
-  add_foreign_key "activities", "users"
+  add_foreign_key "activities", "users", column: "owner_id"
   add_foreign_key "asset_text_data", "assets"
   add_foreign_key "assets", "users", column: "created_by_id"
   add_foreign_key "assets", "users", column: "last_modified_by_id"