wco_models 3.1.0.69 → 3.1.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccaac0453a8e3bc7547214646136c37c0a9704ed39c21e1d548e5c45d5b568f0
-  data.tar.gz: c1ee1eb79c03a19d908275c495f9ff79cc6dd3e0709293873910e78bbcd066b8
+  metadata.gz: ed7fdcee13ed63a005f411a0667304c20e4b9304a31ddce91ef0ccb2c7eb40c0
+  data.tar.gz: a0496d639675de1bd566b68dcaff1f1f790b9e52d578511c05ca93438a71b9c9
 SHA512:
-  metadata.gz: 8fa9faf6600eecb6164d617f769d3658de0501c5b0648b83ea6c660236345277701cdca020e6ff14b3cbf773a91c895993cd72a6b06c237c96547a19db740c9f
-  data.tar.gz: 0460b8b7ea57ddcef05a57b72f6978587b4ae8850a5718ff3ff571639a413b54d5770a5fddb0a77ca44666f160b3e6e6a76b27f8a1bf20457ed4e95a837bd774
+  metadata.gz: 197e54b9da6b3e53f2bb1ab3041ccfed04163b56ae609be3b664c64c7e462b84622cf8b9f2dd6a486e4669b0bd13806ae77771f99ef5ec901676c31f0593add8
+  data.tar.gz: bab77602004ffada4035abee34b573653ec61b57ad80953e9195c13b09ac82a5ebaf4cb809c111767493f986fb3e358eb846ac1ee19dad333d15e7121a4bca8c

data/app/assets/stylesheets/wco/chip.scss

@@ -0,0 +1,68 @@
+
+html {
+  // --wco-color-1: red;
+  --wco-color-2: #ddd;
+}
+
+.chip,
+.Chip {
+  display: inline;
+
+  border: 1px solid var(--wco-color-1);
+  border-radius: 0.5em;
+  padding: 0.1em .3em;
+  margin-bottom: 0.1em;
+  background: var(--wco-color-2);
+
+}
+.chip,
+.Chip {
+  // border: 1px solid black;
+  border-radius: 1em 0 0 1em;
+
+  margin-right: 32px;
+
+  padding: 0.2em 0.2em 0.2em 0.6em;
+
+  height: 32px;
+
+  background: var(--wco-color-2);
+
+  position: relative;
+
+  &::before {
+    // border: 1px solid red;
+    // background: yellow;
+
+    content: "";
+    display: block;
+
+    position: absolute;
+    right: -16px;
+    top: 0;
+
+    width: 16px;
+    height: 32px;
+
+    // border-left: 12px solid white;
+    border-top: 17px solid var(--wco-color-2);
+    border-right: 12px solid transparent;
+    // border-bottom: 12px solid transparent;
+  }
+  &::after {
+    // border: 1px solid red;
+
+    content: "";
+    display: block;
+
+    position: absolute;
+    right: -16px;
+    bottom: 0;
+
+    width: 16px;
+    height: 32px;
+
+    border-bottom: 17px solid var(--wco-color-2);
+    border-right: 12px solid transparent;
+  }
+}

data/app/helpers/wco/application_helper.rb

@@ -14,18 +14,18 @@ module Wco::ApplicationHelper
   end
 
   def pretty_date date
-    # date.to_s[0, 10]
-    date&.strftime('%Y-%m-%d')
+    return nil if !date
+    date.in_time_zone( Rails.application.config.time_zone ).strftime('%Y-%m-%d')
   end
   def pp_date a; pretty_date a; end
 
   def pp_datetime date
-    date&.strftime('%Y-%m-%d %l:%M%P %z')
+    return nil if !date
+    return date.in_time_zone( Rails.application.config.time_zone ).strftime('%Y-%m-%d %l:%M%P %Z')
   end
 
   def pp_time date
     return nil if !date
-    # return date.strftime('%l:%M%P %z')
     return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P %Z')
   end
 

data/app/models/wco/tag.rb

@@ -31,8 +31,15 @@ class Wco::Tag
     find_or_create_by({ slug: TRASH })
   end
 
+  SPAM = 'spam'
+  def self.spam
+    find_or_create_by({ slug: SPAM })
+  end
+
+  def to_s
+    slug
+  end
   def self.list
     [[nil,nil]] + all.map { |p| [ p.slug, p.id ] }
   end
-
 end

data/app/models/wco_email/context.rb

@@ -71,7 +71,7 @@ class WcoEmail::Context
   end
 
   def self.scheduled
-    where( :send_at.gte => Time.now  )
+    where( :send_at.lte => Time.now  )
   end
 
 

data/app/models/wco_email/message.rb

@@ -89,7 +89,7 @@ class WcoEmail::Message
 
     when WcoEmail::EmailFilter::KIND_ADD_TAG
       conv.tags.push filter.tag
-      if filter.tag == Wco::Tag.trash
+      if filter.tag == Wco::Tag.trash || filter.tag == Wco::Tag.spam
         conv.tags -= [ Wco::Tag.inbox ]
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.69
+  version: 3.1.0.71
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -363,6 +363,7 @@ files:
 - app/assets/stylesheets/vendor/bootstrap-4.6.2.min.css
 - app/assets/stylesheets/wco/alerts_notices.scss
 - app/assets/stylesheets/wco/application.css
+- app/assets/stylesheets/wco/chip.scss
 - app/assets/stylesheets/wco/galleries.scss
 - app/assets/stylesheets/wco/pagination.scss
 - app/assets/stylesheets/wco/photos.scss