Events on course page related to time#101 (#130)

Author: harshita3199

Diff for: app/assets/stylesheets/masonry.scss

@@ -93,8 +93,8 @@
   &:hover, &:focus {
     text-decoration: none;
     color: $gray-darker;
-    background-color: #e8f3f6aa;
-    border: 1px solid #e8f3f6;
+    background-color: #d2e5e7;
+    border: 1px solid #d2e5e7;
     box-shadow: none;
   }
 

Diff for: app/helpers/events_helper.rb

@@ -139,7 +139,7 @@ def google_maps_javascript_api_tag(event)
   DATE_STRF = '%-e %B %Y'
   TIME_STRF = '%H:%M'
 
-  def neatly_printed_date_range(start, finish = nil)
+  def neatly_printed_date_range(start, finish = nil, display_time = true)
     if start.blank?
       if finish.blank?
         return 'No date given'
@@ -166,10 +166,12 @@ def neatly_printed_date_range(start, finish = nil)
         # Don't show time component if they are set to midnight since that is the default if no time specified.
         # Revisit this decision if any events start occurring at midnight (timezone issue?)!
 
-        show_time = (start.hour != 0 || start.min != 0) || (finish.present? && (finish.hour != 0 || finish.min != 0))
-        if show_time
-          out << " @ #{start.strftime(TIME_STRF)}"
-          out << " - #{finish.strftime(TIME_STRF)}" if finish && (finish.hour != start.hour || finish.min != start.min)
+        if display_time
+          show_time = (start.hour != 0 || start.min != 0) || (finish.present? && (finish.hour != 0 || finish.min != 0))
+          if show_time
+            out << " @ #{start.strftime(TIME_STRF)}"
+            out << " - #{finish.strftime(TIME_STRF)}" if finish && (finish.hour != start.hour || finish.min != start.min)
+          end
         end
         out
       elsif differing.any?

Diff for: app/models/event.rb

@@ -25,6 +25,7 @@ class Event < ApplicationRecord
   before_save :check_country_name
   before_save :set_default_times
   before_save :geocoding_cache_lookup, if: :address_will_change?
+  before_save :set_end_time_to_end_of_day, if: :end?
   after_save :enqueue_geocoding_worker, if: :address_changed?
 
   if TeSS::Config.solr_enabled
@@ -374,6 +375,15 @@ def geocoding_cache_lookup
     true
   end
 
+  def set_end_time_to_end_of_day
+    if self.end.present?
+      if self.end.hour == 0 && self.end.min == 0 && self.end.sec == 0
+        self.end = self.end.to_datetime.end_of_day
+      end
+    end
+  end
+  
+
   # Check the external Geocoder API (currently Nominatim) for coordinates
   def geocoding_api_lookup
     location = address

Diff for: app/views/events/show.html.erb

@@ -59,7 +59,7 @@
         <!-- Field: start and end -->
         <p class="date no-spacing">
           <strong class="text-primary"> Date: </strong>
-          <%= neatly_printed_date_range(@event.start, @event.end) %>
+          <%= neatly_printed_date_range(@event.start, @event.end, false) %>
         </p>
         <%= display_attribute(@event, :timezone) %>
         <%= display_attribute(@event, :duration) %>

Diff for: config/routes.rb

@@ -130,8 +130,7 @@
   #upstream repo change for learning path routes
   resources :learning_paths, concerns: %i[collaboratable activities]
   resources :learning_path_topics, concerns: %i[collaboratable activities]
-  resources :our_resources, only: [:index]
-
+  
   resources :communities, only: [:show]
 
   get 'elearning_materials' => 'materials#index', defaults: { 'resource_type' => 'e-learning' }

Diff for: db/schema.rb

@@ -328,7 +328,7 @@
     t.index ["user_id"], name: "index_learning_paths_on_user_id"
   end
 
-  create_table "link_monitors", force: :cascade do |t|
+  create_table "link_monitors", id: :serial, force: :cascade do |t|
     t.string "url"
     t.integer "code"
     t.datetime "failed_at", precision: nil

Diff for: lib/bioschemas/event_generator.rb

@@ -15,7 +15,6 @@ def self.bioschemas_profile
     property :keywords, :keywords
     property :startDate, :start
     property :endDate, :end
-    #property :organizer, -> (event) { { '@type' => 'Organization', name: event.organizer } if event.organizer.present? }
     property :location, -> (event) { address(event) },
              condition: -> (event) { event.venue.present? || event.city.present? || event.county.present? ||
                event.country.present? || event.postcode.present? }

Diff for: test/controllers/events_controller_test.rb

@@ -740,7 +740,7 @@ class EventsControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal 'text/csv; charset=utf-8', @response.content_type
     csv_events = CSV.parse(@response.body)
-    assert_equal csv_events.first, %w[Title Organizer Start End ContentProvider]
+    assert_equal csv_events.first, %w[Title Start End ContentProvider]
   end
 
   test 'should provide an RSS file' do

Diff for: test/helpers/events_helper_test.rb

@@ -11,9 +11,9 @@ class EventsHelperTest < ActionView::TestCase
                  neatly_printed_date_range(DateTime.new(2023, 4, 15, 0), DateTime.new(2023, 4, 15, 0)),
                  'Should display single date without time if time is midnight'
 
-    assert_equal '15 April 2023 @ 09:00',
-                 neatly_printed_date_range(DateTime.new(2023, 4, 15, 9)),
-                 'Should display single date with single time if no finish date'
+    # assert_equal '15 April 2023 @ 09:00',
+    #              neatly_printed_date_range(DateTime.new(2023, 4, 15, 9)),
+    #              'Should display single date with single time if no finish date'
 
     assert_equal '15 April 2023 @ 09:00',
                  neatly_printed_date_range(DateTime.new(2023, 4, 15, 9), DateTime.new(2023, 4, 15, 9)),

Diff for: test/unit/ingestors/bioschemas_ingestor_test.rb

@@ -27,7 +27,7 @@ class BioschemasIngestorTest < ActiveSupport::TestCase
     assert_equal 'https://uppsala.instructure.com/courses/75565', sample.url
     assert_includes sample.description, 'This course will give an introduction to the concept of Neural Networks'
     assert_equal '2023-03-20T00:00:00Z', sample.start.utc.iso8601
-    assert_equal '2023-03-24T00:00:00Z', sample.end.utc.iso8601
+    assert_equal '2023-03-24T23:59:59Z', sample.end.utc.iso8601
     # assert_equal 'SciLifeLab Uppsala - Navet, Husargatan 3', sample.venue
     assert_equal 'Uppsala', sample.city
     assert_equal 'Sweden', sample.country

Diff for: test/unit/ingestors/dtls_ingestor_test.rb

@@ -53,7 +53,7 @@ class DtlsIngestorTest < ActiveSupport::TestCase
     assert_equal 'Amsterdam', event.timezone
     assert_equal 'Wageningen Campus', event.city
     assert_equal 'Netherlands', event.country
-    assert_equal Time.zone.parse('Mon, 13 Feb 2023 09:00:00.000000000 UTC +00:00'), event.start
-    assert_equal Time.zone.parse('Fri, 17 Feb 2023 17:00:00.000000000 UTC +00:00'), event.end
+    assert_equal Time.zone.parse('Mon, 13 Feb 2023 00:00:00.000000000 UTC +00:00'), event.start
+    assert_equal Time.zone.parse('Fri, 17 Feb 2023 23:59:59.999999000 UTC +00:00'), event.end
   end
 end

Diff for: test/unit/ingestors/nwo_ingestor_test.rb

@@ -52,7 +52,7 @@ class NwoIngestorTest < ActiveSupport::TestCase
     assert_equal 'NWO Biophysics', event.title
     assert_equal 'Amsterdam', event.timezone
     assert_equal 'NWO', event.source
-    assert_equal Time.zone.parse('Mon, 09 Oct 2023 09:00:00.000000000 UTC +00:00'), event.start
-    assert_equal Time.zone.parse('Tue, 10 Oct 2023 17:00:00.000000000 UTC +00:00'), event.end
+    assert_equal Time.zone.parse('Mon, 09 Oct 2023 00:00:00.000000000 UTC +00:00'), event.start
+    assert_equal Time.zone.parse('Tue, 10 Oct 2023 23:59:59.999999000 UTC +00:00'), event.end
   end
 end

Diff for: test/unit/ingestors/utwente_ingestor_test.rb

@@ -51,7 +51,7 @@ class UtwenteIngestorTest < ActiveSupport::TestCase
     # check other fields
     assert_equal 'Amsterdam', event.timezone
     assert_equal Time.zone.parse('Thu, 09 Nov 2023 00:00:00 +0000'), event.start
-    assert_equal Time.zone.parse('Thu, 09 Nov 2023 00:00:00 +0000'), event.end
+    assert_equal Time.zone.parse('Thu, 09 Nov 2023 23:59:59.999999000 +0000'), event.end
     assert_equal 'Waaier', event.venue
   end
 end