aslon_scaffold 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1495a58ba5db81286d9d2bb7a3d3d018f76656ff
-  data.tar.gz: bc48789b978fc2dec0b2730995f89963d93cfafc
+  metadata.gz: a5ced3021107dd62e0cf5817682ae2e7606f2d09
+  data.tar.gz: 89c805a4481c635973857266e57f36a430331645
 SHA512:
-  metadata.gz: 1fd63ad125ff6038b5077d29a33908a633f70b5a91b8f8b679ae035f600576e9bc6e471856ffd93a0a2d767fe3cd87d96793fea88a6c14ea073fb8319f54b3f4
-  data.tar.gz: 044972a85038f773958aa3bc3341c4f04c52131c2dcd2da6487a13f3b6bf01b37ffa30462e156d6ae755ce6482b811229c3b784b5d06b1840a56057096031ec2
+  metadata.gz: 01fb5cb684979bcc5d0bcac4eb83668c5fa1d9da754872022740e1e4470bcd03190a12c04ccdfc8162e4d824334eb1620969ecf8002909e28ed2d58ace3142d4
+  data.tar.gz: 186f46ead0f2ed90e8cfe19855ab4c2083cce0f9c2924f6d6235a651dd87611e9db99e5367699d7b8f52e00131962a006100bc548a4913d30677079121272165

data/lib/app/helpers/application_helper.rb

@@ -53,7 +53,7 @@ module ApplicationHelper
  end
   def titre_action (action,model)
     txt=model_name(model)
-    ("<h1 class='aslon_scaffold'>"+t("views.generic.#{action}", :model=>txt)+"</h1>").html_safe
+    ("<div class='aslon_scaffold'>"+t("views.generic.#{action}", :model=>txt)+"</div>").html_safe
   end
 
   def titre_show(objet, lib)
@@ -68,17 +68,19 @@ module ApplicationHelper
   end
 
   def link_to_image_edit(objet)
-    if ican? :edit,objet
-       link_to image_edit,eval("edit_#{objet.class.to_s.underscore.gsub('/','_')}_path(objet)"),:id=>'edit'
+    if can? :edit,objet.class
+        link_to '<i class="glyphicon glyphicon-pencil"></i> Edit'.html_safe, eval("edit_#{objet.class.to_s.underscore.gsub('/','_')}_path(objet)"), class: 'btn btn-default'
     end
+   # can? :edit,objet.class
   end
  def link_to_image_add(objet)
-   if ican? :create,objet
-      link_to image_add,eval("new_#{objet.class.to_s.underscore}_path(objet)"),:id=>'add'
+   if ican? :create,objet.class
+      # link_to image_add,eval("new_#{objet.class.to_s.underscore}_path(objet)"),:id=>'add'
+     link_to '<i class="glyphicon glyphicon-plus"></i> Add'.html_safe, eval("new_#{objet.class.to_s.underscore.gsub('/','_')}_path(objet)"), class: 'btn btn-default'
    end
-  end
+ end
   def link_to_image_delete(objet)
-      if ican? :destroy, objet
+      if ican? :destroy, objet.class
         link_to(image_delete, objet, :confirm => 'Are you sure?', :method => :delete, :id=>'delete')
       end
   end
@@ -92,10 +94,8 @@ module ApplicationHelper
   def titre(titre, model=nil, search=true, add=true, action='search',addlink=nil)
 
      s=form_tag('javascript:void(0)' )
-    s="
-<table id='titreliste' cellpadding='0' cellspacing='0' >
-<tr>
-	<th COLSPAN='10'>#{titre}"
+    # s="#{titre}"
+     s=""
     if add==true
       if addlink==nil
       t="new_"+model.singularize.underscore.gsub('/','_') + "_path(:fournisseur_id=>params[:fournisseur_id],
@@ -104,18 +104,20 @@ module ApplicationHelper
       else
         t=addlink
       end
-      s<<link_to(image_add, eval(t),:id=>'add') if ican?(:create, eval(model.camelcase))
+      # s<<link_to(image_add, eval(t),:id=>'add') if ican?(:create, eval(model.camelcase))
+      s<<"<form class='form-inline'>"
+
+      s<<link_to("<i class='glyphicon glyphicon-plus'></i> Add".html_safe, eval(t), class: 'btn btn-default')
 
     end
     if search
-      s<<" "+image_tag("aslon_scaffold/grid-split.gif", :border=>0, :style=>"vertical-align:middle")
-      s<<" Search : "
-      s<< text_field_tag( :search, nil, {:size=>10})
+      # s<<" "+image_tag("aslon_scaffold/grid-split.gif", :border=>0, :style=>"vertical-align:middle")
+      s<< text_field_tag( :search, nil, {:size=>20,:class=>'form-control',:placeholder=>"Search"})
+      s<<"</form>"
       s<< image_tag("aslon_scaffold/indicator.gif", :style=>"vertical-align:middle", :border => 0, :id => "spiner",:style => "display:none;" )
+
     end
-    s<<"</th>
-</tr>
-</table>"
+
     if search
       cond=":type=>'simle'"
 #      s<< observe_field(:search,
@@ -165,10 +167,11 @@ module ApplicationHelper
     sel+='&status='+params[:status] if params[:status]
 
     wp=will_paginate(table)
-    info_titre_tableau=page_entries_info(table)
+    # info_titre_tableau=page_entries_info(table)
+    info_titre_tableau=""
     s=''.force_encoding('utf-8')
     # --------------------------------------------------------------------
-    s<<"<table id='liste'>
+    s<<"<table class='table table-responsive table-hover table-striped' id='liste'>
                 <caption>#{info_titre_tableau}</caption>
           <thead>
             <tr>"
@@ -222,7 +225,7 @@ module ApplicationHelper
       id=''
       c_id=''
       # ------------- création id de la ligne --------------------------
-      h.each do |lib|          
+      h.each do |lib|
               begin
                 v=eval("aLine."+"#{lib}").to_s
               rescue
@@ -287,6 +290,135 @@ module ApplicationHelper
     end
 
   end
+  def tabledd(model, table, h, actions)
+    sel=''
+    sel='&type='+params[:type] if params[:type]
+    sel+='&status='+params[:status] if params[:status]
+
+    wp=will_paginate(table)
+    info_titre_tableau=page_entries_info(table)
+    s=''.force_encoding('utf-8')
+    # --------------------------------------------------------------------
+    s<<"<tbody><table  class='table table-responsive table-hover table-striped' id='liste'>
+                <caption>#{info_titre_tableau}</caption>
+          <thead>
+            <tr>"
+    # --------------------------------------------------------------------
+    # intitulé des colonnes
+    # --------------------------------------------------------------------
+
+      h.each do |value|
+        img='aslon_scaffold/sort_desc.gif'
+        sens='DESC'
+        if params[:order]==value && params[:sens]=='DESC'
+          sens='ASC'
+          img='aslon_scaffold/sort_desc.gif'
+        end
+
+        if params[:order]==value && params[:sens]=='ASC'
+          sens='DESC'
+          img='aslon_scaffold/sort_asc.gif'
+        end
+         hlib=eval("#{model.gsub('_','/').camelize}.human_attribute_name(value)")
+        # sorting doesn't work with search
+        if request.env['QUERY_STRING'] != "method=get" && !value.include?('.')
+          s<<"<th data-field=#{value} scope='col' onclick=\"self.location.href = \'#{request.env['PATH_INFO']}?#{sel}&order=#{value}&sens=#{sens}\'; \">"
+          s<< hlib
+          s<<" "+image_tag(img, :border=>0, :style=>"vertical-align:middle") if (img)
+          s<<"</th>"
+        else
+#          s<< "<th scope='col'>"+l(key)+"</th>"
+          s<< "<th scope='col'>"+hlib+"</th>"
+        end
+      end
+
+     s<<'</tr>'
+     s<<'</thead>'
+    # --------------------------------------------------------------------
+    # bas du tableau
+    # --------------------------------------------------------------------
+    s<< " <tfoot>
+              <tr>
+                  <th scope='row'>#{info_titre_tableau}</th>
+                  <td colspan='#{h.size-1}'>&nbsp; #{wp}</td>
+              </tr>
+          </tfoot>"
+    # s<<'</tbody>'
+    # --------------------------------------------------------------------
+    # lignes du tableau
+    # --------------------------------------------------------------------
+    i=1
+    script="".force_encoding('utf-8')
+    for aLine in table
+      id=''
+      c_id=''
+      # ------------- création id de la ligne --------------------------
+      h.each do |lib|
+              begin
+                v=eval("aLine."+"#{lib}").to_s
+              rescue
+                v='nil'
+              end
+              id<<model+'_'+lib+'_'+ v.gsub(' ', '')
+              c_id=aLine.id
+
+      end
+      # ----------------------------------------------------------------
+      # ----------------------------------------------------------------
+      if i%2==0
+        s<<"<tr id='#{id}' class=#{c_id}>"
+      else
+        s<<"<tr class='odd #{c_id}' id='#{id}'>"
+      end
+      i+=1
+      # ----------------------------------------------------------------
+      cp=0
+
+      h.each do |lib|
+
+          local= I18n.locale
+          begin
+            v=url(eval("aLine."+"#{lib}").to_s)
+          rescue
+            v='nil'
+          end
+          s<<""
+          premiere_colonne=v
+          t=model.singularize.downcase + "_url(aLine)"
+          if cp==0
+             s<<("<th scope='row' "+"class='"+model.singularize.downcase+'_'+lib+'_'+ v+'_'+"'>" )
+            premiere_colonne= link_to(v, eval(t),:id=>'show')
+          else
+            s<<('<td '+"class='"+model+'_'+lib.to_s+'_'+ v+'_'+local.to_s+"'>")
+          end
+
+          s<< premiere_colonne
+          lik= url_for( eval(t))
+  #        script << "<script>$('#{id}').observe('click',function(e) {window.location='#{lik}';},false)</script>"
+  #        script << "<script>$('#{id}').observe('click',function(e) {window.location='#{lik}';},false)</script>"
+        #  script << "<script>$('##{id}').click(function(){window.location='#{lik}';})</script>"
+          script << "<script>$('.#{c_id}').click(function(){window.location='#{lik}';})</script>"
+        if cp==0
+          s<<"&nbsp;</th>"
+        else
+          s<<"&nbsp;</td>"
+        end
+        cp+=1
+      end
+      s<<'</tr>'
+
+    end
+
+    s<<"</table>"
+    s<<'</tbody>'
+    s<<script
+    if table.size>0
+      return s
+    else
+      return "0 line"
+    end
+
+  end
 
  #todo rendre multiplangues
   def l(lib)

data/lib/app/views/aslon_scaffolds/index.haml

@@ -1,4 +1,7 @@
-=titre_action(controller.action_name,@model_name)
-=titre(eval("#{@model_name}.to_s.pluralize"),@model_name,search=true)
-#ajaxw
-  =render :partial=>'aslon_scaffolds/search'
+.panel.panel-default
+  .panel-heading
+    .panel-title
+      =titre_action(controller.action_name,@model_name)
+    =titre(eval("#{@model_name}.to_s.pluralize"),@model_name,search=true)
+  #ajaxw
+    =render :partial=>'aslon_scaffolds/search'

data/lib/aslon_scaffold/aslon_scaffold.rb

@@ -49,7 +49,7 @@ require "dynamic_form"
 
 class ActiveRecord::Base
    cattr_reader :per_page
-  @@per_page = 30
+  @@per_page = 3
 
   def to_label
     begin
@@ -194,9 +194,10 @@ def search
     last_part_condition=", '%#{params[:search]}%'"
     all_part_condition=  "' (#{first_part_condition}) and (#{condition}) '" +last_part_condition*search_field.size
 
-   eval  "@#{objet_name.pluralize}=#{model_name}.paginate(:page => params[:page], :conditions => [#{all_part_condition}], :order=>'id')"
+   # eval  "@#{objet_name.pluralize}=#{model_name}.paginate(:page => params[:page], :conditions => [#{all_part_condition}], :order=>'id')"
+    eval  "@#{objet_name.pluralize}=#{model_name}.where(#{all_part_condition}).order('id').limit(30).page(params[:page])"
 
-     aslon_render_partial('search')
+      aslon_render_partial('search')
     end
 
  # private
@@ -226,7 +227,7 @@ def search
        render :partial=>"#{action}", :layout=>false
 
      rescue
-       # render :partial=>"aslon_scaffolds/#{action}", :layout=>false
+        render :partial=>"aslon_scaffolds/#{action}", :layout=>false
      end
    end
 end

data/lib/aslon_scaffold/version.rb

@@ -1,4 +1,4 @@
 module AslonScaffold
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aslon_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - alson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate