Skip to content

Paged chronology #621

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

Open
droberts-ctrlo wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Paged chronology #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01afc47
Performance - link latest record version (D1098)
abeverley Jan 4, 2026
481e599
Updated to default to "all" view on view all button click (D795)
abeverley Feb 6, 2026
9947699
Fix syntax error from manual merge
abeverley Feb 6, 2026
87785d7
Initial iteration of chronology
droberts-ctrlo Feb 6, 2026
f8fb805
Fix errors in commits and add comments clarifying chronology changes
droberts-ctrlo May 18, 2026
a491733
Update from code review
droberts-ctrlo May 18, 2026
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
30 changes: 28 additions & 2 deletions lib/GADS/API.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ post '/api/settings/logo' => require_login sub {
my $filecheck = GADS::Filecheck->instance;
error __x"Files of mimetype {mimetype} are not allowed", mimetype => $filecheck->get_filetype($file)
unless $filecheck->is_image($file);

$site->update({ site_logo => $file->content });

content_type 'application/json';
Expand All @@ -584,6 +584,32 @@ post '/api/settings/logo' => require_login sub {
);
};

get '/api/chronology/:id' => require_login sub {
my $user = logged_in_user;
my $current_id = route_parameters->get('id');
my $page = query_parameters->get('page') // 1;

my $record = GADS::Record->new(
user => $user,
schema => schema,
);

$record->find_chronology_id($current_id, page => $page);

my $layout = $record->layout;
my $base_url = request->base;
my $last_page = $record->last_chronology_page;

return template 'chronology/chronology.tt' => {
record => $record,
layout_obj => $layout,
page => $page,
last_page => $last_page == $page ? 1 : 0,
}, {
layout => undef, # Do not render page header, footer etc
};
};

sub _post_dashboard_widget {
my $layout = shift;
my $user = logged_in_user;
Expand Down Expand Up @@ -666,7 +692,7 @@ sub _put_dashboard_widget_edit {
my $widget = _get_widget_write(route_parameters->get('id'), route_parameters->get('dashboard_id'), $layout, $user);

my $body = from_json(request->body);

$widget->title($body->{'title'});
$widget->static(query_parameters->get('static') ? 1 : 0)
if $widget->dashboard->is_shared;
Expand Down
22 changes: 22 additions & 0 deletions lib/GADS/Chronology.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
=comment
It's a singleton object that just holds the last chronology record, and the API can set it when it finds a chronology,
and the Record class can get it when it needs to find the next page of a chronology.
=cut
package GADS::Chronology;

use strict;
use warnings;

use Moo;

with 'MooX::Singleton';

has last_record => (
is => 'rw',
);

sub clear {
shift->last_record(undef);
}

1;
183 changes: 157 additions & 26 deletions lib/GADS/Record.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ use DateTime::Format::Strptime qw( );
use DBIx::Class::ResultClass::HashRefInflator;
use GADS::AlertSend;
use GADS::Config;
use GADS::Chronology;
use GADS::Datum::Autocur;
use GADS::Datum::Calc;
use GADS::Datum::Count;
Expand Down Expand Up @@ -724,7 +725,7 @@ sub find_chronology_id
or error __x"Record ID {id} not found", id => $current_id;
my $instance_id = $current->instance_id;
$self->_set_instance_id($current->instance_id);
$self->_find(current_id => $current_id, chronology => 1);
$self->_find(current_id => $current_id, chronology => 1, chronology_page => $options{page} // 1);
}

sub find_draftuser_id
Expand Down Expand Up @@ -820,6 +821,24 @@ sub clear
$self->clear_id_count;
}

sub _get_record_for_chronology {
my ( $self, $record, $records, %find ) = @_;
return unless $find{chronology};

my @changed;

$records->rewind($record->edited_time->values->[0], %find);

$records->fetch_multivalues(
record_ids => [$record->record_id],
retrieved => [$record->{$record->record_id}],
records => [$record],
is_draft => $find{draftuser_id},
already_seen => $records->already_seen,
chronology => 1,
);
}

# XXX This whole section is getting messy and duplicating a lot of code from
# GADS::Records. Ideally this needs to share the same code.
sub _find
Expand All @@ -832,6 +851,8 @@ sub _find
error __"You do not have access to this deleted record"
if $find{deleted} && !$self->layout->user_can("purge") && !$GADS::Schema::IGNORE_PERMISSIONS;

my $last_page;

my %params = (
user => $self->user,
layout => $self->layout,
Expand Down Expand Up @@ -870,10 +891,27 @@ sub _find
);
# No linked here so that we get the ones needed in accordance with this loop (could be either)
my @prefetches = $records->jpfetch(search => 1, %common); # Still need search in case of view limit
last if !@prefetches && !$first_run;
last unless @prefetches || $first_run; # Inverted - didn't like how the condition was (slightly) confusing.
my %options = $find{current_id} || $find{draftuser_id} ? () : (root_table => 'record', no_current => 1);
my $search = $records->search_query(linked => 1, chronology => $find{chronology}, rewind => $records->rewind_values, %common, %options);
# Still need search in case of view limit
if ($find{chronology}) {
my $record_search = $self->schema->resultset('Current')->find(
$find{current_id},
)->records->search(
{},
{
select => [ 'id' ],
rows => 10,
page => $find{chronology_page} // 1,
result_class => 'DBIx::Class::ResultClass::HashRefInflator',
order_by => { '-desc' => 'created' },
}
);
my @ids = map { $_->{id} } $record_search->all;
$last_page = $record_search->pager->last_page == $find{chronology_page} ? 1: 0;
push @$search, { 'record_single.id' => { -in => \@ids } };
}
# Still need search in case of view limit
@prefetches = $records->jpfetch(search => 1, linked => 0, %common, %options);

my $root_table;
Expand Down Expand Up @@ -953,7 +991,7 @@ sub _find
join => [@prefetches],
columns => \@columns_fetch,
};
$params->{order_by} = 'record_single.created'
$params->{order_by} = { -desc => 'record_single.created'}
if $find{chronology};
my $result = $self->schema->resultset($root_table)->search(
[
Expand Down Expand Up @@ -1031,7 +1069,7 @@ sub _find
set_record_created_user => $self->set_record_created_user,
);
# Set data for this original record to the current version (latest)
$self->record($record->{$record_ids[-1]});
$self->record($record->{$record_ids[0]});
}
}
else {
Expand Down Expand Up @@ -1060,23 +1098,59 @@ sub _find
if ($find{chronology})
{
my @chronology; my $last_record;
foreach my $record (@record_objects)
# First entry - this is the record as it currently stands
if ($find{chronology_page} == 1) {
$self->clear_get_last_chronology_record;
my $record = $record_objects[0];
my @changed;

$self->_get_record_for_chronology($record, $records, %find);
foreach my $column ( @{ $record->columns_render } ) {
next if $column->internal;
my $datum = $record->fields->{ $column->id };
if($column->type eq 'curval') {
my %new_ids = map { $_->{id} => $_ } @{$datum->values};
my @values;
foreach my $id (keys %new_ids)
{
my $new_value = $new_ids{$id};
$new_value->{status} = "current";
$new_value->{version_id} = $new_value->{record}->record_id;
push @values, $new_value;
}
push @changed, $column->presentation(datum_presentation => $datum->presentation(values => \@values));
}
else {
push @changed, $column->presentation(datum_presentation => $datum->presentation);
}
}

push @chronology,
{
editor => $record->edited_user,
datetime => $record->edited_time,
changed => \@changed,
};
} else {
unshift @record_objects, $self->get_last_chronology_record if $self->get_last_chronology_record;
}
# Show all changes from the original - ignore the last one as this will become the $last_record for comparison
foreach my $i (0 .. $#record_objects-1)
{
$records->rewind($record->edited_time->values->[0]);
$records->fetch_multivalues(
record_ids => [$record->record_id],
retrieved => [$record->{$record->record_id}],
records => [$record],
is_draft => $find{draftuser_id},
already_seen => $records->already_seen,
chronology => 1,
);
$record = $record_objects[$i+1];

$self->_get_record_for_chronology($record, $records, %find);
$last_record = $record;

$record = $record_objects[$i];
$self->_get_record_for_chronology($record, $records, %find);

my @changed;
foreach my $column (@{$record->columns_render})
{
next if $column->internal;
my $datum = $record->fields->{$column->id};
my $last_datum = $last_record && $last_record->fields->{$column->id};
my $last_datum = $last_record->fields->{$column->id};

if (
(!$last_record && !$datum->blank)
Expand All @@ -1097,15 +1171,15 @@ sub _find
# Removed?
if (!$new_ids{$id})
{
$old_value->{status} = "Removed";
$old_value->{status} = "removed";
$old_value->{version_id} = $old_value->{record}->record_id;
push @values, $old_value;
}
else {
# Changed?
my $new_value = delete $new_ids{$id};
next if $old_value->{value} eq $new_value->{value};
$new_value->{status} = "Changed";
$new_value->{status} = "changed";
$new_value->{version_id} = $new_value->{record}->record_id;
push @values, $new_value;
}
Expand All @@ -1114,20 +1188,16 @@ sub _find
foreach my $id (keys %new_ids)
{
my $new_value = $new_ids{$id};
$new_value->{status} = "Added";
$new_value->{status} = "added";
$new_value->{version_id} = $new_value->{record}->record_id;
push @values, $new_value;
}
foreach my $v (@values)
{
}
push @changed, $column->presentation(datum_presentation => $datum->presentation(values => \@values))
push @changed, $column->presentation(datum_presentation => $datum->presentation(values => \@values));
}
else {
push @changed, $column->presentation(datum_presentation => $datum->presentation)
push @changed, $column->presentation(datum_presentation => $datum->presentation);
}
}

}
push @chronology, {
editor => $record->edited_user,
Expand All @@ -1136,12 +1206,73 @@ sub _find
} if @changed; # There may have been changes, but not ones the user has access to
$last_record = $record;
}
# If we're on the last page, return the record state as it was created
if($last_page) {
my $record = $record_objects[-1];
$self->_get_record_for_chronology($record, $records, %find);

my @changed;
foreach my $column ( @{ $record->columns_render } ) {
next if $column->internal;
my $datum = $record->fields->{ $column->id };
if($column->type eq 'curval') {
my %new_ids = map { $_->{id} => $_ } @{$datum->values};
my @values;
foreach my $id (keys %new_ids)
{
my $new_value = $new_ids{$id};
$new_value->{status} = "created";
$new_value->{version_id} = $new_value->{record}->record_id;
push @values, $new_value;
}
push @changed, $column->presentation(datum_presentation => $datum->presentation(values => \@values));
}
else {
push @changed, $column->presentation(datum_presentation => $datum->presentation);
}
}
push @chronology,
{
editor => $record->edited_user,
datetime => $record->edited_time,
changed => \@changed,
};
}
$self->_set_last_chronology_page($last_page // 0);
$self->_set_last_chronology_record($last_record) if $last_record;
$self->_set_chronology(\@chronology);
}

$self; # Allow chaining
}

has get_last_chronology_record => (
is => 'lazy',
clearer => 1,
builder => sub {
my $self = shift;
my $chronology = GADS::Chronology->instance;
return $chronology->last_record;
}
);

sub _clear_last_chronology_record {
my $self = shift;
my $chronology = GADS::Chronology->instance;
$chronology->clear;
$self->_clear_get_last_chronology_record;
}

sub _set_last_chronology_record {
my ($self, $record) = @_;
my $chronology = GADS::Chronology->instance;
$chronology->last_record($record);
}

has last_chronology_page => (
is => 'rwp',
);

has chronology => (
is => 'rwp',
);
Expand Down Expand Up @@ -2411,7 +2542,7 @@ sub _field_write
# child records. This is used in chronology view to
# ensure the correct versions at the time of record
# edit are used
version_datetime => $created,
version_datetime => $created,
);
push @{$self->_records_to_write_after}, $record
if $record->is_edited;
Expand Down
24 changes: 13 additions & 11 deletions lib/GADS/Role/Presentation/Datum/Person.pm
View file
Open in desktop
Copy link
Copy Markdown
Contributor Author

@droberts-ctrlo droberts-ctrlo May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't know what this is - was pulled through with my rebase into Dev

Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,19 @@ sub _presentation_details {
};
}

for (
[$person->{freetext1}, $site->register_freetext1_name],
[$person->{freetext2}, $site->register_freetext2_name]
) {
next unless $_->[0];

push @details, {
definition => $_->[1],
value => $_->[0],
type => 'text'
};
if($site) {
for (
[$person->{freetext1}, $site->register_freetext1_name],
[$person->{freetext2}, $site->register_freetext2_name]
) {
next unless $_->[0];

push @details, {
definition => $_->[1],
value => $_->[0],
type => 'text'
};
}
}

return {
Expand Down
Loading
Loading