ish_manager 0.1.8.122 → 0.1.8.123

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e6f9c39cc27d8b44e998be4fbb42f037beb20d4
-  data.tar.gz: 500aa4bfda9c3f8e135c9b8739112d232bd64b8f
+  metadata.gz: 60c6a0b6aa5fed07b31412424c50e2f14c395930
+  data.tar.gz: 63cce52eb81e45612c83ae89a3088c229f47805b
 SHA512:
-  metadata.gz: 1874aa9677fd40fd60efae23fc3d2feb4dfc8e4e21818eae989a41f501dfd1938b758f3b56551a3ae4abf1522413426f46a6991cc56b0f9432bf17d05d9862d2
-  data.tar.gz: 67bf5e18d6f8b9a5c2f8f6f211785b13b6b73f80a0dcc573220d69b28be31037fdda080b123bdd96967b11cd60b00930e7a24dba295b1cf4c5f7e0b51ca31d05
+  metadata.gz: bc8df32d95c61e57a56c3d297f65b5147dd74854a2e27a59b4d6ea90a373c0ba9d44764b17606def53253a752db793dfb11b791054ee14fea4e99b02536f33ed
+  data.tar.gz: 6195b25ea59759e07c2537e81eb392ce6ff8771b20d37395ad79f755e4e593c2e0db47f37f8c86ba27f8ca3c6068ab29e3ef1914ef948497eb789c9d7ae598ec

data/app/controllers/ish_manager/leads_controller.rb

@@ -2,7 +2,12 @@ class IshManager::LeadsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Ish::Lead
-    @leads = Ish::Lead.where( :profile => current_user.profile )
+    @leads = Ish::Lead.where( :profile => current_user.profile, :is_trash => false )
+    if params[:is_done]
+      @leads = @leads.where( :is_done => true )
+    else
+      @leads = @leads.where( :is_done => false )
+    end
   end
 
   def new
@@ -22,18 +27,25 @@ class IshManager::LeadsController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
-=begin
+  def show
+    authorize! :redirect, IshManager::Ability
+    redirect_to :action => :edit, :id => params[:id]
+  end
+
+  def edit
+    @lead = Ish::Lead.find params[:id]
+    authorize! :edit, @lead
+  end
+
   def update
-    @invoice = Ish::Invoice.find params[:id]
-    authorize! :update, @invoice
-    if @invoice.update_attributes params[:invoice].permit!
-      flash[:notice] = 'Success'
-      redirect_to :action => 'index'
+    @lead = Ish::Lead.find params[:id]
+    authorize! :update, @lead
+    if @lead.update_attributes params[:lead].permit!
+      flash[:notice] = 'Successfully updated lead.'
     else
-      flash[:alert] = "Cannot update invoice: #{@invoice.errors.messages}"
+      flash[:alert] = "Cannot update lead: #{@lead.errors.messages}"
     end
     redirect_to :action => 'index'
   end
-=end
 
 end

data/app/helpers/ish_manager/application_helper.rb

@@ -19,5 +19,9 @@ module IshManager
       end
     end
 
+    def pretty_date date
+      date.to_s[0, 10]
+    end
+
   end
 end

data/app/views/ish_manager/leads/_form.haml

@@ -14,6 +14,12 @@
   .input-field
     = f.label :description
     = f.text_area :description
-  .actions
+  .field
+    = f.check_box :is_done
+    = f.label :is_done
+  .field
+    = f.check_box :is_trash
+    = f.label :is_trash
+  .actions{ :style => "margin-top: 1em;" }
     = f.submit
   

data/app/views/ish_manager/leads/edit.haml

@@ -0,0 +1,3 @@
+
+%h1 Edit lead
+= render 'form', :lead => @lead

data/app/views/ish_manager/leads/index.haml

@@ -1,18 +1,26 @@
 
 .manager--leads-index
   %h5
-    Leads (#{@leads.count})
+    = link_to 'Leads', leads_path
+    (#{@leads.count})
     = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
-  
+    = link_to '(done)', done_leads_path
+    
   %table
     %tr
+      %th &nbsp;
+      %th Created At
       %th Company
       %th Email
       %th Job Url
       %th Description
+      %th Done?
     - @leads.each do |lead|
       %tr
+        %td= link_to raw('<i class="fa fa-play"></i>'), lead_path( lead )
+        %td= pretty_date lead.created_at
         %td= lead.company
-        %td= lead.email
-        %td= link_to lead.job_url, lead.job_url, :target => '_blank'
+        %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}"
+        %td= link_to raw('<i class="fa fa-user-md"></i>'), lead.job_url, :target => '_blank'
         %td= lead.description
+        %td= lead.is_done ? raw('<i class="fa fa-check"></i>') : nil

data/config/routes.rb

@@ -26,6 +26,8 @@ IshManager::Engine.routes.draw do
     resources :payments
   end
 
+  get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }
+  get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
   resources :leads
 
   resources :newsitems

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.122
+  version: 0.1.8.123
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-17 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -262,6 +262,7 @@ files:
 - app/views/ish_manager/kaminari/_prev_page.html.erb
 - app/views/ish_manager/kaminari/_prev_page.html.erb~
 - app/views/ish_manager/leads/_form.haml
+- app/views/ish_manager/leads/edit.haml
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml
 - app/views/ish_manager/newsitems/_form.haml