Skip to content

Commit

Permalink
feature: add from now to date (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianthedev authored Oct 8, 2020
1 parent 6b7e494 commit 9751670
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
avo (0.1.16)
avo (0.1.18)
countries
inline_svg
kaminari
Expand Down
6 changes: 5 additions & 1 deletion app/frontend/js/components/Index/DatetimeField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ export default {
props: ['field'],
computed: {
value() {
if (this.field.value) return moment(new Date(this.field.value)).format(this.field.format)
if (this.field.value) {
if (this.field.from_now) return moment(new Date(this.field.value)).fromNow()
return moment(new Date(this.field.value)).format(this.field.format)
}
return null
},
Expand Down
6 changes: 5 additions & 1 deletion app/frontend/js/components/Show/DatetimeField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ export default {
methods: {
setInitialValue() {
if (this.field.value) {
this.value = moment(this.field.value).format(this.field.format)
if (this.field.from_now) {
this.value = moment(new Date(this.field.value)).fromNow()
} else {
this.value = moment(this.field.value).format(this.field.format)
}
} else {
this.value = null
}
Expand Down
2 changes: 2 additions & 0 deletions lib/avo/app/fields/date_field.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def initialize(name, **args, &block)
@picker_format = args[:picker_format].present? ? args[:picker_format] : 'Y-m-d'
@format = args[:format].present? ? args[:format] : 'YYYY-MM-DD'
@placeholder = args[:placeholder].present? ? args[:placeholder] : ''
@from_now = args[:from_now].present? ? args[:from_now] : false
end

def hydrate_field(fields, model, resource, view)
Expand All @@ -23,6 +24,7 @@ def hydrate_field(fields, model, resource, view)
picker_format: @picker_format,
format: @format,
placeholder: @placeholder,
from_now: @from_now,
}
end
end
Expand Down
1 change: 1 addition & 0 deletions lib/avo/app/fields/datetime_field.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def hydrate_field(fields, model, resource, view)
enable_time: true,
time_24hr: @time_24hr,
timezone: @timezone,
from_now: @from_now,
}
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/avo/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Avo
VERSION = '0.1.16'
VERSION = '0.1.18'
end
2 changes: 1 addition & 1 deletion spec/dummy/app/avo/resources/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def initialize
currency :budget, currency: 'EUR', locale: 'de-DE'
country :country
number :users_required
datetime :started_at, time_24hr: true
datetime :started_at, name: 'Started', time_24hr: true, from_now: true
files :files
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

Expand Down

0 comments on commit 9751670

Please sign in to comment.