simple_calendar-timeslot 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7522e42ad4d981ea9307e4ec7af21b95bbf1c330d321e73fd8e265d73955346e
-  data.tar.gz: d6562afe5db9a28979553bc1a089fa2ad0454af8dae55f120bcefd8b3d617f36
+  metadata.gz: b981b7c9ef328bf21adf9ced3ea7f53cdacdbd70ee70006f66e01fd676634d14
+  data.tar.gz: d9b6a5bcc147cd5155766a42e647654013c6c81c6bfdcdf1b1e4f3360659a0d5
 SHA512:
-  metadata.gz: 6557f1572ef373f53325412e0e8f47eb9acaa01f639cfce83b128a1a1e31a4657eb9ff841a01e3dec96d7fd69970675c33237e3fa5e6e8b60303a53a1e15e62d
-  data.tar.gz: ddafaefd0434bf85d5f29b01d31c9bb279028123ffd957a8332710d25bcf125d51d475f70f4133c652869ce21c40d6aff24ec29938dca2ae51e639bacf0f99f6
+  metadata.gz: 87c70e2c3cca879480f6ed87e7ce5d1adbcd2095e17aad0e30fdf3b1dea00a1b1461d676c81c2108010af619c488b9bbb067ab53f43678a63a584fbfb4220546
+  data.tar.gz: fe7d528e2b333e7ecbae96626aeb74ca4e0d58c857c5fdb1ec1101535dc0a6f54d7cb3c9d37ecc825d130266bbc8bd35ac49d4bb631cf7ebd85a9d34556b6a8e

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 ## [Unreleased]
 
+## [0.7.0] - 2021-11-15
+### Added
+- new option to display a current time indicator line (based on Time.zone.now), that is invisible unless styled, the css-class is
+`current_time_indicator`
+### Fixed
+- minor z-index inconsistencies for event rendering
+
+## [0.6.0] - 2021-11-15
+### Added
+- Added option horizontal_scroll_split to view helper, which defaults to false. This option affects
+horizontal orientation only. If set to false, the
+different days of the calendar scroll together horizontally, which is more consistent with the
+behaviour of the vertical layout. If set to true, the days scroll independently.
+
+## [0.5.1] - 2021-11-15
+### Fixed
+- Fixed reliance of calendar on legacy function to
+calculate event height
+
+## [0.5.0] - 2021-11-14
+- Removed images for the README from the gem, sry :(
+
+## [0.4.0] - 2021-11-14
+### Added
+- Added compatibilty with the attribute and end_attribute options in the view helper
+- Added documentation to README
+
 ## [0.3.0] - 2021-11-14
 ### Fixed
 - Fix issue with css styles when including style of this gem and simple_calendar

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_calendar-timeslot (0.4.0)
+    simple_calendar-timeslot (0.7.0)
       simple_calendar (~> 2.0)
 
 GEM
@@ -90,6 +90,8 @@ GEM
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
@@ -157,7 +159,7 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.3.0)
+    sprockets-rails (3.4.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)

data/README.md

@@ -9,10 +9,10 @@ This helps to visually grasps the length of events and the time between them. In
 Horizontal and vertical layout is selectable via options, just like many other ones.
 
 Horizontal example
-![Horizontal Calendar](img/simple_calendar-timeslot_horizontal.png)
+![Horizontal Calendar](https://github.com/1klap/simple_calendar-timeslot/blob/96475bf7c354b7e0318a9421e155588d96517fc3/img/simple_calendar-timeslot_horizontal.png?raw=true)
 
 Vertical example
-![Vertical Calendar](img/simple_calendar-timeslot_vertical.png)
+![Vertical Calendar](https://github.com/1klap/simple_calendar-timeslot/blob/96475bf7c354b7e0318a9421e155588d96517fc3/img/simple_calendar-timeslot_vertical.png?raw=true)
 
 
 ## Installation
@@ -34,7 +34,7 @@ Or install it yourself as:
 
 **Important** Then include the stylesheet in your rails app.
 
-If you an `application.css` file, include the following:
+If you have an `application.css` file, include the following:
 ```ruby
 *= require simple_calendar-timeslot
 ```
@@ -47,12 +47,17 @@ If you use an SCSS file (`application.scss`), add the following line instead:
 
 TODO: Write usage instructions here
 
+Your model must implement a `start_time` and `end_time` function,
+or you can specify alternatives as options to the call below
+as `attribute: :my_start_time` and `end_attribute: :my_end_time`.
+
 ```erb
 <%= timeslot_calendar(events: @events,
                       number_of_days: 2,
                       px_per_minute: 1.5,
                       orientation: :horizontal,
                       horizontal_height_px: 250,
+                      # attribute: :my_start_time,
                       # display_grid: false,
                       # display_bucket_title: :event_type,
                       # bucket_title_size: 30,
@@ -67,14 +72,16 @@ TODO: Write usage instructions here
 ```
 
 Shortversion in the meantime:
-- orientation (:vertical, :horizontal, default: :vertical)
-- horizontal_height_px default: 300
-- split_by_type (model function to call in case of bucketung f.ex.`:event_type`, default: false)
-- px_per_minute default: 0.65
-- display_bucket_title (model function to call in case of bucketung f.ex.`:event_type_name`, default: false)
-- bucket_title_size default: 20
-- grid_width default: 20px
-- display_grid default: true
+- `orientation` (`:vertical`, `:horizontal`, default: :vertical)
+- `px_per_minute` (defines size of calendar, default: 0.65)
+- `horizontal_height_px` default: 300
+- `horizonzal_scroll_split` (scroll days separately or together, default: false)
+- `split_by_type` (model function to call in case of bucketing f.ex.`:event_type`, default: false)
+- `display_bucket_title` (model function to call in case of bucketing f.ex.`:event_type_name`, default: false)
+- `bucket_title_size` default: 20
+- `grid_width` default: 20px
+- `display_grid` default: true
+- `current_time_indicator` (display a stylable div across the timeline that display the current time, css-class: `current_time_indicator`, default: false)
 
 ## Development
 

data/app/assets/stylesheets/simple_calendar-timeslot.css

@@ -9,6 +9,10 @@
   display: flex;
   flex-direction: column;
 }
+.timeslot-calendar .days-wrapper-horizontal.scroll-link {
+  overflow-x: auto;
+  overflow-y: hidden;
+}
 .timeslot-calendar .day-wrapper {
   flex: 1 1 0;
 }
@@ -21,13 +25,14 @@
   display: flex;
   flex-direction: column;
   position: relative;
+}
+.timeslot-calendar .day-content-horizontal.scroll-split {
   overflow-x: auto;
   overflow-y: hidden;
 }
 .timeslot-calendar .day-content-horizontal-inner {
   position: relative;
 }
-
 .timeslot-calendar .hour-indicator-col-vertical {
   display: flex;
   flex: 1 1 0;
@@ -87,6 +92,9 @@
   z-index: 1;
   box-sizing: border-box;
 }
+.timeslot-calendar .current_time_indicator {
+  position: absolute;
+}
 /*--- Event example style ----*/
 .timeslot-event {
   width: 100%;

data/app/views/simple_calendar/timeslot/_timeslot_calendar.html.erb

@@ -31,6 +31,9 @@
                   <% end %>
                 </div>
               <% end %>
+              <% if calendar.display_current_time_indicator %>
+                  <div class="current_time_indicator" style="top:<%=calendar.current_time_offset %>px;left:0;right:0;height:0;"></div>
+                <% end %>
               <% events = sorted_events.fetch(day, []) %>
               <% buckets = calendar.split_into_buckets(events) %>
               <div class="buckets-wrapper" style="left:<%=calendar.grid_width%>;right:0">
@@ -46,7 +49,7 @@
                         <div class="events-wrapper">
                           <% events_size = calendar.slot_events(bucket, day) %>
                           <% bucket.each do |event| %>
-                            <div class="event-wrapper" style="z-index:20;width:<%=events_size[event][0]%>%;top:<%=events_size[event][3]%>px;left:<%=events_size[event][1]%>%;height:<%=events_size[event][2]%>px">
+                            <div class="event-wrapper" style="width:<%=events_size[event][0]%>%;top:<%=events_size[event][3]%>px;left:<%=events_size[event][1]%>%;height:<%=events_size[event][2]%>px">
                               <% if defined?(Haml) && respond_to?(:block_is_haml?) && block_is_haml?(passed_block) %>
                                 <% capture_haml(event, &passed_block) %>
                               <% else %>
@@ -66,7 +69,7 @@
       <% end %>
     </div>
   <% elsif calendar.orientation == :horizontal %>
-    <div class="days-wrapper-horizontal">
+    <div class="days-wrapper-horizontal <%= calendar.horizontal_scroll_split ? "" : "scroll-link" %>">
       <% date_range.slice(0, 7).each do |day| %>
         <div class="day-wrapper">
           <div class="day-title-row">
@@ -78,7 +81,7 @@
             </span>
           </div>
           <%= content_tag :div, class: calendar.td_classes_for(day) do %>
-            <div class="day-content-horizontal">
+            <div class="day-content-horizontal <%= calendar.horizontal_scroll_split ? "scroll-split" : "" %>">
               <div class="day-content-horizontal-inner" style="width:<%=calendar.height%>px;height:<%=calendar.horizontal_height_px%>px">
                 <% if calendar.display_grid %>
                   <div class="hour-indicator-col-horizontal" style="z-index:-10;">
@@ -94,6 +97,9 @@
                     <% end %>
                   </div>
                 <% end %>
+                <% if calendar.display_current_time_indicator && !calendar.horizontal_scroll_split %>
+                  <div class="current_time_indicator" style="left:<%=calendar.current_time_offset %>px;top:0;bottom:0;width:0;"></div>
+                <% end %>
                 <% events = sorted_events.fetch(day, []) %>
                 <% buckets = calendar.split_into_buckets(events) %>
                 <div class="buckets-wrapper" style="top:<%=calendar.grid_width%>;bottom:0">

data/lib/simple_calendar/timeslot/timeslot_calendar.rb

@@ -50,6 +50,14 @@ module SimpleCalendar
         @options.fetch(:display_grid, true)
       end
 
+      def horizontal_scroll_split
+        @options.fetch(:horizontal_scroll_split, false)
+      end
+
+      def display_current_time_indicator
+        @options.fetch(:display_current_time_indicator, false)
+      end
+
       def height
         #h = (24 - TimeslotCalendar::FIRST_HOUR_SLOT) * 60 * px_per_minute
         h = 24 * 60 * px_per_minute
@@ -63,9 +71,9 @@ module SimpleCalendar
                   elsif event.send(attribute).to_date < event.send(end_attribute).to_date
                     (event.send(end_attribute).midnight - 60 - event.send(attribute))/60
                   else
-                    event.duration
+                    (event.send(end_attribute) - event.send(attribute))/60
                   end
-        minutes * px_per_minute
+        minutes * px_per_minute 
       end
 
       def event_top_distance(event, day)
@@ -119,6 +127,13 @@ module SimpleCalendar
         r
       end
 
+      def current_time_offset
+        now = Time.zone.now
+        offset = (now.hour * 60 + now.min) * px_per_minute
+        offset = offset + bucket_title_size if display_bucket_title
+        offset
+      end
+
       private
 
       def pack_events(r, columns)

data/lib/simple_calendar/timeslot/version.rb

@@ -2,6 +2,6 @@
 
 module SimpleCalendar
   module Timeslot
-    VERSION = "0.4.0"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar-timeslot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Kim Laplume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-14 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_calendar
@@ -88,8 +88,6 @@ files:
 - app/views/simple_calendar/timeslot/_timeslot_calendar.html.erb
 - bin/console
 - bin/setup
-- img/simple_calendar-timeslot_horizontal.png
-- img/simple_calendar-timeslot_vertical.png
 - lib/simple_calendar/timeslot.rb
 - lib/simple_calendar/timeslot/railtie.rb
 - lib/simple_calendar/timeslot/timeslot_calendar.rb