Skip to content

Addition of deleted date to person field [B: 1742] #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abeverley merged 2 commits into from
Dec 18, 2024
Merged

Addition of deleted date to person field [B: 1742] #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd2e863
Addition of deleted date to person field
droberts-ctrlo Nov 25, 2024
d55f8ab
Removed as_epoch
droberts-ctrlo Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/GADS/Column/Person.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ use MooX::Types::MooseLike::Base qw/:all/;

extends 'GADS::Column';

with 'GADS::Role::Presentation::Column::Person';

our @person_properties = qw/id email username firstname surname freetext1 freetext2 organisation department_id team_id title value/;
our @person_properties = qw/id email username firstname surname freetext1 freetext2 organisation department_id team_id title value deleted/;

has set_filter => (
is => 'rw',
Expand Down
4 changes: 3 additions & 1 deletion lib/GADS/Datum/Person.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use namespace::clean;
extends 'GADS::Datum';

with 'GADS::Role::Presentation::Datum::Person';
with 'GADS::DateTime';

after set_value => sub {
my ($self, $value, %options) = @_;
Expand Down Expand Up @@ -169,6 +170,7 @@ has value_hash => (
team_id => $value->{team_id},
title => $value->{title},
value => $value->{value},
deleted => $value->{deleted},
};
}
elsif ($value) {
Expand Down Expand Up @@ -377,11 +379,11 @@ sub _build_for_code
team => $_->{team},
title => $_->{title},
text => $_->{value},
deleted => GADS::DateTime::parse_datetime($_->{deleted})->epoch,
}
} @{$self->value_hash};

$self->column->multivalue || @values > 1 ? \@values : $values[0];
}

1;