effective_events 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f65483dcf8a4afeea90171c934a922a5425dc9a11bff4e2494f52ed50be52c3c
-  data.tar.gz: 0542dd1e060b1026adcb8e1358b0a069eebce29e48daadd7fb22d6c5fdb12355
+  metadata.gz: 5c5eec870decb050184747000f45203451f303d62d7ec429d9a0132122c67b49
+  data.tar.gz: 2cd76e06a859a34d214b556c686048be4a1cfa920d9b1a29ba3c1805786c1feb
 SHA512:
-  metadata.gz: f959bc908fb33c74d0a59802c9829533bd1363ceb2d34b3db456c011bef45654fbb0c485a2ff7c5e6cbac494fd1340a8ba45402e5a4eaaabb8840e510c98c041
-  data.tar.gz: 04350d65ef635616230e72cd86ef6ebd835d5943164133948c8ad5f8b8492bc713fbaf934c0b331b3292b74c782c0c21486bb09061028cd0e040ac844ea1107f
+  metadata.gz: 93454dbea3a2d7ad966fa2c2fb9007cdebef1cb8a9b237168a4f3cb3da1b086bced0e344ecb455a8fd4e4c083f5a7bc55c70b745012688ae8dc8926a1e4eea49
+  data.tar.gz: fca14c2e65806f9e7d38623ba97473a9ecb0ca7db918dfe987a28838fe1eb8df06dc11fb60d1dd1533ff8347baa89fbd52ef9f303b417bba2bf5b23fd3ccb169

data/README.md

@@ -99,6 +99,9 @@ if user.admin?
 end
 ```
 
+## Calendar
+`effective_events` comes with an integration with `simple_calendar` where events can be displayed in calendars. You can override its views using the command `rails g simple_calendar:views` - check out [Customizing Views](https://github.com/excid3/simple_calendar#customizing-the-calendar) for more information.
+
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)

data/app/assets/stylesheets/effective_events/simple_calendar.scss

@@ -0,0 +1,25 @@
+.effective__simple-calendar {
+  .calendar-heading {
+    background: $gray-200;
+  }
+
+  .calendar-arrow {
+    font-size: 10px;
+
+    a {
+      text-decoration: none;
+    }
+  }
+
+  .table th {
+    border: 0px;
+  }
+
+  .table td {
+    aspect-ratio: 1 / 1;
+    width: 2rem;
+    height: 2rem;
+    vertical-align: middle;
+    border: 1px solid $gray-200;
+  }
+}

data/app/assets/stylesheets/effective_events.scss

@@ -1 +1,2 @@
 @import 'effective_events/base';
+@import 'effective_events/simple_calendar';

data/app/models/effective/event.rb

@@ -32,6 +32,7 @@ module Effective
 
     acts_as_slugged
     log_changes if respond_to?(:log_changes)
+    acts_as_tagged if respond_to?(:acts_as_tagged)
     acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
 
     self.table_name = EffectiveEvents.events_table_name.to_s
@@ -117,7 +118,6 @@ module Effective
 
     validates :registration_start_at, presence: true, unless: -> { external_registration? }
     validates :registration_end_at, presence: true, unless: -> { external_registration? }
-    validates :external_registration_url, presence: true, if: -> { external_registration? }
 
     validate(if: -> { start_at && end_at }) do
       self.errors.add(:end_at, 'must be after start date') unless start_at < end_at
@@ -167,7 +167,7 @@ module Effective
       return false if closed?
       return false if sold_out?
 
-      external_registration? || event_tickets.present?
+      (external_registration? && external_registration_url.present?) || event_tickets.present?
     end
 
     def closed?
@@ -215,5 +215,9 @@ module Effective
       duplicate.tap { |event| event.save! }
     end
 
+    def start_time
+      start_at
+    end
+
   end
 end

data/app/views/admin/events/_form_event.html.haml

@@ -5,6 +5,9 @@
   - if categories.present?
     = f.select :category, categories, hint: 'optional category'
 
+  - if event.class.respond_to?(:acts_as_tagged?)
+    = render 'effective/tags/fields', f: f
+
   = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
   = f.check_box :draft, hint: 'Save this event as a draft. It will not be accessible on the website.'
 

data/app/views/effective/events/index.html.haml

@@ -1,4 +1,5 @@
 = render 'layout' do
+
   -# render_datatable(@datatable)
 
   .mb-4= render('effective/events/categories')
@@ -9,8 +10,16 @@
   - if @event_search.present? && results.length == 0
     .alert.alert-info There are no results for your search. Please try again.
 
-  -# This renders effective/events/event
-  = render(results)
+  .row
+    .col-md-3
+      = month_calendar(events: @events) do |date, events|
+        - if events.any? { |event| event.start_at.to_date == date }
+          = date.day
+        - else
+           
+    .col-md-9
+      -# This renders effective/events/event
+      = render(results)
 
   %nav.d-flex.justify-content-center
     = bootstrap_paginate(results, per_page: @event_search.per_page)

data/app/views/simple_calendar/_month_calendar.html.haml

@@ -0,0 +1,20 @@
+.effective__simple-calendar
+  .calendar-heading.d-flex.justify-content-between.align-items-center.mb-2.py-1
+    - date = params[:start_date].presence.try(:to_date) || Date.current
+    .calendar-arrow.p-1= link_to t('simple_calendar.previous', default: 'Previous').html_safe, effective_events.events_path(start_date: date - 1.month)
+    %span.calendar-title.text-uppercase.text-primary.font-weight-bold= t('date.month_names')[start_date.month]
+    .calendar-arrow.p-1= link_to t('simple_calendar.next', default: 'Next').html_safe, effective_events.events_path(start_date: date + 1.month)
+
+  %table.table.table-striped.table-sm
+    %thead
+      %tr.text-center.text-primary.font-weight-normal.py-2
+        - date_range.slice(0, 7).each do |day|
+          %th.px-1= t('date.abbr_day_names')[day.wday]
+
+    %tbody
+      - date_range.each_slice(7) do |week|
+        %tr
+          - week.each do |day|
+            - content = capture_haml(day, sorted_events.fetch(day, []), &passed_block)
+            = content_tag :td, class: content.to_i > 0 && 'text-center bg-primary font-weight-bold font-size-small text-white' do
+              = content

data/config/locales/en.yml

@@ -0,0 +1,15 @@
+---
+en:
+  simple_calendar:
+    previous: "◀"
+    next: "▶"
+
+  date:
+    abbr_day_names:
+    - S
+    - M
+    - T
+    - W
+    - T
+    - F
+    - S

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,7 @@ files:
 - app/assets/javascripts/effective_events/base.js
 - app/assets/stylesheets/effective_events.scss
 - app/assets/stylesheets/effective_events/base.scss
+- app/assets/stylesheets/effective_events/simple_calendar.scss
 - app/controllers/admin/event_addons_controller.rb
 - app/controllers/admin/event_notifications_controller.rb
 - app/controllers/admin/event_products_controller.rb
@@ -260,7 +261,9 @@ files:
 - app/views/effective/events/index.html.haml
 - app/views/effective/events/show.html.haml
 - app/views/effective/events_mailer/event_registrant_purchased.liquid
+- app/views/simple_calendar/_month_calendar.html.haml
 - config/effective_events.rb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/01_create_effective_events.rb.erb
 - db/seeds.rb
@@ -289,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Event registrations, tickets and products