Skip to content

Commit 9751670

Browse files
authored
feature: add from now to date (#139)
1 parent 6b7e494 commit 9751670

File tree

7 files changed

+16
-5
lines changed

7 files changed

+16
-5
lines changed

Diff for: Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
avo (0.1.16)
4+
avo (0.1.18)
55
countries
66
inline_svg
77
kaminari

Diff for: app/frontend/js/components/Index/DatetimeField.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ export default {
1212
props: ['field'],
1313
computed: {
1414
value() {
15-
if (this.field.value) return moment(new Date(this.field.value)).format(this.field.format)
15+
if (this.field.value) {
16+
if (this.field.from_now) return moment(new Date(this.field.value)).fromNow()
17+
18+
return moment(new Date(this.field.value)).format(this.field.format)
19+
}
1620
1721
return null
1822
},

Diff for: app/frontend/js/components/Show/DatetimeField.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ export default {
2424
methods: {
2525
setInitialValue() {
2626
if (this.field.value) {
27-
this.value = moment(this.field.value).format(this.field.format)
27+
if (this.field.from_now) {
28+
this.value = moment(new Date(this.field.value)).fromNow()
29+
} else {
30+
this.value = moment(this.field.value).format(this.field.format)
31+
}
2832
} else {
2933
this.value = null
3034
}

Diff for: lib/avo/app/fields/date_field.rb

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def initialize(name, **args, &block)
1515
@picker_format = args[:picker_format].present? ? args[:picker_format] : 'Y-m-d'
1616
@format = args[:format].present? ? args[:format] : 'YYYY-MM-DD'
1717
@placeholder = args[:placeholder].present? ? args[:placeholder] : ''
18+
@from_now = args[:from_now].present? ? args[:from_now] : false
1819
end
1920

2021
def hydrate_field(fields, model, resource, view)
@@ -23,6 +24,7 @@ def hydrate_field(fields, model, resource, view)
2324
picker_format: @picker_format,
2425
format: @format,
2526
placeholder: @placeholder,
27+
from_now: @from_now,
2628
}
2729
end
2830
end

Diff for: lib/avo/app/fields/datetime_field.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def hydrate_field(fields, model, resource, view)
2626
enable_time: true,
2727
time_24hr: @time_24hr,
2828
timezone: @timezone,
29+
from_now: @from_now,
2930
}
3031
end
3132
end

Diff for: lib/avo/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Avo
2-
VERSION = '0.1.16'
2+
VERSION = '0.1.18'
33
end

Diff for: spec/dummy/app/avo/resources/project.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def initialize
1616
currency :budget, currency: 'EUR', locale: 'de-DE'
1717
country :country
1818
number :users_required
19-
datetime :started_at, time_24hr: true
19+
datetime :started_at, name: 'Started', time_24hr: true, from_now: true
2020
files :files
2121
key_value :meta, key_label: 'Meta key', value_label: 'Meta value', action_text: 'New item', delete_text: 'Remove item', disable_editing_keys: false, disable_adding_rows: false, disable_deleting_rows: false
2222

0 commit comments

Comments
 (0)