diff --git a/app/models/repository_date_time_value.rb b/app/models/repository_date_time_value.rb index ca516da81..e0f4cda58 100644 --- a/app/models/repository_date_time_value.rb +++ b/app/models/repository_date_time_value.rb @@ -8,10 +8,6 @@ class RepositoryDateTimeValue < RepositoryDateTimeValueBase new_time.to_i != data.to_i end - def reminder? - true - end - def formatted super(:full_with_comma) end diff --git a/app/models/repository_date_value.rb b/app/models/repository_date_value.rb index 639bfeec6..216d0766c 100644 --- a/app/models/repository_date_value.rb +++ b/app/models/repository_date_value.rb @@ -11,10 +11,6 @@ class RepositoryDateValue < RepositoryDateTimeValueBase Date.parse(new_data).to_date != data.to_date end - def reminder? - true - end - def formatted super(:full_date) end diff --git a/app/serializers/repository_datatable/repository_date_time_value_serializer.rb b/app/serializers/repository_datatable/repository_date_time_value_serializer.rb index 165c6878a..6da41328c 100644 --- a/app/serializers/repository_datatable/repository_date_time_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_date_time_value_serializer.rb @@ -3,13 +3,17 @@ module RepositoryDatatable class RepositoryDateTimeValueSerializer < RepositoryBaseValueSerializer def value - { + data = { formatted: I18n.l(object.data, format: :full_with_comma), date_formatted: I18n.l(object.data, format: :full_date), time_formatted: I18n.l(object.data, format: :time), - datetime: object.data.strftime('%Y/%m/%d %H:%M'), - reminder: object.reminder? + datetime: object.data.strftime('%Y/%m/%d %H:%M') } + + reminder_delta = scope[:column].metadata['reminder_delta'] + data[:reminder] = reminder_delta.to_i + DateTime.now.to_i > object.data.to_i if reminder_delta + + data end end end diff --git a/app/serializers/repository_datatable/repository_date_value_serializer.rb b/app/serializers/repository_datatable/repository_date_value_serializer.rb index 27ac60642..6b0b8dfdf 100644 --- a/app/serializers/repository_datatable/repository_date_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_date_value_serializer.rb @@ -3,11 +3,15 @@ module RepositoryDatatable class RepositoryDateValueSerializer < RepositoryBaseValueSerializer def value - { + data = { formatted: I18n.l(object.data, format: :full_date), - datetime: object.data.strftime('%Y/%m/%d %H:%M'), - reminder: object.reminder? + datetime: object.data.strftime('%Y/%m/%d %H:%M') } + + reminder_delta = scope[:column].metadata['reminder_delta'] + data[:reminder] = reminder_delta.to_i + DateTime.now.beginning_of_day.to_i > object.data.to_i if reminder_delta + + data end end end