From 94866e899439ab8909645a2a51e86f5a68a2c00c Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Fri, 25 Nov 2016 09:03:47 +0100
Subject: [PATCH] Initial code commit for samples columns dropdown [SCI-712]

---
 app/assets/javascripts/samples/samples.js |  1 +
 app/views/shared/_samples.html.erb        | 14 +++++++++++++-
 config/locales/en.yml                     |  3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/samples/samples.js b/app/assets/javascripts/samples/samples.js
index 3a97b74db..7f007fe86 100644
--- a/app/assets/javascripts/samples/samples.js
+++ b/app/assets/javascripts/samples/samples.js
@@ -1,4 +1,5 @@
 //= require datatables
+//= require jquery-ui
 
 // Create custom field ajax
 $("#modal-create-custom-field").on("show.bs.modal", function(event) {
diff --git a/app/views/shared/_samples.html.erb b/app/views/shared/_samples.html.erb
index 39b584399..f296e54b6 100644
--- a/app/views/shared/_samples.html.erb
+++ b/app/views/shared/_samples.html.erb
@@ -42,10 +42,22 @@
   <div id="datatables-buttons" style="display: inline;">
     <div id="samples-columns-dropdown" class="dropdown">
       <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
-        <%= t('samples.columns') %>
+        <%= t("samples.columns") %>
         <span class="caret"></span>
       </button>
       <ul class="dropdown-menu dropdown-menu-right smart-dropdown" id="samples-columns-list">
+        <li style="padding: 5px;">
+          <div id="new-column-form" class="form-group" data-action="<%= organization_custom_fields_path(@organization) %>">
+            <div class="input-group">
+              <input class="form-control" id="new-column-name" placeholder="<%= t("samples.column_new_text") %>">
+              <span class="input-group-btn">
+                <a id="add-new-column-button" class="btn btn-primary">
+                  <%= t("samples.column_create") %>
+                </a>
+              </span>
+            </div>
+          </div>
+        </li>
       </ul>
     </div>
   </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f785e64f2..40fafae55 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -810,6 +810,9 @@ en:
     edit_sample: "Edit"
     save_sample: "Save"
     cancel_save: "Cancel"
+    columns: "Columns"
+    column_create: "Create"
+    column_new_text: "New column"
     column_visibility: "Visible columns"
     add_new_sample_type: "Add sample type"
     add_new_sample_group: "Add sample group"