ish_manager 0.1.8.496 → 0.1.8.497

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff574ed65818864f7ed604581b4c43c5ee3b9783f1e93fbae03dd66015a2799
-  data.tar.gz: e9928c499f62ab98ede00532156431f6c19651bdef8bca029b17980bc18ce596
+  metadata.gz: 4cc91f9b554ed9df6ac0f58a31e304f1724621e5a67f2e3e5215dd7ea30df711
+  data.tar.gz: 0725043735f539fab19f79235727127af569245611e84cc2c6747a24fc51ec93
 SHA512:
-  metadata.gz: c5918d1ede4b37cd260839e05e3cc077b448093f0881fdcf53d944add1b454e14312908e1e1b5fde1d55a0e40e2b70e9427e57cb1aed4823418ea9bff886c35d
-  data.tar.gz: 3a7103fe8b90ab38f7e0ed697b44b57133dee1af0d59f61ec0f8ad9100277169e01071d7e640ca394a8663d3a550244ac6cf1441037de4188752ad1368a7c7db
+  metadata.gz: 2f548df9bc7bb60a6a5a840e94c0e09f12eab494828c4125e3b9a57eec47c6c38be959aa5f69ec1625278254cd808c3c55d3d73edb1e103a52919b52583bf7c5
+  data.tar.gz: 76e9ba931280138047f57289577c31ee19b11ad4cd874af6f52d073f68ee03adf7f7d6a286687d48c4570eb6af831c8abe06aa4d46d53ea755f47677014210d6

data/app/assets/javascripts/ish_manager/email_conversations.js

@@ -47,6 +47,72 @@ $(document).ready(() => {
 
   })
 
+  $(".add-tag-btn").click(function(e) {
+    if ( !confirm('Are you sure?') ) { return; }
+
+    const jwt_token = $("#Config").data('jwt-token')
+    const action_path = $(this).data('url')
+    const emailtag = $("select[name='emailtag']").val()
+    const out = []
+
+    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    $.ajax({
+      url: action_path,
+      type: 'POST',
+      data: {
+        ids: out,
+        jwt_token: jwt_token,
+        emailtag: emailtag,
+
+      },
+      success: e => {
+        logg((e||{}).responseText, 'Ok')
+        location.reload()
+      },
+      error: e => {
+        logg((e||{}).responseText, 'Err')
+      },
+    })
+
+  })
+
+  $(".remove-tag-btn").click(function(e) {
+    if ( !confirm('Are you sure?') ) { return; }
+
+    const jwt_token = $("#Config").data('jwt-token')
+    const action_path = $(this).data('url')
+    const emailtag = $("select[name='emailtag']").val()
+    const out = []
+
+    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    $.ajax({
+      url: action_path,
+      type: 'POST',
+      data: {
+        ids: out,
+        jwt_token: jwt_token,
+        emailtag: emailtag,
+
+      },
+      success: e => {
+        logg((e||{}).responseText, 'Ok')
+        location.reload()
+      },
+      error: e => {
+        logg((e||{}).responseText, 'Err')
+      },
+    })
+
+  })
+
   $(".delete-btn").click(function(e) {
     if ( !confirm('Are you sure?') ) { return; }
 

data/app/assets/javascripts/ish_manager/shared.js

@@ -10,8 +10,8 @@
  * label becomes the name of the object (stripped to [0-9a-zA-Z\-_] chars). If you're logging a function, you can execute it.
  * If you log more than one thing, they can interact, allowing you to validate control flow.
  * * the logger can be turned off by making this function simply return.
- */
- function logg (a, b="", c=null) {
+**/
+function logg (a, b="", c=null) {
   c = "string" === typeof c ? c : b.replace(/\W/g, "");
   if (c.length > 0) {
     window[c] = a;

data/app/assets/stylesheets/ish_manager/utils_bootstrap.scss

@@ -1,4 +1,12 @@
 
+/* I */
+
+.inline-block {
+  form {
+    display: inline-block;
+  }
+}
+
 /* R */
 
 .right-0 {

data/app/controllers/ish_manager/categories_controller.rb

@@ -22,5 +22,12 @@ class ::IshManager::CategoriesController < IshManager::ApplicationController
     @leads = @leads.page( params[:leads_page] ).per( current_profile.per_page )
   end
 
+  def create_email_tag
+    @tag = WpTag.emailtag( params[:tag][:name] )
+    authorize! :create, @tag
+    @tag.persisted? ? flash_notice('persisted') : flash_alert('cannot save tag')
+    redirect_to request.referrer ? request.referrer : email_conversations_path
+  end
+
 end
 

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -7,6 +7,10 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
     authorize! :email_conversations_index, IshManager::Ability
     @email_conversations = ::Office::EmailConversation.all
 
+    @new_tag = WpTag.new
+    @emailtags = WpTag.emailtags
+    @emailtags_list = [[nil,nil]] + WpTag.emailtags.map { |p| [ p.name, p.slug ] }
+
     per_page = current_profile.per_page
     # if current_profile.per_page > 100
     #   flash_notice "Cannot display more than 100 conversations per page."

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

@@ -3,21 +3,26 @@
 
   .second-header
     %i.material-icons mail
-    = link_to email_conversations_in_path(WpTag::INBOX) do
-      Inbox (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})
-    = link_to email_conversations_notin_path(WpTag::INBOX) do
-      Not Inbox (#{Office::EmailConversation.not_in_emailtag(WpTag::INBOX).length})
-
-    = link_to email_conversations_in_path(WpTag::TRASH) do
-      Trash (#{Office::EmailConversation.in_emailtag(WpTag::TRASH).length})
-    = link_to email_conversations_notin_path(WpTag::TRASH) do
-      Not Trash (#{Office::EmailConversation.not_in_emailtag(WpTag::TRASH).length})
 
     - if params[:slug]
       slug: #{params[:slug]}
     - if params[:not_slug]
       not slug: #{params[:not_slug]}
 
+    - @emailtags.each do |emailtag|
+      .bordered.inline-block
+        = link_to email_conversations_in_path(emailtag.slug) do
+          #{emailtag.name} (#{Office::EmailConversation.in_emailtag(emailtag.slug).length})
+        = link_to email_conversations_notin_path(emailtag.slug) do
+          Not #{emailtag.name} (#{Office::EmailConversation.not_in_emailtag(emailtag.slug).length})
+
+
+    .bordered.inline-block
+      = form_for @new_tag, url: :create_email_tag, as: :tag do |f|
+        %label New Tag:
+        = f.text_field :name
+        = f.submit '>'
+
   .actions
 
     %a.btn.archive-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/rmtag/#{WpTag::INBOX}" } }
@@ -30,6 +35,17 @@
       %i.material-icons refresh
       refresh
 
+    .bordered.inline-block
+      = select_tag :emailtag, options_for_select(@emailtags_list)
+      %a.btn.add-tag-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/addtag" } }
+        %i.material-icons add
+        Addtag
+      %a.btn.remove-tag-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/rmtag" } }
+        %i.material-icons remove
+        Rmtag
+
+
+
   %br
   %br
   = render 'paginate',  resource: @email_conversations, param_name: :conv_page, views_prefix: :ish_manager

data/config/routes.rb

@@ -15,6 +15,7 @@ IshManager::Engine.routes.draw do
   resources :appliance_tmpls
 
   # get 'categories', to: 'categories#index'
+  post '/categories/create-email-tag', to: 'categories#create_email_tag', as: :create_email_tag
   resources :categories
 
   resources 'events'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.496
+  version: 0.1.8.497
 platform: ruby
 authors:
 - piousbox