From d784a8945a9ee231b2b7b6687f4dd249e6551bd5 Mon Sep 17 00:00:00 2001 From: titima15 Date: Tue, 7 Jul 2020 18:33:32 +0000 Subject: [PATCH] added the list of management factor types in controllers --- lib/SGN/Controller/BreedersToolbox.pm | 7 +++++++ lib/SGN/Controller/Root.pm | 4 ++++ mason/breeders_toolbox/manage_projects.mas | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/SGN/Controller/BreedersToolbox.pm b/lib/SGN/Controller/BreedersToolbox.pm index c3c62f4455..e8937e7b1f 100644 --- a/lib/SGN/Controller/BreedersToolbox.pm +++ b/lib/SGN/Controller/BreedersToolbox.pm @@ -86,7 +86,10 @@ sub manage_trials : Path("/breeders/trials") Args(0) { } #print STDERR "Breeding programs are ".Dumper(@breeding_programs); + my $field_management_factors = $c->config->{management_factor_types}; + my @management_factor_types = split ',',$field_management_factors; + $c->stash->{management_factor_types} = \@management_factor_types; $c->stash->{editable_stock_props} = \%editable_stock_props; $c->stash->{preferred_species} = $c->config->{preferred_species}; $c->stash->{timestamp} = localtime; @@ -326,6 +329,10 @@ sub manage_upload :Path("/breeders/upload") Args(0) { my $genotyping_facilities = $c->config->{genotyping_facilities}; my @facilities = split ',',$genotyping_facilities; + my $field_management_factors = $c->config->{management_factor_types}; + my @management_factor_types = split ',',$field_management_factors; + + $c->stash->{management_factor_types} = \@management_factor_types; $c->stash->{facilities} = \@facilities; $c->stash->{geojson_locations} = decode_json($projects->get_all_locations_by_breeding_program()); $c->stash->{locations} = $projects->get_all_locations(); diff --git a/lib/SGN/Controller/Root.pm b/lib/SGN/Controller/Root.pm index 5dd11b0df0..ccec138f7a 100644 --- a/lib/SGN/Controller/Root.pm +++ b/lib/SGN/Controller/Root.pm @@ -72,6 +72,10 @@ sub index :Path :Args(0) { my @facilities = split ',',$genotyping_facilities; $c->stash->{facilities} = \@facilities; + my $field_management_factors = $c->config->{management_factor_types}; + my @management_factor_types = split ',',$field_management_factors; + $c->stash->{management_factor_types} = \@management_factor_types; + $c->stash->{template} = '/index.mas'; $c->stash->{schema} = $c->dbic_schema('SGN::Schema'); $c->stash->{static_content_path} = $c->config->{static_content_path}; diff --git a/mason/breeders_toolbox/manage_projects.mas b/mason/breeders_toolbox/manage_projects.mas index bcf639505c..8e06c9f096 100644 --- a/mason/breeders_toolbox/manage_projects.mas +++ b/mason/breeders_toolbox/manage_projects.mas @@ -5,6 +5,7 @@ $breeding_programs $preferred_species $editable_stock_props $timestamp +$management_factor_types => () @@ -14,6 +15,6 @@ $timestamp <&| /page/info_section.mas, title=>'Trials', collapsible=>1, collapsed=>0, subtitle=>' ' &> - <& /breeders_toolbox/trialtreefolders.mas, locations=>$locations, breeding_programs=>$breeding_programs, preferred_species=>$preferred_species, editable_stock_props=>$editable_stock_props, timestamp=>$timestamp &> + <& /breeders_toolbox/trialtreefolders.mas, locations=>$locations, breeding_programs=>$breeding_programs, preferred_species=>$preferred_species, editable_stock_props=>$editable_stock_props, timestamp=>$timestamp, management_factor_types=>$management_factor_types &> -- 2.11.4.GIT