scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-06 13:14:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix red dot for datetime columns [SCI-6684] (#3977)

Browse source 
Co-authored-by: Anton <anton@scinote.net>
This commit is contained in:
aignatov-bio 2022-03-31 14:57:58 +02:00 • committed by GitHub
parent b516cf66ef
commit c480f28a09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/repository_date_time_value.rb
View file

@ -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

4
app/models/repository_date_value.rb
View file

@ -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

10
app/serializers/repository_datatable/repository_date_time_value_serializer.rb
View file

@ -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

10
app/serializers/repository_datatable/repository_date_value_serializer.rb
View file

@ -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