From 88aa1a1b6c2d39b0828068b283a2cff9f7fb9bed Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 20 Jul 2012 13:23:09 +0200 Subject: [PATCH] Added ticket zoom previous/next pagination. --- .../app/views/agent_ticket_zoom.jst.eco | 14 +- .../app/views/generic/table.jst.eco | 4 +- app/assets/stylesheets/zzz.css | 7 + .../ticket_overviews_controller.rb | 120 ++++-------------- app/models/ticket.rb | 99 +++++++++++++++ 5 files changed, 149 insertions(+), 95 deletions(-) diff --git a/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco b/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco index 0475a6ad5..551aa73fb 100644 --- a/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco @@ -1,8 +1,20 @@
-
+

<%= @ticket.title %> <%= @ticket.number %>

+
+ <% if window.Config['LastOverview']: %> + + <% end %> +
diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index ae631df56..9cc0a886d 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -13,8 +13,10 @@ +<% position = 0 %> <% for object in @objects: %> - + <% position++ %> + <% if @checkbox: %> diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css index 32572c7f2..4b6b406c6 100644 --- a/app/assets/stylesheets/zzz.css +++ b/app/assets/stylesheets/zzz.css @@ -44,6 +44,13 @@ body { line-height: 26px; } +.pagination .count { + padding: 6px 6px; + float: left; + color: #999; +} + + /* replace music icon with attachment */ .icon-attachment { background-position: -24px 0; diff --git a/app/controllers/ticket_overviews_controller.rb b/app/controllers/ticket_overviews_controller.rb index 427cbf607..bbec1e3a7 100644 --- a/app/controllers/ticket_overviews_controller.rb +++ b/app/controllers/ticket_overviews_controller.rb @@ -4,103 +4,37 @@ class TicketOverviewsController < ApplicationController # GET /tickets def show #sleep 2 - # build up attributes hash - overview_selected = nil - overview_selected_raw = nil - overviews = Overview.all - overviews.each { |overview| - - # for cleanup reasons, remove me later! - overview.condition.each { |item, value | - if item == 'owner_id' && overview.condition[item] != 1 - overview.condition[item] = 'current_user.id' - end - } - - # remember selected view - if params[:view] && params[:view] == overview.meta[:url] - overview_selected = overview - overview_selected_raw = Marshal.load( Marshal.dump(overview.attributes) ) - end - - # replace 'current_user.id' with current_user.id - overview.condition.each { |item, value | - if value == 'current_user.id' - overview.condition[item] = current_user.id - end - } - } - - # sortby - # prio - # state - # group - # customer - - # order - # asc - # desc - - # groupby - # prio - # state - # group - # customer - -# all = attributes[:myopenassigned] -# all.merge( { :group_id => groups } ) - -# @tickets = Ticket.where(:group_id => groups, attributes[:myopenassigned] ).limit(params[:limit]) - # get only tickets with permissions - group_ids = Group.select( 'groups.id' ).joins(:users). - where( 'groups_users.user_id = ?', [current_user.id] ). - where( 'groups.active = ?', true ). - map( &:id ) - - # overview meta for navbar - if !overview_selected - - # loop each overview - result = [] - overviews.each { |overview| - - # get count - count = Ticket.where( :group_id => group_ids ).where( overview.condition ).count() - - # get meta info - all = overview.meta - - # push to result data - result.push all.merge( { :count => count } ) - } + # get navbar overview data + if !params[:view] + result = Ticket.overview( + :current_user_id => current_user.id, + ) render :json => result return end - # get tickets for overview - params[:start_page] ||= 1 - tickets = Ticket.where( :group_id => group_ids ). - where( overview_selected.condition ). - order( overview_selected[:order][:by].to_s + ' ' + overview_selected[:order][:direction].to_s ). - limit( overview_selected.view[ params[:view_mode].to_sym ][:per_page] ). - offset( overview_selected.view[ params[:view_mode].to_sym ][:per_page].to_i * ( params[:start_page].to_i - 1 ) ) - - tickets_count = Ticket.where( :group_id => group_ids ). - where( overview_selected.condition ). - count() - + # get real overview data + overview = Ticket.overview( + :view => params[:view], + :view_mode => params[:view_mode], + :current_user_id => current_user.id, + :start_page => params[:start_page], + ) + # get related users users = {} - tickets.each {|ticket| - if !users[ticket.owner_id] - users[ticket.owner_id] = user_data_full(ticket.owner_id) + tickets = [] + overview[:tickets].each {|ticket| + tickets.push ticket.attributes + if !users[ ticket.owner_id ] + users[ ticket.owner_id ] = user_data_full( ticket.owner_id ) end - if !users[ticket.customer_id] - users[ticket.customer_id] = user_data_full(ticket.customer_id) + if !users[ ticket.customer_id ] + users[ ticket.customer_id ] = user_data_full( ticket.customer_id ) end - if !users[ticket.created_by_id] - users[ticket.created_by_id] = user_data_full(ticket.created_by_id) + if !users[ ticket.created_by_id ] + users[ ticket.created_by_id ] = user_data_full( ticket.created_by_id ) end } @@ -109,21 +43,21 @@ class TicketOverviewsController < ApplicationController bulk_owner_ids = [] bulk_owners.each { |user| bulk_owner_ids.push user.id - if !users[user.id] - users[user.id] = user_data_full(user.id) + if !users[ user.id ] + users[ user.id ] = user_data_full( user.id ) end } # return result render :json => { - :overview => overview_selected_raw, + :overview => overview[:overview], :tickets => tickets, - :tickets_count => tickets_count, + :tickets_count => overview[:tickets_count], :users => users, :bulk => { :owner_id => { :id => bulk_owner_ids, - } + }, }, } end diff --git a/app/models/ticket.rb b/app/models/ticket.rb index 40f04b701..703d9fca9 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -123,6 +123,105 @@ class Ticket < ActiveRecord::Base return subject end + +# Ticket.overview( +# :view => 'some_view_url', +# :current_user_id => 123, +# ) + def self.overview (data) + + # build up attributes hash + overview_selected = nil + overview_selected_raw = nil + overviews = Overview.all + overviews.each { |overview| + + # for cleanup reasons, remove me later! + overview.condition.each { |item, value | + if item == 'owner_id' && overview.condition[item] != 1 + overview.condition[item] = 'current_user.id' + end + } + + # remember selected view + if data[:view] && data[:view] == overview.meta[:url] + overview_selected = overview + overview_selected_raw = Marshal.load( Marshal.dump(overview.attributes) ) + end + + # replace 'current_user.id' with current_user.id + overview.condition.each { |item, value | + if value == 'current_user.id' + overview.condition[item] = data[:current_user_id] + end + } + } + + # sortby + # prio + # state + # group + # customer + + # order + # asc + # desc + + # groupby + # prio + # state + # group + # customer + +# all = attributes[:myopenassigned] +# all.merge( { :group_id => groups } ) + +# @tickets = Ticket.where(:group_id => groups, attributes[:myopenassigned] ).limit(params[:limit]) + # get only tickets with permissions + group_ids = Group.select( 'groups.id' ).joins(:users). + where( 'groups_users.user_id = ?', [ data[:current_user_id] ] ). + where( 'groups.active = ?', true ). + map( &:id ) + + # overview meta for navbar + if !overview_selected + + # loop each overview + result = [] + overviews.each { |overview| + + # get count + count = Ticket.where( :group_id => group_ids ).where( overview.condition ).count() + + # get meta info + all = overview.meta + + # push to result data + result.push all.merge( { :count => count } ) + } + return result + end + + # get tickets for overview + data[:start_page] ||= 1 + tickets = Ticket.where( :group_id => group_ids ). + where( overview_selected.condition ). + order( overview_selected[:order][:by].to_s + ' ' + overview_selected[:order][:direction].to_s ). + limit( overview_selected.view[ data[:view_mode].to_sym ][:per_page] ). + offset( overview_selected.view[ data[:view_mode].to_sym ][:per_page].to_i * ( data[:start_page].to_i - 1 ) ) + + tickets_count = Ticket.where( :group_id => group_ids ). + where( overview_selected.condition ). + count() + + return { + :tickets => tickets, + :tickets_count => tickets_count, + :overview => overview_selected_raw, + } + + end + private def number_generate Ticket.new.number_adapter = Setting.get('ticket_number')