foreman_hosts 2.0.2 → 2.0.3

data/app/views/foreman_hosts/syhostmodels/show.html.erb

@@ -46,13 +46,6 @@
 										<th>fact_name</th>
 									</thead>
 									<tbody>
-										<% @syhostmodel.syhostmodeldetails.order("no Asc").each do |syhostmodeldetail|%>
-											<tr class="success">
-												<td><%= syhostmodeldetail.no %></td>
-												<td><%= syhostmodeldetail.status %></td>
-												<td><%#= syhostmodeldetail.fact_name.name rescue nil %></td>
-											</tr>
-										<% end %>
 									</tbody>
 								</table>
 		          </div>
@@ -63,7 +56,7 @@
 		      <div class="tab-pane" id="previews">
 		        <div id="previews">
 							<div class="panel-body">
-<%#= render partial: "foreman_hosts/syhostmodels/report", locals: { details: @syhostmodel.syhostmodeldetails} %>
+
 							</div>
 		        </div>
 		      </div>

data/config/routes.rb

@@ -3,6 +3,5 @@ Rails.application.routes.draw do
 
     namespace :foreman_hosts do
 	    resources :syhostmodels
-	    resources :syhostmodeldetails
 	  end
 end

data/lib/foreman_hosts/version.rb

@@ -1,3 +1,3 @@
 module ForemanHosts
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_hosts
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -55,28 +55,23 @@ files:
 - app/views/foreman_hosts/layouts/new_layout.html.erb
 - app/views/foreman_hosts/syhostmodels/edit.html.erb
 - app/views/foreman_hosts/syhostmodels/new.html.erb
-- app/views/foreman_hosts/syhostmodels/_report.html.erb
 - app/views/foreman_hosts/syhostmodels/show.html.erb
 - app/views/foreman_hosts/syhostmodels/index.html.erb
 - app/views/foreman_hosts/syhostmodels/_list.html.erb
 - app/views/foreman_hosts/syhostmodels/_form.html.erb
-- app/views/foreman_hosts/syhostmodels/_sub.html.erb
 - 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/syhostmodeldetails_controller.rb
 - app/controllers/foreman_hosts/syhostmodels_controller.rb
 - app/controllers/foreman_hosts/hosts_controller.rb
 - app/helpers/concerns/foreman_hosts/hosts_helper_extensions.rb
 - app/models/concerns/foreman_hosts/host_extensions.rb
-- app/models/foreman_hosts/syhostmodeldetail.rb
 - app/models/foreman_hosts/syhostmodel.rb
 - bin/foreman-hosts
 - config/routes.rb
 - db/migrate/20151015022411_create_syhostmodels.rb
-- db/migrate/20151015050239_create_syhostmodeldetails.rb
 - lib/tasks/foreman_hosts_tasks.rake
 - lib/foreman_hosts.rb
 - lib/foreman_hosts/version.rb

data/app/controllers/foreman_hosts/syhostmodeldetails_controller.rb

@@ -1,83 +0,0 @@
-class ForemanHosts::SyhostmodeldetailsController < ApplicationController
-  # GET /syhostmodeldetails
-  # GET /syhostmodeldetails.json
-  def index
-    @syhostmodeldetails = ForemanHosts::Syhostmodeldetail.all.paginate(:page => params[:page])
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @syhostmodeldetails }
-    end
-  end
-
-  # GET /syhostmodeldetails/1
-  # GET /syhostmodeldetails/1.json
-  def show
-    @syhostmodeldetail = ForemanHosts::Syhostmodeldetail.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @syhostmodeldetail }
-    end
-  end
-
-  # GET /syhostmodeldetails/new
-  # GET /syhostmodeldetails/new.json
-  def new
-    @syhostmodeldetail = ForemanHosts::Syhostmodeldetail.new
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @syhostmodeldetail }
-    end
-  end
-
-  # GET /syhostmodeldetails/1/edit
-  def edit
-    @syhostmodeldetail = ForemanHosts::Syhostmodeldetail.find(params[:id])
-  end
-
-  # POST /syhostmodeldetails
-  # POST /syhostmodeldetails.json
-  def create
-    @syhostmodeldetail = ForemanHosts::Syhostmodeldetail.new(params[:foreman_hosts_syhostmodeldetail])
-
-    respond_to do |format|
-      if @syhostmodeldetail.save
-        format.html { redirect_to @syhostmodeldetail, notice: 'syhostmodeldetail was successfully created.' }
-        format.json { render json: @syhostmodeldetail, status: :created, location: @syhostmodeldetail }
-      else
-                format.html { render action: "new" }
-        format.json { render json: @syhostmodeldetail.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /syhostmodeldetails/1
-  # PUT /syhostmodeldetails/1.json
-  def update
-    @syhostmodeldetail = ForemanHosts::Syhostmodeldetail.find(params[:id])
-
-    respond_to do |format|
-      if @syhostmodeldetail.update_attributes(params[:foreman_hosts_syhostmodeldetail])
-        format.html { redirect_to @syhostmodeldetail, notice: 'syhostmodeldetail was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @syhostmodeldetail.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /syhostmodeldetails/1
-  # DELETE /syhostmodeldetails/1.json
-  def destroy
-    @syhostmodeldetail = ForemanHosts::Syhostmodeldetail.find(params[:id])
-    @syhostmodeldetail.destroy
-    respond_to do |format|
-      format.html { redirect_to foreman_hosts_syhostmodeldetails_url }
-      format.json { head :no_content }
-    end
-
-
-  end
-end

data/app/models/foreman_hosts/syhostmodeldetail.rb

@@ -1,5 +0,0 @@
-class ForemanHosts::Syhostmodeldetail < ActiveRecord::Base
-  attr_accessible :no, :status, :fact_name_id, :syhostmodel_id, :syhostmodel_type
-  belongs_to :foreman_hosts_syhostmodel, class_name: "ForemanHosts::Syhostmodel",foreign_key: "syhostmodel_id"
-  #belongs_to :fact_name, class_name: "FactName", foreign_key: "fact_name_id"
-end

data/app/views/foreman_hosts/syhostmodels/_report.html.erb

@@ -1,258 +0,0 @@
-<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=''><%= sort :name, :as => _('Name') %></th>
-      <% detail_name_no1 = 1 %>
-     <% details.each do |detail| %>
-
-      <th id="td<%= detail_name_no1 %>"><%#= detail.fact_name.name %>
-      <br />
-      <button  type='button'><a href="javascript:void(0);"  onclick="DeleteSignColumn(<%= detail_name_no1 %>);"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></button></th>
-            <% detail_name_no1 += 1 %>
-     <% end %>
-    </tr>
-  </thead> 
-  <tbody>
-    <% #Host.all.each do |host| %>
-      <tr>
-        <td class='ellipsis'><%#= name_column(host) %></td>
-
-          <!--  <% #details.each do |detail| %> -->
-              <td>
-                <%#= FactValue.where(host_id: host.id, fact_name_id: detail.fact_name_id).last.value rescue nil%>
-
-  
-              <%#= get_detail_value(host, detail_name) %> 
-              </td>
-            <%# end %>
-
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-
-
-
-
-
-<script type="text/javascript">
-  function export_excel(){
-    var uri = $("#tblExport").battatech_excelexport({
-                containerid: "tblExport",
-                datatype: 'table',
-                returnUri: true
-            });
-    $("#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);
-      }
-    }
-
-}
-/*
- * jQuery Client Side Excel Export Plugin Library
- * http://www.battatech.com/
- *
- * Copyright (c) 2013 Batta Tech Private Limited
- * Licensed under https://github.com/battatech/battatech_excelexport/blob/master/LICENSE.txt
- */
-
-(function ($) {
-    var $defaults = {
-        containerid: null
-        , datatype: 'table'
-        , dataset: null
-        , columns: null
-        , returnUri: false
-        , worksheetName: "Sheet1"
-        , encoding: "utf-8"
-    };
-
-    var $settings = $defaults;
-
-    $.fn.battatech_excelexport = function (options) {
-        $settings = $.extend({}, $defaults, options);
-
-        var gridData = [];
-        var excelData;
-
-        return Initialize();
-
-        function Initialize() {
-            var type = $settings.datatype.toLowerCase();
-
-            BuildDataStructure(type);
-
-            switch (type) {
-                case 'table':
-                    excelData = Export(ConvertFromTable());
-                    break;
-                case 'json':
-                    excelData = Export(ConvertDataStructureToTable());
-                    break;
-                case 'xml':
-                    excelData = Export(ConvertDataStructureToTable());
-                    break;
-                case 'jqgrid':
-                    excelData = Export(ConvertDataStructureToTable());
-                    break;
-            }
-
-            if ($settings.returnUri) {
-                return excelData;
-            }
-            else {
-                window.open(excelData);
-            }
-        }
-
-        function BuildDataStructure(type) {
-            switch (type) {
-                case 'table':
-                    break;
-                case 'json':
-                    gridData = $settings.dataset;
-                    break;
-                case 'xml':
-                    $($settings.dataset).find("row").each(function (key, value) {
-                        var item = {};
-
-                        if (this.attributes != null && this.attributes.length > 0) {
-                            $(this.attributes).each(function () {
-                                item[this.name] = this.value;
-                            });
-
-                            gridData.push(item);
-                        }
-                    });
-                    break;
-                case 'jqgrid':
-                    $($settings.dataset).find("rows > row").each(function (key, value) {
-                        var item = {};
-
-                        if (this.children != null && this.children.length > 0) {
-                            $(this.children).each(function () {
-                                item[this.tagName] = $(this).text();
-                            });
-
-                            gridData.push(item);
-                        }
-                    });
-                    break;
-            }
-        }
-
-        function ConvertFromTable() {
-            var result = $('<div>').append($('#' + $settings.containerid).clone()).html();
-            return result;
-        }
-
-        function ConvertDataStructureToTable() {
-            var result = "<table>";
-
-            result += "<thead><tr>";
-            $($settings.columns).each(function (key, value) {
-                if (this.ishidden != true) {
-                    result += "<th";
-                    if (this.width != null) {
-                        result += " style='width: " + this.width + "'";
-                    }
-                    result += ">";
-                    result += this.headertext;
-                    result += "</th>";
-                }
-            });
-            result += "</tr></thead>";
-
-            result += "<tbody>";
-            $(gridData).each(function (key, value) {
-                result += "<tr>";
-                $($settings.columns).each(function (k, v) {
-                    if (value.hasOwnProperty(this.datafield)) {
-                        if (this.ishidden != true) {
-                            result += "<td";
-                            if (this.width != null) {
-                                result += " style='width: " + this.width + "'";
-                            }
-                            result += ">";
-                            result += value[this.datafield];
-                            result += "</td>";
-                        }
-                    }
-                });
-                result += "</tr>";
-            });
-            result += "</tbody>";
-
-            result += "</table>";
-            return result;
-        }
-
-        function Export(htmltable) {
-            var excelFile = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:x='urn:schemas-microsoft-com:office:excel' xmlns='http://www.w3.org/TR/REC-html40'>";
-            excelFile += "<head>";
-            excelFile += '<meta http-equiv="Content-type" content="text/html;charset=' + $defaults.encoding + '" />';
-            excelFile += "<!--[if gte mso 9]>";
-            excelFile += "<xml>";
-            excelFile += "<x:ExcelWorkbook>";
-            excelFile += "<x:ExcelWorksheets>";
-            excelFile += "<x:ExcelWorksheet>";
-            excelFile += "<x:Name>";
-            excelFile += "{worksheet}";
-            excelFile += "</x:Name>";
-            excelFile += "<x:WorksheetOptions>";
-            excelFile += "<x:DisplayGridlines/>";
-            excelFile += "</x:WorksheetOptions>";
-            excelFile += "</x:ExcelWorksheet>";
-            excelFile += "</x:ExcelWorksheets>";
-            excelFile += "</x:ExcelWorkbook>";
-            excelFile += "</xml>";
-            excelFile += "<![endif]-->";
-            excelFile += "</head>";
-            excelFile += "<body>";
-            excelFile += htmltable.replace(/"/g, '\'');
-            excelFile += "</body>";
-            excelFile += "</html>";
-
-            var uri = "data:application/vnd.ms-excel;base64,";
-            var ctx = { worksheet: $settings.worksheetName, table: htmltable };
-
-            return (uri + base64(format(excelFile, ctx)));
-        }
-
-        function base64(s) {
-            return window.btoa(unescape(encodeURIComponent(s)));
-        }
-
-        function format(s, c) {
-            return s.replace(/{(\w+)}/g, function (m, p) { return c[p]; });
-        }
-    };
-})(jQuery);
-
-</script>

data/app/views/foreman_hosts/syhostmodels/_sub.html.erb

@@ -1,37 +0,0 @@
-<div id="syhostmodeldetails">
-  <%= f.fields_for :syhostmodeldetails do |f| %>
-  <div class="row">
-    <div class="col-md-3 column form-group">
-      <label>no</label>
-      <%= f.text_field :no, class: "form_datetime form-control" %>
-    </div>
-    <div class="col-md-3 column form-group">
-      <label>status</label>
-      <%= f.select :status, [['please select', nil],"true", "false"], placeholder: "status", control_label: 'status', class: "col-md-3 column form-control"%>
-      <%#= f.text_field :status, class: "form_datetime form-control" %>
-    </div>
-
-    <div class="col-md-3 column form-group">
-      <label>fact_name_id</label><br />
-      <%#= f.select :fact_name_id, FactName.all.collect { |p| [ p.name, p.id ] }, include_blank: true , class: "col-md-3 column form-control"%>
-      
-      <%#= f.text_field :fact_name_id, class: "form_datetime form-control" %>
-    </div>
-    <div class="col-md-1 column form-group">
-      <label>delete</label>
-      <%= f.link_to_remove "删除", class: "btn btn-danger" %>
-    </div>
-  </div>
-  <%= f.hidden_field :syhostmodel_id, value: object.id %>
-  <%= f.hidden_field :syhostmodel_type, value: object.class.to_s %>
-<% end %>
-</div>
-<div class="row">
-  <div class="col-md-9 column form-group">
-
-  </div>
-  <div class="col-md-1 column form-group">
-    <label></label>
-    <%= f.link_to_add "新增", :syhostmodeldetails, :data => { :target => "#syhostmodeldetails" }, class: "btn btn-primary" %>
-  </div>
-</div>

data/db/migrate/20151015050239_create_syhostmodeldetails.rb

@@ -1,13 +0,0 @@
-class CreateSyhostmodeldetails < ActiveRecord::Migration
-	drop tables syhostmodeldetails if table_exists? :syhostmodeldetails
-  def change
-    create_table :syhostmodeldetails do |t|
-			t.integer :syhostmodel_id
-			t.string :syhostmodel_type
-			t.string :no
-			t.integer :fact_name_id
-			t.boolean :status
-			t.timestamps
-    end
-  end
-end