abstracted 0.3.4 → 0.4.1

data/app/assets/javascripts/init.js.coffee

@@ -53,7 +53,7 @@ App.init = ->
     #
     # Prepare close-notice's for acting on clicks to remove div
     #
-    $(document.body).unbind('click.close_notice')
+    $(document.body).off('click.close_notice')
     $(document.body).on 'click.close_notice', 'a.close-notice', App.closeNotice
 
 

data/app/controllers/abstract_resources_controller.rb

@@ -4,13 +4,13 @@ class AbstractResourcesController < ApplicationController
   self.responder = ::AbstractedResponder
   respond_to :html, :xml, :js, :json
 
-  before_action :set_resource #, except: :index
-  before_action :set_fab_button_options
-  before_filter :set_parents, only: [ :new, :edit, :show ]
-  before_action :set_resources, only: [:index, :print]
-  before_action :set_variant_template
+  include PrintControl
+  include ResourceControl
+  include ParentControl
 
   before_filter :authenticate_user!
+  before_action :set_fab_button_options
+  before_action :set_variant_template
   after_action :verify_authorized
   # after_action  :manage_parenthood, only: [:create,:update,:destroy]
 
@@ -101,16 +101,6 @@ class AbstractResourcesController < ApplicationController
     scoop_from_error e
   end
 
-  #
-  # build an array of the resource - particular to <SELECT>
-  def set_parents
-    @parents = []
-    return @parents unless resource_class.respond_to? :roots #( 'arraying') && resource? )
-    @parents = resource_class.arraying({ order: 'name'}, resource.possible_parents)
-  rescue Exception => e
-    scoop_from_error e
-  end
-
   def show
     authorize resource
     respond_with resource
@@ -133,42 +123,6 @@ class AbstractResourcesController < ApplicationController
     scoop_from_error e
   end
 
-  PRINTSUCCESS = 1
-  NOQUEUE = -1
-  NOUSER = -2
-  PRINTRECERROR = -3
-  PRINTCMDERROR = -4
-  PRINTLISTERROR = -5
-  PRINTEXCEPTION = -99
-
-  #
-  # print this view - let the Class handle everything
-  # returning either the ID to a print_job or false (in which case something went terribly wrong)
-  #
-  # always an Ajax call - hence will always update the print_jobs link with 'yellow'-blink
-  # POST /printers/print.js
-  # params[:id] holds records to be printed
-  def print
-    authorize resource, :print?
-    if resources.any?
-      if print_resources > 0
-        flash[:info] = t(:resources_printed_correct)
-        status = 200
-      else
-        flash[:error] = t(:resources_not_found_printjob_not_created)
-        status = 301
-      end
-    else
-      flash[:error] = I18n.oxt(:resources_not_found_printjob_not_created)
-      status = 301
-    end
-    return if params[:download]
-    render :print, layout: false, status: status and return
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-
   def index
     authorize resource_class, :index?
     respond_with resources
@@ -217,139 +171,6 @@ class AbstractResourcesController < ApplicationController
     scoop_from_error e
   end
 
-  def resource_params
-    raise 'You need to "def resource_params" on the %sController! (see: http://blog.trackets.com/2013/08/17/strong-parameters-by-example.html)' % params[:controller].capitalize
-  end
-
-  def set_resource
-    parent
-    resource
-  end
-
-  def set_resources
-    resources
-  end
-
-  def resource?
-    !(%w{NilClass TrueClass FalseClass}.include? @resource.class.to_s)
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-  def resource
-    @resource ||= (_id.nil? ? new_resource : resource_class.find(_id) )
-    return @resource if @resource.nil?
-    @resource.current_user = (current_user || nil) if @resource.respond_to? :current_user
-    @resource
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-  # def resource=val
-  #   @resource=val
-  # end
-
-  def new_resource
-    return nil if resource_class.nil?
-    return resource_class.new if resource_class.ancestors.include?( ActiveRecord::Base ) and !(params.include? resource_class.to_s.underscore) #[ 'create', 'update' ].include? params[:action]
-    p = resource_params
-    p=p.compact.first if p.class==Array
-    return resource_class.new(p.merge(current_user: current_user)) if resource_class.ancestors.include? ActiveRecord::Base
-    nil
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-  def _id
-    return nil if !params[:id] || params[:id]=="0"
-    params[:id] || params["#{resource_class.to_s.downcase}_id".to_sym]
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-  def resource_name options={}
-    resource_class.table_name
-  rescue Exception => e
-    scoop_from_error e
-    # resource_class.to_s.underscore.pluralize
-  end
-
-  def resource_class
-    return @resource_class if resource?
-    @resource_class ||= params[:controller].singularize.classify.constantize
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-  def resource_class= val
-    @resource_class = val
-  end
-
-  def parent
-    @parent ||= find_parent
-  end
-
-
-  def parent_class
-    @parent_class ||= @parent.class
-  end
-
-  def parent_class= val
-    @parent_class = val
-  end
-
-  def parent?
-    !(%w{NilClass TrueClass FalseClass}.include? parent.class.to_s)
-  end
-
-  #
-  #
-  # return the resources collection - preferably from the cache
-  def resources options={}
-    @resources ||= find_resources options
-  end
-
-
-  #
-  # returns the url for the resource - like /users/1
-  def resource_url options={}
-    r=request.path
-    id=params[:id]
-    options = case params[:action]
-      when 'create','update','delete','destroy'; ""
-      else resource_options(options)
-    end
-    return "%s%s" % [r,options] if r.match "#{resource.class.to_s.tableize}\/#{id}$"
-    "%s%s" % [ r.split("/#{params[:action]}")[0], options]
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-
-  #
-  # returns the url for the resources - /employees or /employees/1/events
-  def resources_url options={}
-    r=request.path
-    options = case params[:action]
-      when 'create','update','delete','destroy'; ""
-      else resource_options(options)
-    end
-    return "%s%s" % [r,options] if r.match "#{resource.class.to_s.tableize}$"
-    "%s%s%s" % [ r.split( resource.class.to_s.tableize)[0],resource.class.to_s.tableize, options]
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-  #
-  # parent_url returns the parent url - /employees/1
-  def parent_url options={}
-    parent? ? url_for(@parent) : ""
-    # parent? ? ( "/%s/%s" % [ @parent.class.table_name, @parent.id ] ) : ""
-  rescue Exception => e
-    scoop_from_error e
-  end
-
-
   private
 
     # you can override this on your controller
@@ -362,43 +183,6 @@ class AbstractResourcesController < ApplicationController
       resources_url {}
     end
 
-    #
-    # print_resources will try to add a print_job
-    # return error code
-    def print_resources
-      if resource_class == PrintJob
-        resources.each do |res|
-          return NOQUEUE unless Delayed::Job.enqueue res, :queue => 'printing'
-        end
-        return PRINTSUCCESS
-      else
-        return NOUSER unless current_user
-        params[:user] = current_user
-        if params[:print_list].nil?
-          #
-          # print something specific?
-          if params[:print_cmd].nil?
-            resources.each do |res|
-              return PRINTRECERROR unless res.print_record params: params, context: self
-            end
-          else
-            resources.each do |res|
-              return PRINTCMDERROR unless res.send(params[:print_cmd],params)
-            end
-          end
-        else
-          params[:resources] = resources
-          return PRINTLISTERROR unless resource_class.print_list( params )
-        end
-      end
-
-      return PRINTSUCCESS
-
-
-    rescue Exception => err
-      return PRINTEXCEPTION
-    end
-
     #
     # use views/../$action.html+mobile.erb if request originates from an iPad
     #
@@ -406,62 +190,6 @@ class AbstractResourcesController < ApplicationController
       request.variant = :mobile if request.user_agent =~ /iPad/
     end
 
-    def resource_options options
-      options.merge! params.except( "id", "controller", "action", "utf8", "_method", "authenticity_token" )
-      options = (options.empty? ? "" : "?" + options.collect{ |k,v| "#{k}=#{v}" }.join("&"))
-    end
-
-    #
-    # find the resources collection
-    def find_resources options
-
-      # return [] unless resource_class.ancestors.include? ActiveRecord::Base
-      params[:ids] ||= []
-      params[:ids] << params[:id] unless params[:id].nil?
-
-      if params[:ids].compact.any?
-        policy_scope(resource_class).where(id: params[:ids].compact.split(",").flatten)
-      else
-        if params[:q].blank? #or params[:q]=="undefined"
-          r = parent? ? parent.send(resource_name) : (resource_class.nil? ? nil : find_all_resources(options))
-        else
-          r = find_resources_queried options
-        end
-        if (r.respond_to?( :page)) && (params[:format].nil? or params[:format]=='html' or params[:scrolling])
-          params[:perpage] ||= 20
-          params[:page] ||= 1
-          return r.page(params[:page]).per(params[:perpage])
-        else
-          return r
-        end
-
-        # (params[:format].nil? or params[:format]=='html') ? r.page(params[:page]).per(params[:perpage]) : r
-      end
-    end
-
-    #
-    # find queried resources collection - implement on each controller to customize
-    # raise an exception
-    def find_all_resources options
-      policy_scope(resource_class)
-    end
-
-    #
-    # find queried resources collection - implement on each controller to customize
-    # raise an exception
-    def find_resources_queried options
-      case params[:f]
-      when nil
-        if parent?
-          policy_scope(resource_class).tags_included?( params[:q].split(" ") ).where( options )
-        else
-          policy_scope(resource_class).tags_included?( params[:q].split(" ") )
-        end
-      else
-        policy_scope(resource_class)
-      end
-    end
-
 
     #
     # build options for fixed action button - implement on each controller to customize
@@ -480,84 +208,7 @@ class AbstractResourcesController < ApplicationController
       @fab_button_options = opt
     end
 
-    #
-    #
-    # /employees/1/teams
-    # /employees/1/teams/5
-    # /employees/1/teams/5/attach
-    # /theatres/2/contacts/5/uris.js
-    def find_parent path=nil, parms=nil
-      path ||= request.path
-      parms ||= params
-      if parms[:parent].nil? #or params[:parent_id].nil?
-        paths=path.split("/")
-        paths.pop if %w{new edit show create update delete index}.include? paths[-1]
-        return nil if (paths.size < 3) #or (paths.size==4 and %w{edit new}.include?( parms[:action]))
-        recognise_path paths.join("/")
-      else
-        parms[:parent].classify.constantize.find(parms[:parent_id])
-      end
-    end
-    #
-    # ['theatres','5','contacts','2','uris.js']
-    def recognise_path path
-      path_elements = Rails.application.routes.recognize_path path.gsub /\..*$/,''   # "/admin/users/2/printers/3/attach" => {:controller=>"printers", :action=>"attach", :user_id=>"2", :id=>"3"}
-      recognise_parent( recognise_resource( path_elements ) )
-
-    rescue Exception => e
-      nil
-      # return [ nil, nil, false ] if e.class.to_s == "ActionController::RoutingError"
 
-    end
-
-    # {:controller=>"printers", :action=>"attach", :user_id=>"2", :id=>"3"}
-    def recognise_resource elems
-      resource_class = elems.delete(:controller).singularize.classify.constantize
-      resource = resource_class.find( elems.delete(:id) )
-      elems
-    rescue Exception => e
-      return elems if e.class.to_s == "ActiveRecord::RecordNotFound"
-      resource_class = nil
-      elems
-    end
-
-    # { :action=>"attach", :user_id=>"2" }
-    def recognise_parent elems
-      elems.delete :action
-      arr = elems.keys.first.to_s.split("_")
-      return nil unless arr.include? "id"
-      arr.pop
-      arr.join("_").singularize.classify.constantize.find(elems.values.first)
-    rescue
-      nil
-    end
-
-    #
-    # # /employees/1/teams/new
-    # # /employees/1/teams/1/edit
-    # # /employees/1/teams/1/delete
-    def update_parenthood
-      if params[:parent] and params[:parent_id]
-        # raise "Ups - is this ready for prime time yet?"
-        parent = params[:parent].classify.constantize.find(params[:parent_id])
-        unless parent.blank?
-          case params[:action]
-          when "create"
-            children = eval("parent.#{resource_name}")
-            children << resource unless children.include? resource
-          # when "edit"
-          when "delete"
-            children = eval("parent.#{resource_name}")
-            children >> resource
-          end
-        end
-      end
-      true
-    rescue
-      false
-    end
-    #
-    #
 
     def scoop_from_error e
       raise e if %w{ test development }.include? Rails.env
@@ -589,6 +240,22 @@ class AbstractResourcesController < ApplicationController
         flash.now[:error] = flash[:error] = "A template error occured - please call ALCO with: <br/><small>%s</small>" % e.message
         result= false
         status = 301
+
+      # when "PrintJobNotCreatedError"
+      #
+      # when "NoPreferredPrintersFound"
+      #   logit :error, 'No preferred printers found! Sending PDF by email to %s (%s) ' % [usr.name,usr.email]
+      #
+      # when "PrintJobResourceError"
+      #   logit :error, 'PrintJob could not be created - no records!?'
+      #   return false
+      #
+      # when "PrintJobPrinterNotAvailableError"
+      #   logit :error, 'PrintJob could not be created - the user has no printers attached!!'
+      #   return false
+
+
+
       else
         raise e
         # flash.now[:error] = flash[:error] = "An error occured - please refer to log for details!"

data/app/helpers/abstract_resources_helper.rb

@@ -164,8 +164,6 @@ module AbstractResourcesHelper
     '%s/%s/%s/defer' % [url_for( parent), resource.class.to_s.downcase.pluralize, resource.id]
   end
 
-
-
   #
   # List Helpers
   def set_attached_class children, child
@@ -175,7 +173,8 @@ module AbstractResourcesHelper
     children.include?( child) ? "" : "detached"
   end
 
-
+  #
+  #
   def show_resource_active item, linkable=true
     unless linkable
       if item.active
@@ -196,51 +195,67 @@ module AbstractResourcesHelper
     end
   end
 
-
+  #
   # return a link to delete a row
   def show_resource_delete_icon item, url, lbl='name'
-    link_to item, class: 'delete_link', data: { balloon: t("balloons.delete" ), balloon_pos: "left", url: url, name: "#{item.send lbl }", id: "#{item.id}", remove: "#tr-#{item.class.to_s}-#{item.id}" } do
+    link_to item, class: 'delete_link', data: { delete_title: t("delete_title"), delete_prompt: t("delete_prompt", item: t("delete_modal.#{item.class.to_s.underscore}")), delete_confirm: t("delete_confirm"), balloon: t("balloons.delete" ), balloon_pos: "left", url: url, name: "#{item.send lbl }", id: "#{item.id}", remove: "#tr-#{item.class.to_s}-#{item.id}" } do
       content_tag :i, 'delete', class: 'material-icons small'
     end
     # = link_to account, class: 'delete_link', data: { url: '/admin/accounts', name: "#{account.name}", id: "#{account.id}", remove: "#tr-#{account.id}" } do
     #   %i.material-icons.small{ title: "#{t('.delete')}"} delete
 
   end
+
+  #
   def build_delete_link resource
     link_to(content_tag(:i,'delete',class:'material-icons icon-trash'), resource, class: 'btn btn-mini delete_item', :"data-no-turbolink"=>true)
   end
 
+  #
   # return a link to print a row
   # url: ''
-  # list: true|false
-  # template: 'what_list.html.haml',
-  # button: true|false                                                either a button or a link
-  # text: 'what to write on the link if at all'
+  # print: {template: 'what_list.html.haml', layout: 'list'|'record', range: '1,2,4-5', medium: 'printer'|'display'|'email'|'download', format: 'html'|'pdf', printer: 'name_of_printer'}
+  # data: { action: '', method: '', selector: '', id: '', osv. }
+  # button: 'material-icons'|false                                    either classes for a button or false => a link
+  # link_layout: { text: '', title: '', icon: '' }                    text for the link - or <a..>text<i title="">icon</i></a>
   # classes: 'btn btn-mini print_item print_items ...'                jquery hooks print_item will print a specific record, print_items will print a list of records
   def build_print_link resource, options={}
-
-    list = options.include?(:list) ? options.delete(:list) : true
-    button = options.include?(:button) ? options[:button] : false
-    print_options = options.include?(:print_options) ? "?" + options.delete(:print_options) : ""
-    url = options.include?(:url) ? options.delete(:url) : ( !list ? url_for( resource) + "/print" + print_options : url_for(resource_class.to_s.underscore.pluralize) + "/print?print_list=true&#{add_print_params}" )
-    classes = options.include?(:classes) ? options.delete(:classes) : ( button ? 'btn btn-mini' : '')
-    classes += ( list ? ' print_items' : ' print_item')
-    return link_to( build_button_tag(options), url, class: classes) if options.include?(:button)
-    link_to t(resource_class.to_s.underscore.pluralize.to_sym), url, options.merge( classes: classes)
-
-  end
-
-
-  def build_button_tag options={}
-    text = options.include?(:text) ? options.delete(:text) : nil
-    button = options.include?(:button) ? options.delete(:button) : false
-    if text
-      content_tag( :span) do
-        text
-      end << content_tag(:i,nil, class: button )
-    else
-      content_tag(:i,nil, class: button )
-    end
+    url, list, options = build_resource_url(resource,options)
+    button = options.delete(:button) || false
+    options[:class] = options.delete(:classes) || ( button ? 'btn btn-mini' : '')
+    options[:class] += ( list ? ' print_items' : ' print_item')
+    return link_to( build_button_tag(button, options), url, options) if button
+    text = options.delete(:text) || t(resource_class.to_s.underscore.pluralize.to_sym)
+    link_to text, url, options
+  end
+
+  # return an array url, list, options
+  # options{ url: '', button: '', classes: '', text: ''}
+  def build_resource_url resource, options={}
+    print_options = options.delete(:print) || {}
+    args = add_print_params params.merge( print: print_options)
+    data_attribs = options.delete(:data) || {}
+    list = print_options[:format]=='list' || false
+    url = "%s/print?%s" % [ options.delete(:url) || ( !list ? url_for( resource) : url_for(resource_class.to_s.underscore.pluralize) ), args ]
+    [ url, list, options.merge( data: data_attribs) ]
+  end
+
+  # return button_tag
+  # text: 'what to write on the link if at all'
+  # classes: 'btn btn-mini print_item print_items ...'                jquery hooks print_item will print a specific record, print_items will print a list of records
+  def build_button_tag button, options={}
+    layout = options.delete(:link_layout) || {}
+    text = layout.delete(:text) || ''
+    title = layout.delete(:title) || ''
+    icon = layout.delete(:icon) || ''
+    (text << content_tag(:i,icon, class: button, title: title )).html_safe
+    # if text
+    #   content_tag( :span) do
+    #     text[1]
+    #   end << content_tag(:i,text[0], class: button )
+    # else
+    #   content_tag(:i,text[0], class: button )
+    # end
   end
 
 
@@ -425,52 +440,19 @@ module AbstractResourcesHelper
     preferred ? r_url + "/defer" : r_url + "/prefer"
   end
 
-
-  # return a link to print a row
-  # url: ''
-  # list: true|false
-  # template: 'what_list.html.haml',
-  # button: true|false                                                either a button or a link
-  # text: 'what to write on the link if at all'
-  # classes: 'btn btn-mini print_item print_items ...'                jquery hooks print_item will print a specific record, print_items will print a list of records
-  # def build_print_link resource, options={}
-  #
-  #   list = options.include?(:list) ? options.delete(:list) : true
-  #   button = options.include?(:button) ? options[:button] : false
-  #   print_options = options.include?(:print_options) ? "?" + options.delete(:print_options) : ""
-  #   url = options.include?(:url) ? options.delete(:url) : ( !list ? url_for( resource) + "/print" + print_options : url_for(resource_class.to_s.underscore.pluralize) + "/print?print_list=true&#{add_print_params}" )
-  #   classes = options.include?(:classes) ? options.delete(:classes) : ( button ? 'btn btn-mini' : '')
-  #   classes += ( list ? ' print_items' : ' print_item')
-  #   return link_to( build_button_tag(options), url, class: classes) if options.include?(:button)
-  #   link_to oxt(resource_class.to_s.underscore.pluralize.to_sym), url, options.merge( classes: classes)
-  #
-  # end
-
-  # def build_button_tag options={}
-  #   text = options.include?(:text) ? options.delete(:text) : nil
-  #   button = options.include?(:button) ? options.delete(:button) : false
-  #   if text
-  #     content_tag( :span) do
-  #       text
-  #     end << content_tag(:i,nil, class: button )
-  #   else
-  #     content_tag(:i,nil, class: button )
-  #   end
-  # end
-
-  def add_print_params
+  def add_print_params p, prefix=""
     args = []
-    params.each do |k,v|
-      args << "#{k}=#{v}" unless %w{ ids action controller}.include? k
+    p.each do |k,v|
+      k = "#{prefix}[#{k}]" unless prefix.blank?
+      if v.is_a? Hash
+        args << add_print_params( v, 'print')
+      else
+        args << "#{k}=#{v}" unless %w{ ids action controller}.include? k
+      end
     end
     args.join("&")
   end
 
-  # def add_from_to_params
-  #   return "" if params[:from].blank?
-  #   "&from=#{params[:from]}&until=#{params[:until]}"
-  # end
-
   def build_toggle_white_collar_url
     if params[:blue_collar].nil?
       link_to oxt(:kun_timelønnede), collection_url(blue_collar: true), class: "btn btn-info"
@@ -534,4 +516,72 @@ module AbstractResourcesHelper
     end
   end
 
+  #
+  # when sorting rows
+  # set_direction will flip ASC and DESC
+  def set_direction dir
+    return 'ASC' unless dir
+    dir == 'ASC' ? 'DESC' : 'ASC'
+  end
+
+  #
+  # column_header sets a table header (TH) optionally with necessary data for balloon text and sorting
+  # options: balloon: "", balloon_pos: "", role: "", direction: "", field: ""
+  #
+  # bare minimum is
+  #   column_header :some_field  - which will be translated, using the tables.headers.some_field.label
+  #   (if you need a different "label", identify the sorting field by an field: table_field)
+  #
+  # adding class's to managing styling
+  #   column_header :some_field, class: ""
+  #
+  # adding sorting
+  #   column_header :some_field, role: "sort",
+
+  # adding balloon helptext
+  #   column_header :some_field, balloon: true
+  #   ( set the text to fixed with balloon: "FIXED TEXT - NOT TRANSLATED")
+  #   ( set position with balloon_pos: "left")
+  #
+  def column_header field, options={}
+    options[:data] ||= {}
+    # role = (options.delete :role) || ''
+    # classes = (options.delete :class) || ''
+    # id = (options.delete :id) || nil
+    balloon = (options.delete :balloon) || false
+    if balloon
+      options[:data][:balloon] = (balloon.class==String) ? balloon : I18n.translate("tables.headers.#{field}.balloon")
+      options[:data][:balloon_pos] = (options.delete :balloon_pos) || "up"
+      options[:data][:balloon_length] = (options.delete :balloon_length) || "fit"
+    end
+    options[:data][:field] = (options.delete :field) || field
+    options[:data][:direction] = (options.delete :direction) || @sorting_direction
+    txt = []
+    content_tag :th, options do
+      if options[:role] && options[:role]=="sort"
+        mark_sorted options[:data][:field], I18n.translate( "tables.headers.#{field}.label")
+      else
+        I18n.translate( "tables.headers.#{field}.label")
+      end
+    end
+  end
+
+  #
+  # mark_sorted will set a class depending on whether this column is sorted on
+  def mark_sorted col, label
+    if request.params[:s] == col
+      (
+        content_tag( :span, label, class: "th-label-sort-by") +
+        (content_tag :i, class: "material-icons" do
+          (request.params[:d]=='DESC' ? "arrow_drop_down" : "arrow_drop_up") rescue "arrow_drop_up"
+        end)
+      ).html_safe
+    else
+      content_tag :span, label, class: "th-label"
+    end
+  rescue
+    content_tag :span, label, class: "th-label"
+  end
+
+
 end