Merge pull request #312 from a-thousand-channels/ut/307-date-form-han…

…dling-improved Date handling in Places form (#307)
a-thousand-channels · Mar 11, 2024 · f36f9b5 · f36f9b5
2 parents 682543c + a873a11
commit f36f9b5
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 24 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -276,7 +276,7 @@ GEM
       rack (>= 0.4)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
-    rack-cors (2.0.1)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)

diff --git a/app/assets/stylesheets/1_basics.css.scss b/app/assets/stylesheets/1_basics.css.scss
@@ -79,9 +79,9 @@ span.confirmation {
 }
 
 span.name, label {
-    color: #888;
+    color: #775;
     font-size: 90%;
-    text-transform: uppercase;
+    text-transform: initial;
     font-weight: bold;
     padding-right: 10px;
     line-height: 1.2;

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -41,6 +41,8 @@ def smart_date_display(startdate, enddate)
       if startdate.strftime('%H:%M') == '00:00'
         if startdate.strftime('%d.%m') == '01.01' && enddate.strftime('%d.%m') == '01.01'
           "#{startdate.strftime('%Y')} ‒ #{enddate.strftime('%Y')}"
+        elsif (startdate.strftime('%d.%m') == '01.01' && enddate.strftime('%d.%m') == '31.12') && (startdate.strftime('%Y') == enddate.strftime('%Y'))
+          startdate.strftime('%Y').to_s
         else
           "#{startdate.strftime('%d.%m.%y')} ‒ #{enddate.strftime('%d.%m.%y')}"
         end

diff --git a/app/models/place.rb b/app/models/place.rb
@@ -46,11 +46,16 @@ class Place < ApplicationRecord
       self.startdate = "#{startdate_date} #{startdate_time}"
     elsif startdate_date.present?
       self.startdate = "#{startdate_date} 00:00:00"
+    # nil from factories, blank from post request
+    elsif startdate_date.nil? || startdate_date.blank?
+      self.startdate = nil
     end
     if enddate_date.present? && enddate_time.present?
       self.enddate = "#{enddate_date} #{enddate_time}"
     elsif enddate_date.present?
       self.enddate = "#{enddate_date} 00:00:00"
+    elsif enddate_date.nil? || startdate_date.blank?
+      self.enddate = nil
     end
   end
 

diff --git a/app/views/places/_form.html.haml b/app/views/places/_form.html.haml
@@ -101,6 +101,9 @@
           
         .small-10.cell                
           = f.input :title
+      .grid-x.grid-padding-x
+        .small-12.cell
+          = f.input :subtitle
       %hr
 
   .grid-x.grid-padding-x
@@ -125,7 +128,6 @@
           .large-6.medium-6.small-5.cell
             = f.input :enddate_time, as: :time, html5: true, :label => 'End time', :input_html => {:size => 5, class: 'input-time'}
         %hr
-        = f.input :subtitle
         = tinymce
         = f.input :teaser, :label => 'Teaser', :input_html => {:rows => 8, class: 'large-text tinymce' }
         = f.input :text, :label => 'Text', :input_html => {:rows => 16, class: 'large-text tinymce'}

diff --git a/spec/controllers/public/layers_controller_spec.rb b/spec/controllers/public/layers_controller_spec.rb
@@ -61,9 +61,9 @@
 
       it 'returns sorted results a published layer, sorted by startdate' do
         layer = FactoryBot.create(:layer, :sorted_by_startdate, map_id: @map.id, published: true)
-        place1 = FactoryBot.create(:place, layer: layer, published: true, startdate: Time.now - 2.day)
-        place2 = FactoryBot.create(:place, layer: layer, published: true, startdate: Time.now - 4.day)
-        place3 = FactoryBot.create(:place, layer: layer, published: true, startdate: Time.now - 3.day)
+        place1 = FactoryBot.create(:place, layer: layer, published: true, startdate_date: Time.now - 2.day)
+        place2 = FactoryBot.create(:place, layer: layer, published: true, startdate_date: Time.now - 4.day)
+        place3 = FactoryBot.create(:place, layer: layer, published: true, startdate_date: Time.now - 3.day)
         place4_notpublished = FactoryBot.create(:place, layer: layer, published: false)
 
         get :show, params: { id: layer.to_param, map_id: @map.id, format: 'json' }, session: valid_session

diff --git a/spec/factories/places.rb b/spec/factories/places.rb
@@ -27,6 +27,16 @@
     trait :date_and_time do
       startdate_date { '2018-04-30' }
       startdate_time { '11:45' }
+      enddate_date { '2022-05-30' }
+      enddate_time { '16:45' }
+    end
+    trait :start_date_and_time do
+      startdate_date { '2018-04-30' }
+      startdate_time { '11:45' }
+    end
+    trait :end_date_and_time do
+      enddate_date { '2022-05-30' }
+      enddate_time { '16:45' }
     end
     trait :invalid do
       title { nil }

diff --git a/spec/models/place_spec.rb b/spec/models/place_spec.rb
@@ -25,9 +25,41 @@
     end
   end
 
-  describe 'Dates' do
-    it 'returns date' do
+  describe 'Fulldates w/before_save handling' do
+    it 'updates full date' do
       p = FactoryBot.create(:place, startdate: '2018-01-01', enddate: '2018-01-02')
+      p.startdate_date = '2018-01-01'
+      p.enddate_date = '2018-12-31'
+      p.save!
+      p.reload
+      expect(p.startdate).to eq('2018-01-01 00:00:00.000')
+      expect(p.enddate).to eq('2018-12-31 00:00:00.000')
+    end
+
+    it 'removes full date with nil' do
+      p = FactoryBot.create(:place, startdate: '2018-01-01', enddate: '2018-01-02')
+      p.startdate_date = '2018-01-01'
+      p.enddate_date = nil
+      p.save!
+      p.reload
+      expect(p.startdate).to eq('2018-01-01 00:00:00.000')
+      expect(p.enddate).to eq(nil)
+    end
+
+    it 'removes full date with blank' do
+      p = FactoryBot.create(:place, startdate: '2018-01-01', enddate: '2018-01-02')
+      p.startdate_date = ''
+      p.enddate_date = '2018-01-02'
+      p.save!
+      p.reload
+      expect(p.startdate).to eq(nil)
+      expect(p.enddate).to eq('2018-01-02 00:00:00.000')
+    end
+  end
+
+  describe 'Dates for UI' do
+    it 'returns date range' do
+      p = FactoryBot.create(:place, startdate_date: '2018-01-01', enddate_date: '2018-01-02')
       expect(p.date).to eq('01.01.18 ‒ 02.01.18')
     end
 
@@ -36,11 +68,14 @@
       expect(p.date).to eq('01.01.18, 20:30')
     end
 
-    it 'returns full startdate without time' do
+    it 'returns year (with only startdate given)' do
       p = FactoryBot.create(:place, startdate_date: '2018-01-01', startdate_time: '', enddate: '')
       expect(p.date).to eq('2018')
     end
-
+    it 'returns year' do
+      p = FactoryBot.create(:place, startdate_date: '2018-01-01', startdate_time: '', enddate: '2018-12-31')
+      expect(p.date).to eq('2018')
+    end
     it 'returns full date range with time' do
       p = FactoryBot.create(:place, startdate_date: '2018-01-01', startdate_time: '12:00', enddate_date: '2018-01-01', enddate_time: '18:00')
       expect(p.date).to eq('01.01.18, 12:00 ‒ 18:00')
@@ -124,9 +159,9 @@
     it 'is valid  ' do
       m = FactoryBot.create(:map)
       l = FactoryBot.create(:layer, map: m)
-      event_1_in_the_middle = FactoryBot.create(:place, layer: l, startdate: '2016-01-01 00:00:00')
-      event_2_earlier = FactoryBot.create(:place, layer: l, startdate: '2011-01-01 00:00:00')
-      event_3_latest = FactoryBot.create(:place, layer: l, startdate: '2021-01-01 00:00:00')
+      event_1_in_the_middle = FactoryBot.create(:place, layer: l, startdate_date: '2016-01-01 00:00:00')
+      event_2_earlier = FactoryBot.create(:place, layer: l, startdate_date: '2011-01-01 00:00:00')
+      event_3_latest = FactoryBot.create(:place, layer: l, startdate_date: '2021-01-01 00:00:00')
 
       places = l.places
       expect(places).to eq([event_1_in_the_middle, event_2_earlier, event_3_latest])
@@ -137,9 +172,9 @@
     it 'is valid  ' do
       m = FactoryBot.create(:map)
       l = FactoryBot.create(:layer, map: m)
-      event_1_in_the_middle = FactoryBot.create(:place, layer: l, startdate: '2016-01-01 00:00:00')
-      event_2_earlier = FactoryBot.create(:place, layer: l, startdate: '2011-01-01 00:00:00')
-      event_3_latest = FactoryBot.create(:place, layer: l, startdate: '2021-01-01 00:00:00')
+      event_1_in_the_middle = FactoryBot.create(:place, layer: l, startdate_date: '2016-01-01 00:00:00')
+      event_2_earlier = FactoryBot.create(:place, layer: l, startdate_date: '2011-01-01 00:00:00')
+      event_3_latest = FactoryBot.create(:place, layer: l, startdate_date: '2021-01-01 00:00:00')
 
       places = l.places.sorted_by_startdate
       expect(places).not_to eq([event_1_in_the_middle, event_2_earlier, event_3_latest])

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -12,9 +12,9 @@
                                '127.0.0.1',
                                'chromedriver.storage.googleapis.com',
                                'googlechromelabs.github.io',
+                               'storage.googleapis.com',
                                'edgedl.me.gvt1.com'
                              ])
-
 # special setup to make feature tests run on ubuntu 20.4 LTS
 if ENV['UBUNTU']
   puts 'Running Rspecs on Ubuntu'

diff --git a/spec/support/api/layer.json b/spec/support/api/layer.json
@@ -300,7 +300,7 @@
                 },
                 "startdate": {
                   "$id": "#/properties/map/properties/layer/items/properties/places/items/properties/startdate",
-                  "type": "string",
+                  "type": ["string", "null"],
                   "title": "The Startdate Schema",
                   "default": "",
                   "examples": [
@@ -310,7 +310,7 @@
                 },
                 "enddate": {
                   "$id": "#/properties/map/properties/layer/items/properties/places/items/properties/enddate",
-                  "type": "string",
+                  "type": ["string", "null"],
                   "title": "The Enddate Schema",
                   "default": "",
                   "examples": [

diff --git a/spec/support/api/map.json b/spec/support/api/map.json
@@ -390,7 +390,7 @@
                               },
                               "startdate":{
                                  "$id":"#/properties/map/properties/layer/items/properties/places/items/properties/startdate",
-                                 "type":"string",
+                                 "type":["string", "null"],
                                  "title":"The Startdate Schema",
                                  "default":"",
                                  "examples":[
@@ -400,7 +400,7 @@
                               },
                               "enddate":{
                                  "$id":"#/properties/map/properties/layer/items/properties/places/items/properties/enddate",
-                                 "type":"string",
+                                 "type":["string", "null"],
                                  "title":"The Enddate Schema",
                                  "default":"",
                                  "examples":[

diff --git a/spec/support/api/map_allplaces.json b/spec/support/api/map_allplaces.json
@@ -152,11 +152,11 @@
                             },
                             "startdate": {
                                 "title": "The startdate Schema",
-                                "type": "string"
+                                "type": ["string", "null"]
                             },
                             "enddate": {
                                 "title": "The enddate Schema",
-                                "type": "string"
+                                "type": ["string", "null"]
                             },
                             "location": {
                                 "title": "The location Schema",