helpdesk 0.0.2 → 0.0.3

data/app/controllers/helpdesk/tickets_controller.rb

@@ -1,16 +1,13 @@
 module Helpdesk
-  class TicketsController < Helpdesk::ApplicationController
-
-    helper TicketsHelper
-
+  class TicketsController < ApplicationController
     # GET /tickets
     # GET /tickets.json
     def index
       if params[:tickets] == 'closed'
-        @tickets = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).closed.page(params[:page])
+        @tickets = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).closed
         @tickets_count = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active.count
       else
-        @tickets = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active.page(params[:page])
+        @tickets = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active
         @tickets_count = @tickets.size
       end
 
@@ -25,7 +22,7 @@ module Helpdesk
     # GET /tickets/1.json
     def show
       @tickets_count = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active.count
-      @ticket = Helpdesk::Ticket.find(params[:id])
+      @ticket = Ticket.find(params[:id])
 
       respond_to do |format|
         format.html # show.html.erb
@@ -37,7 +34,7 @@ module Helpdesk
     # GET /tickets/new.json
     def new
       @tickets_count = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active.count
-      @ticket = Helpdesk::Ticket.new
+      @ticket = Ticket.new
       @ticket.status = Helpdesk::Ticket::STATUSES[0][0]
 
       respond_to do |format|
@@ -46,8 +43,15 @@ module Helpdesk
       end
     end
 
+    # GET /tickets/1/edit
+    def edit
+      @ticket = Ticket.find(params[:id])
+    end
+
+    # POST /tickets
+    # POST /tickets.json
     def create
-      @ticket = Helpdesk::Ticket.new(ticket_params)
+      @ticket = Ticket.new(params[:ticket])
       @ticket.requester = helpdesk_user
       @ticket.status = Helpdesk::Ticket::STATUSES[0][0]
 
@@ -65,12 +69,10 @@ module Helpdesk
     # PUT /tickets/1
     # PUT /tickets/1.json
     def update
-      @ticket = Helpdesk::Ticket.find(params[:id])
+      @ticket = Ticket.find(params[:id])
 
       respond_to do |format|
-        if @ticket.update_attributes(ticket_params)
-          puts ticket_params
-          puts paramsp
+        if @ticket.update_attributes(params[:ticket])
           format.html { redirect_to @ticket, notice: 'Ticket was successfully updated.' }
           format.json { head :no_content }
         else
@@ -80,12 +82,5 @@ module Helpdesk
       end
     end
 
-
-    private
-
-    def ticket_params
-      params.require(:ticket).permit( :ticket_type_id, :subject, :description,comments_attributes:[:author_id, :comment, :public])
-    end
-
   end
 end

data/app/helpers/helpdesk/admin/tickets_helper.rb

@@ -1,13 +1,4 @@
 module Helpdesk
   module Admin::TicketsHelper
-    def humanize_with_i18n(string, scope = [])
-      I18n.t string, scope: scope, default: string.humanize
-    end
-
-    # The method prefix tells me that this should be in an object
-    # But it doesn't belong in our model, does it?
-    def tickets_statuses_for_select
-      Helpdesk::Ticket::STATUSES.map { |s| [humanize_with_i18n(s[0].to_s,'helpdesk.tickets.statuses'),s[0]] }
-    end
   end
 end

data/app/helpers/helpdesk/helpdesk_helper.rb

@@ -1,35 +1,15 @@
 module Helpdesk
   module HelpdeskHelper
-
-
     def menu_left(title,&block)
-      panel_menu(title,'default',&block)
-    end
-
-
-    def panel_menu(title,type,&block)
-      content_tag(:div,class: "panel panel-#{type}") do
-        content_tag(:div ,class: 'panel-heading') do
-          content_tag(:h3 ,title,class:'panel-title')
-        end +
-        content_tag( :ul, class: 'nav nav-pills nav-stacked ') do
+      content_tag(:fieldset) do
+        content_tag(:legend ,title) +
+        content_tag( :ul, class: 'nav nav-list') do
           capture(&block)
-        end
-      end
-    end
-
 
-    def panel(title,type,&block)
-      content_tag(:div,class: "panel panel-#{type}") do
-        content_tag(:div ,class: 'panel-heading') do
-          content_tag(:h3 ,title,class:'panel-title')
-        end +
-        content_tag( :div, class: 'panel-body') do
-          capture(&block)
         end
       end
     end
-
+    
 
     def menu_li(lbl, path, *args)
       options = args.extract_options!
@@ -43,12 +23,8 @@ module Helpdesk
       end
     end
 
-    def badge(num,css='pull-right')
-      raw("<span class=\"badge #{css}\">#{num}</span> ")
-    end
-
-    def ico(name)
-      raw("<i class=\"glyphicon glyphicon-#{name}\"></i> ")
+    def ico(name,color='black')
+      raw("<i class=\"icon-#{name} icon-#{color}\"></i> ")
     end
 
     def parent_layout(layout)

data/app/helpers/helpdesk/tickets_helper.rb

@@ -1,7 +1,4 @@
 module Helpdesk
   module TicketsHelper
-
-
-
   end
 end

data/app/mailers/helpdesk/comment_by_requester_confirmation

@@ -0,0 +1,38 @@
+!!!
+%html
+  %body
+    %div
+      %h1
+        Pojawił się nowy komentarz do zgłoszenie:
+        = @comment.ticket.ticket_type.title
+      %div.content
+        %p
+          Treść wysłana:
+          %br
+          = simple_format(@comment.comment)
+        %br
+        %br
+        %p
+          Zgłaszający:
+          %br
+          = @comment.author.send Helpdesk.display_user.to_sym
+          = @comment.author.email
+        %br
+        %br
+      %p
+        Życzymy miłego dnia!
+        %br
+          = Helpdesk.site_name
+        %br
+          %a{:href=>Helpdesk.site_address}
+            = Helpdesk.site_address
+      %div
+        Ta wiadomość została wygenrowana automatycznie. Nie odpowiadaj na nią. Jeśli nie zainicjowałeś akcji wysyłania tej wiadomości zgłoś to nam
+        %a{:href=>root_url}
+          klikając tutaj.
+
+    
+
+
+
+

data/app/mailers/helpdesk/notifications_mailer.rb

@@ -1,7 +1,5 @@
 class Helpdesk::NotificationsMailer < ActionMailer::Base
 
-  layout 'mailer_layout'
-
   def ticket_created_notification(ticket)
     @ticket = ticket
     mail(:subject=>"#{Helpdesk.helpdesk_name} | #{ticket.subject}",
@@ -14,6 +12,7 @@ class Helpdesk::NotificationsMailer < ActionMailer::Base
          :to => ticket.requester.email)
   end
 
+
   def comment_by_requester_notification(comment)
     @comment = comment
     mail(:subject=>"#{Helpdesk.helpdesk_name} | #{comment.ticket.subject}",

data/app/models/helpdesk/comment.rb

@@ -1,28 +1,22 @@
 module Helpdesk
   class Comment < ActiveRecord::Base
+    attr_accessible :author_id, :comment, :public, :ticket_id
     belongs_to :author, :class_name => Helpdesk.user_class.to_s
     belongs_to :ticket
 
-    default_scope -> {includes(:author).order('id ASC')}
-    scope :pub,  -> { where(:public, true)}
+    default_scope includes(:author).order('id ASC')
+    scope :pub,  where('public = ?',true)
 
     after_create :send_email
-    after_create :check_reopen
-
-    def check_reopen
-      if ticket.requester == author
-        ticket.update_column(:status ,:waiting)
-      end
-    end
 
 
     def send_email
       if self.public?
         if ticket.requester == author
-          Helpdesk::NotificationsMailer.comment_by_requester_notification(self).deliver if ticket.requester
+          Helpdesk::NotificationsMailer.comment_by_requester_notification(self).deliver
           Helpdesk::NotificationsMailer.comment_by_requester_confirmation(self).deliver if Helpdesk.send_confirmation_emails
         else
-          Helpdesk::NotificationsMailer.comment_by_helpdesk_notification(self).deliver if ticket.requester
+          Helpdesk::NotificationsMailer.comment_by_helpdesk_notification(self).deliver
           Helpdesk::NotificationsMailer.comment_by_helpdesk_confirmation(self).deliver if Helpdesk.send_confirmation_emails
         end
       end

data/app/models/helpdesk/faq.rb

@@ -2,7 +2,7 @@ module Helpdesk
   class Faq < ActiveRecord::Base
     translates :title, :text
     accepts_nested_attributes_for :translations
-    #attr_accessible :active, :position, :text, :title,:translations_attributes
+    attr_accessible :active, :position, :text, :title,:translations_attributes
 
     default_scope order('position ASC').includes(:translations)
 

data/app/models/helpdesk/ticket.rb

@@ -2,34 +2,41 @@ module Helpdesk
   class Ticket < ActiveRecord::Base
 
     STATUSES = [
-      [ :new,        'label-primary',3],
-      [ :open,        'label-warning',2],
-      [ :waiting,     'label-info',2],
-      [ :solved,      'label-success',0],
-      [ :not_fixable, 'label-default',-1],
-      [ :unreachable, 'label-default',-1],
-      [ :bug,         'label-default',-1]
+      [ :new,        'Nowe:', 'label-important',3],
+      [ :open,        'Otworzone:', 'label-warning',2],
+      [ :waiting,     'Otworzone: oczekujące', 'label-info',2],
+      [ :solved,      'Zamknięte: problem rozwiązany','label-success',0],
+      [ :not_fixable, 'Zamknięte: nienaprawialne','label-inverse',-1],
+      [ :unreachable, 'Zamknięte: klient nieosiągalny','label-inverse',-1],
+      [ :bug,         'Zamknięte: Przeniesione do bug tracker\'a','label-inverse',-1]
     ]
+    STATUS_OPTIONS = STATUSES.map { |i| [i[1], i[0]] }
     STATUS_BY_KEY = Hash[*STATUSES.map { |i| [i[0], i[1]] }.flatten]
-    STATUS_CLASS_BY_KEY= Hash[*STATUSES.map { |i| [i[0], i[1]] }.flatten]
-    STATUS_STATUS_BY_KEY= Hash[*STATUSES.map { |i| [i[0], i[2]] }.flatten]
-    OPEN_STATUSES_KEYS =  STATUSES.map { |i| (i[2]>0 ? i[0] : nil)}.compact
+    STATUS_CLASS_BY_KEY= Hash[*STATUSES.map { |i| [i[0], i[2]] }.flatten]
+    STATUS_STATUS_BY_KEY= Hash[*STATUSES.map { |i| [i[0], i[3]] }.flatten]
+    OPEN_STATUSES_KEYS =  STATUSES.map { |i| (i[3]>0 ? i[0] : nil)}.compact
+
+    attr_accessible :subject, :description
+    attr_accessible :requester_id, :assignee_id, :status, :comments_attributes,:ticket_type_id
+
+
 
 
     belongs_to :requester, :class_name => Helpdesk.user_class.to_s
     belongs_to :assignee, :class_name => Helpdesk.user_class.to_s
     belongs_to :ticket_type, :class_name => Helpdesk::TicketType
-    has_many :comments, -> {order("created_at DESC")},:dependent => :destroy
+    has_many :comments, :order => "created_at DESC"
 
 
-    scope :active,   -> {where('status IN (?) ',OPEN_STATUSES_KEYS)}
-    scope :unassigned,   -> {where('status IN (?) ',OPEN_STATUSES_KEYS).where('assignee_id is null')}
-    scope :closed, -> { where('status NOT IN (?)',OPEN_STATUSES_KEYS)}
-    default_scope -> { includes(:comments=>[:author])
+
+    scope :active,  where('status IN (?) ',OPEN_STATUSES_KEYS)
+    scope :unassigned,  where('status IN (?) ',OPEN_STATUSES_KEYS).where('assignee_id is null')
+    scope :closed, where('status NOT IN (?)',OPEN_STATUSES_KEYS)
+    default_scope includes(:comments=>[:author])
     .includes(:requester)
     .includes(:assignee)
     .includes(:ticket_type)
-    .order('id DESC')}
+    .order('id DESC')
 
     validates_presence_of :description,:requester_id,:ticket_type_id
 
@@ -37,15 +44,8 @@ module Helpdesk
 
 
     before_create :set_subject
-    before_create :set_status
     after_create  :send_email
 
-    def set_status
-      if self.status.blank?
-        self.status = :new
-      end
-    end
-
     def set_subject
       if self.created_at.nil?
         time = Time.now
@@ -55,7 +55,7 @@ module Helpdesk
 
       new_subject = "#{sprintf '%02d',time.year-2000}#{sprintf '%02d',time.month}#{sprintf '%02d',time.day}"
 
-      day_num = Helpdesk::Ticket.where(created_at: Date.today.beginning_of_day..Date.today.end_of_day).count+1
+      day_num = Sugestion.where(created_at: Date.today.beginning_of_day..Date.today.end_of_day).count+1
       new_subject += "-#{sprintf '%04d',day_num}: "
       self.subject = new_subject + subject.to_s
       self.subject.strip!
@@ -78,8 +78,5 @@ module Helpdesk
       end
     end
 
-
-
-
   end
 end

data/app/models/helpdesk/ticket_type.rb

@@ -2,12 +2,12 @@ module Helpdesk
   class TicketType < ActiveRecord::Base
     translates :title
     accepts_nested_attributes_for :translations
-    #attr_accessible :active, :position,:title,:translations_attributes,:tr_class
+    attr_accessible :active, :position,:title,:translations_attributes,:tr_class
 
-    default_scope ->{order('position ASC')}
+    default_scope order('position ASC')
 
-    scope :active,  -> {where(:active,  true)}
-    scope :inactive,  -> {where(:active, false)}
+    scope :active, where('active  = ? ', true)
+    scope :inactive, where('active  = ? ', false)
 
   end
 end

data/app/views/helpdesk/admin/faqs/_form.html.haml

@@ -7,14 +7,14 @@
           %li= msg
   = f.input :active
 
-
+ 
 
   - I18n.available_locales.each do |locale|
     %h1
       = locale
       = f.globalize_fields_for locale do |g|
         = g.input :title
-        = g.input :text, :as => :ckeditor, :input_html => { :ckeditor => {:width=>'100%',:height => 200,:toolbar => 'Full'} }
+        = g.input :text, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full'} } 
 
 
   = f.submit 'Save', :class=>'btn btn-primary'

data/app/views/helpdesk/admin/faqs/edit.html.haml

@@ -1,11 +1,14 @@
 = render 'menu'
 
+.row
+  .span3
+    %br
+  .span11
 
-- content_for :title do
-  Edycja pytania
+    %h1 Edycja pytania
 
-= render 'form'
+    = render 'form'
 
-= link_to 'Show', [:admin,@faq]
-\|
-= link_to 'Back', admin_faqs_path
+    = link_to 'Show', [:admin,@faq]
+    \|
+    = link_to 'Back', admin_faqs_path

data/app/views/helpdesk/admin/faqs/index.html.haml

@@ -1,6 +1,6 @@
 = render 'menu'
 
-- content_for :title do
+%h1
   -if params[:faqs] && params[:faqs] == 'active'
     = t('helpdesk.faqs.active')
   -elsif params[:faqs] && params[:faqs] == 'inactive'
@@ -27,7 +27,7 @@
             = t('helpdesk.faqs.faq.inactive')
       %div.span5
         = faq.title
-      %div.span2
+      %div.span2  
         = link_to t('helpdesk.show'), admin_faq_path(faq), class: 'btn btn-info btn-mini'
         = link_to t('helpdesk.edit'), edit_admin_faq_path(faq),class: 'btn btn-primary btn-mini'
         = link_to t('helpdesk.destroy'), admin_faq_path(faq), method: :delete, data: { confirm: 'Are you sure?' },class: 'btn btn-danger btn-mini'

data/app/views/helpdesk/admin/faqs/new.html.haml

@@ -1,6 +1,5 @@
 = render 'menu'
-- content_for :title do
-  New faq
+%h1 New faq
 
 = render 'form'
 

data/app/views/helpdesk/admin/faqs/show.html.haml

@@ -10,7 +10,7 @@
   = @faq.title
 %p
   %b Text:
-  = raw @faq.text
+  = simple_format(@faq.text)