ish_manager 0.1.8.480 → 0.1.8.481

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 070a51d0066f4aea5f609e715bfdfd2d0011a5ffb149f4bd180daf238114c5cd
4
- data.tar.gz: b3eb847fbb3049882c4420592b1076d57824e396650a4e7addc3c7298da07b6e
3
+ metadata.gz: acc807d1aa7e5d4d60cf5ef25018b4511a6bce0c0e137421f79d292dce82c11b
4
+ data.tar.gz: c4c52895d3f55008a7e93aa0ad8c6e657f5b0402d88b90487e1ddba8389a27b1
5
5
  SHA512:
6
- metadata.gz: ce9474baadf1b5c264918ec803a463264f437cefc6c85b08bb2ed8186a9457a9feac3333f4f81d6442ef2e6d358011f447077830f30ab3100e78d0faae87af7a
7
- data.tar.gz: b546bd4f8a9ab10581238e9568355eb53540d76647f0504ffb45c422c0e7d98c3cb4e250db147620787a373b437a440b534943ac652734ce1d0aa3c05046f7f4
6
+ metadata.gz: 574313b67f7b1a79d2529732cf986d7939094636b2886e0261f9b40cedcaf8b8649575af22d5caa68c0ca67849f50ae364f57f1a14a6bd35f0e888bc9d086443
7
+ data.tar.gz: d2b36ac20385d5bfaed08a30123e4d7244d972b124a92475668b20ab2594a511f86b962364e1ef9fc2380bbbbdb35fcfcda1815f6daff8f9a2318582e18c58ed
@@ -243,6 +243,14 @@ table.dataTable {
243
243
 
244
244
  }
245
245
 
246
+ .datetime {
247
+ // background: #999;
248
+ min-width: 150px;
249
+
250
+ display: flex;
251
+ justify-content: space-between;
252
+ }
253
+
246
254
  .descr,
247
255
  .description {
248
256
  border: 1px solid red;
@@ -51,6 +51,12 @@
51
51
 
52
52
  .email-contexts-index {
53
53
 
54
+ .send_at,
55
+ .sent_at {
56
+ min-width: 200px;
57
+ font-size: 0.9em;
58
+ }
59
+
54
60
  > .header {
55
61
  display: flex;
56
62
  justify-content: center;
@@ -48,13 +48,6 @@
48
48
  text-align: right;
49
49
  }
50
50
 
51
- .datetime {
52
- // background: #999;
53
- width: 150px;
54
-
55
- display: flex;
56
- justify-content: space-between;
57
- }
58
51
 
59
52
  .header {
60
53
  display: flex;
@@ -56,7 +56,9 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
56
56
 
57
57
  def index
58
58
  authorize! :index, ::Ish::EmailContext
59
- @ctxs = ::Ish::EmailContext.all.page( params[:ctxs_page] ).per( current_profile.per_page )
59
+ @ctxs = ::Ish::EmailContext.all.order_by( sent_at: :desc, send_at: :desc
60
+ ).page( params[:ctxs_page]
61
+ ).per( current_profile.per_page )
60
62
 
61
63
  if params[:lead_id]
62
64
  @lead = Lead.find params[:lead_id]
@@ -71,11 +71,15 @@ module IshManager
71
71
  date&.strftime('%Y-%m-%d')
72
72
  end
73
73
  def pp_date a; pretty_date a; end
74
+
74
75
  def pp_datetime date
75
76
  date&.strftime('%Y-%m-%d %l:%M%P %z')
76
77
  end
78
+
77
79
  def pp_time date
78
- date&.strftime('%l:%M%P %z')
80
+ return nil if !date
81
+ # return date.strftime('%l:%M%P %z')
82
+ return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P')
79
83
  end
80
84
 
81
85
  def pp_amount a
@@ -18,9 +18,11 @@
18
18
 
19
19
  .col-sm-4
20
20
  %ul
21
- %li \~__^
22
- %li= @version
23
- %li= Time.now.in_time_zone.to_s
21
+ %li ~__^ &nbsp; &nbsp; v#{@version}
22
+ -# %li= Time.now.in_time_zone.to_s
23
+ %li
24
+ = pp_date Time.now
25
+ = pp_time Time.now
24
26
  -# <pre>#{@changelog}</pre>
25
27
 
26
28
  .col-sm-4
@@ -47,10 +47,12 @@
47
47
  = link_to email_context_path(ctx) do
48
48
  = ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
49
49
  %td= ctx.email_template.slug
50
- %td.send_at
51
- .a= pp_date ctx.send_at
52
- .a= pp_time ctx.send_at
53
- %td= pp_date ctx.sent_at
50
+ %td.send_at.padded
51
+ .datetime
52
+ .date= pp_date ctx.send_at
53
+ .time= pp_time ctx.send_at
54
+ %td
55
+ .datetime.padded= pp_date ctx.sent_at
54
56
 
55
57
 
56
58
  = render 'paginate', resource: @ctxs, param_name: :ctxs_page, views_prefix: :ish_manager
@@ -61,9 +61,10 @@
61
61
  %td.subject
62
62
  = link_to conv.subject, email_conversation_path( conv )
63
63
 
64
- %td.datetime
65
- .date= conv.latest_at.strftime('%Y-%m-%d')
66
- .time= conv.latest_at.strftime('%l:%M%P')
64
+ %td
65
+ .datetime
66
+ .date= pp_date conv.latest_at
67
+ .time= pp_time conv.latest_at
67
68
 
68
69
  %td
69
70
  .tags
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.480
4
+ version: 0.1.8.481
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox