foreman_hosts 2.0.4.6 → 2.0.4.7

data/app/controllers/foreman_hosts/hosts_controller.rb

@@ -4,7 +4,6 @@ module ForemanHosts
     # change layout if needed
     #layout 'foreman_hosts/layouts/new_layout'
 
-
     def report_index
       @fact_values = FactValue.all
       @fact_names = FactName.all

data/app/views/foreman_hosts/hosts/report_index.html.erb

@@ -1,30 +1,33 @@
 <div class="four wide right column">
         <button class='btn btn-info' type='button'><a href="javascript:void(0);" class="ui green button icon mini" id="btnExport" onclick="export_excel();">Export</a></button>
-  
+
 </div>
 <%= javascript "jquery.cookie", "host_checkbox" %>
 <% title header ||= "" %>
+
 <table class="table table-bordered table-striped table-condensed" id="tblExport">
   <thead>
     <tr>
-      <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
       <th class=''><%= sort :name, :as => _('Name') %></th>
+      <% fact_name_no1 = 1 %>
      <% @fact_names.each do |fact_name| %>
-      <th><%= fact_name.name %></th>
-     <% end %>
 
+      <th id="td<%= fact_name_no1 %>"><%= fact_name.name %>
+      <br />
+      <button  type='button'><a href="javascript:void(0);"  onclick="DeleteSignColumn(<%= fact_name_no1 %>);"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></button></th>
+            <% fact_name_no1 += 1 %>
+     <% end %>
     </tr>
   </thead> 
   <tbody>
     <% @hosts.each do |host| %>
       <tr>
-        <td class="ca">
-          <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{host.id}", :disabled => !authorized?, :class => 'host_select_boxes', :onclick => 'hostChecked(this)' %>
-        </td>
         <td class='ellipsis'><%= name_column(host) %></td>
-             <% @fact_names.each do |fact_name| %>
+
+           <% @fact_names.each do |fact_name| %>
               <td><%= get_fact_value(host, fact_name) %> </td>
-             <% end %>
+            <% end %>
+
       </tr>
     <% end %>
   </tbody>
@@ -42,6 +45,28 @@
                 datatype: 'table',
                 returnUri: true
             });
-    $("#btnExport").attr('download', '项目工时.xlsx').attr('href', uri).attr('target', '_blank');
+    $("#btnExport").attr('download', 'hosts.xlsx').attr('href', uri).attr('target', '_blank');
   }
+
+  function DeleteSignColumn(tid) {
+    var tab = document.getElementById("tblExport");
+    var columnLength = tab.rows[0].cells.length;
+    var tr1 = tab.rows[0];
+    var columnId = 0;
+    tid= "td" + tid
+      for(var j=0;j<tr1.cells.length;j++)//取得第几行下面的td个数，再次循环遍历该行下面的td元素
+      {
+         var cell = tr1.cells[j];//获取某行下面的某个td元素
+         if (cell.id == tid) {
+            columnId = columnId + j;
+         }
+        }
+    //删除指定单元格
+    if (columnId > 0){
+      for (var i = 0; i < tab.rows.length; i++) {
+          tab.rows[i].deleteCell(columnId);
+      }
+    }
+
+}
 </script>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  match 'new_action', to: 'foreman_hosts/hosts#new_action'
-  match 'export', to: 'foreman_hosts/hosts#export'
+  # match 'new_action', to: 'foreman_hosts/hosts#new_action'
+  # match 'export', to: 'foreman_hosts/hosts#export'
   match 'report_index', to: 'foreman_hosts/hosts#report_index'
 end

data/lib/foreman_hosts/version.rb

@@ -1,3 +1,3 @@
 module ForemanHosts
-  VERSION = '2.0.4.6'
+  VERSION = '2.0.4.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_hosts
 version: !ruby/object:Gem::Version
-  version: 2.0.4.6
+  version: 2.0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -56,7 +56,6 @@ files:
 - app/views/foreman_hosts/hosts/export.xlsx.axlsx
 - app/views/foreman_hosts/hosts/report_index.html.erb
 - app/views/foreman_hosts/hosts/hosts/new_action.html.erb
-- app/views/foreman_hosts/hosts/new_action.html.erb
 - app/overrides/dashboard/index/sample_override.html.erb.deface
 - app/controllers/foreman_hosts/hosts_controller.rb
 - app/helpers/concerns/foreman_hosts/hosts_helper_extensions.rb

data/app/views/foreman_hosts/hosts/new_action.html.erb

@@ -1 +0,0 @@
-Welcome to <b>ForemanHosts</b>