Skip to content
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.

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

Topic/repetitive measurements2 #5233

Open
wants to merge 133 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
4a9d453
retrieve more term props; refactor into get_term_props function.
lukasmueller Feb 27, 2024
9cf7ba3
add some comments how the system should work with multiple phenotypic…
lukasmueller Feb 28, 2024
a8cf000
add trait_repeat_type to the load_trait_props.pl script and its backend.
lukasmueller Mar 1, 2024
a8d6236
adjust storing logic to trait_repeat_type parameter.
lukasmueller Mar 1, 2024
343188c
fix some issues with variable declarations.
lukasmueller Mar 1, 2024
b441938
fix issue with query parameters.
lukasmueller Mar 3, 2024
a03f71f
fix typo in variable name
lukasmueller Mar 5, 2024
21c7f4d
add support for multiple measurements.
lukasmueller Mar 5, 2024
b57d07b
add support for multiple observations.
lukasmueller Mar 5, 2024
ad1be34
fix typo in variable name.
lukasmueller Mar 5, 2024
3570705
implement multiple values features.
lukasmueller Mar 8, 2024
66132e9
add support for multiple measurements for native search in phenotype …
lukasmueller Mar 13, 2024
aab1ed3
comment out debug info.
lukasmueller Mar 13, 2024
479501f
add missing Perl module CXGN::Trial.
lukasmueller Mar 13, 2024
4d4dde8
remove debug messages.
lukasmueller Mar 15, 2024
7277658
Merge branch 'master' into topic/repetitive_measurements
lukasmueller Mar 25, 2024
24b7f2a
add phenotype matrix test.
lukasmueller Mar 29, 2024
1a97caf
add trait_repeat_type to trait properties add function.
lukasmueller Mar 31, 2024
822dcc8
Merge branch 'master' into topic/repetitive_measurements
lukasmueller Mar 31, 2024
d7b849b
add repetitive_measurements key and tweak pod.
lukasmueller Apr 1, 2024
30260e0
prevent errors when there are no observations.
lukasmueller Apr 1, 2024
ceb1fc7
fix typo in assignment.
lukasmueller Apr 1, 2024
bab60c9
add new accessor for repetitive measurements.
lukasmueller Apr 1, 2024
917c998
rename multiple_observations_treatment to repetitive_measurements; ad…
lukasmueller Apr 1, 2024
4e79541
add trait repeat prop cvterm and transfer timestamps to correct field.
lukasmueller Apr 2, 2024
4b3a0b5
add time based queries to phenotype download in the wizard
lukasmueller May 23, 2024
25a058d
add date related queries to downloads.
lukasmueller May 24, 2024
e5d96fc
resolve conflicts.
lukasmueller Nov 1, 2024
6bc876b
add separate section for repetitve measurements in trial detail page
Sri-2023 Nov 1, 2024
07752bb
fix the ID names; and fix indentation in repetitive_measurement options
Sri-2023 Nov 1, 2024
f74c9d4
add value attributes to reptitive values in search page
Sri-2023 Nov 1, 2024
ff1fb0c
Fix ID names for repetitive options in download phenotypes dialog
Sri-2023 Nov 1, 2024
20f9d1e
swap 'phenotype_raw_data' and 'phenotype_summary_statistics' sections…
Sri-2023 Nov 1, 2024
c5d93d5
add date range option and slider to phenotype summary stats section t…
Sri-2023 Nov 2, 2024
6c43e6c
add start_date, and end_date params to the trait_pheno and pheno_summ…
Sri-2023 Nov 2, 2024
cc88f3b
add trial_collect_date_range endpoint to retrieve trial start and end…
Sri-2023 Nov 3, 2024
66c6264
add start_date and end_date to search query
Sri-2023 Nov 3, 2024
0da16d5
refactor to use the consistent trial_id
Sri-2023 Nov 3, 2024
0dc88f9
add small line graph to see trend, and zoomable large graph to view
Sri-2023 Nov 4, 2024
57b9872
fix typo
Sri-2023 Nov 4, 2024
1eaf2e0
add title to line_graph
Sri-2023 Nov 4, 2024
afb829f
correct repetitive_params in download_phenotypes_action
Sri-2023 Nov 4, 2024
bdad8ea
add seperate section to show # of phenotypes recorded in a trial; and…
Sri-2023 Nov 4, 2024
fbcff9c
Merge remote-tracking branch 'origin/master' into topic/repetitive_me…
Sri-2023 Nov 4, 2024
539e153
add 'sum' option to the repetitive_values
Sri-2023 Nov 4, 2024
5dae445
handle sum values
Sri-2023 Nov 4, 2024
dc9442a
comment out alter messages
Sri-2023 Nov 5, 2024
5ebe930
two options to retrieve all values: single line and multi line
Sri-2023 Nov 5, 2024
caf981f
fix BrApi phenotyping test
Sri-2023 Nov 5, 2024
2c79bd3
parse the time-series repetitive values
Sri-2023 Nov 5, 2024
4a7ffd9
handle collect_date in Native search
Sri-2023 Nov 5, 2024
5da8d4b
add package for storing phenotype additional info and references
Sri-2023 Nov 5, 2024
4f0a173
add accessors to max, min, duplicates, value_count
Sri-2023 Nov 5, 2024
4fd9b51
modify POD
Sri-2023 Nov 7, 2024
7f863de
missing true value
Sri-2023 Nov 7, 2024
42e1f9b
add date params get_phennotypes_for_trait function
Sri-2023 Nov 8, 2024
bedbe71
refactor phenotypes in-progress
Sri-2023 Nov 8, 2024
15771e4
add the sum_observations method repetitive_values; fix indent
Sri-2023 Nov 11, 2024
07f0303
fix phenotype_multi_categories test
Sri-2023 Nov 11, 2024
23cfc93
update PhenotypeMatrix test with all_values_single_line and sum params
Sri-2023 Nov 11, 2024
0b90a30
refactor phenotypes to store the multiple measurement values
Sri-2023 Nov 11, 2024
6908c3e
fix the BrAPI phenotying test
Sri-2023 Nov 12, 2024
c8d4183
refactor phenotypes
Sri-2023 Nov 12, 2024
bc189ff
Merge remote-tracking branch 'origin/master' into topic/repetitive_me…
Sri-2023 Nov 12, 2024
8d46891
fix ValidateNIRS test.
lukasmueller Nov 12, 2024
898bfbd
exlude notes from trait check.
lukasmueller Nov 13, 2024
2b5da46
update the default end date to the current date
Sri-2023 Nov 13, 2024
4571f3c
fix indent
Sri-2023 Nov 13, 2024
24c4eb4
exclude notes from normal phenotype storage.
lukasmueller Nov 13, 2024
dd9c667
make test labels distinct.
lukasmueller Nov 13, 2024
ced594f
fix a test, one more to go.
lukasmueller Nov 14, 2024
2b3c491
fix typo (oops) and fix last test.
lukasmueller Nov 14, 2024
83c8c59
remove duplicated repeat_type
Sri-2023 Nov 15, 2024
77f5907
filter the values based on the timestamp
Sri-2023 Nov 15, 2024
2488cf9
make the values of end_date inclusive, when they select the last date…
Sri-2023 Nov 19, 2024
61557ec
comment the sorting values by date from line_graph package
Sri-2023 Nov 19, 2024
a169caf
sort observations by date; and use latest(last) date as timestamp for…
Sri-2023 Nov 21, 2024
8899f08
Merge remote-tracking branch 'origin/master' into topic/repetitive_me…
Sri-2023 Nov 21, 2024
da35fb7
add timestamp check for the avg and sum options
Sri-2023 Nov 22, 2024
ac38f76
Merge remote-tracking branch 'origin/master' into topic/repetitive_me…
Sri-2023 Nov 22, 2024
23f68c2
modify the phenotype_matrix function to retrieve reptitive values in …
Sri-2023 Dec 3, 2024
3809678
modify note field to store multiple entries for repetitive_measurements
Sri-2023 Dec 3, 2024
ac590c9
typo
Sri-2023 Dec 3, 2024
5e90e90
use clean_up_db to clean up some tests; in SGN::Test::Fixture, also c…
lukasmueller Dec 3, 2024
4efa217
clean up db after some tests and also re-run matviews so they are cor…
lukasmueller Dec 4, 2024
600276b
try to fix tests.
lukasmueller Dec 4, 2024
d092c16
hmmm... changing the order of the values may not help in the long run...
lukasmueller Dec 6, 2024
10b6046
more sustainable approach is to sort the returned data before checking.
lukasmueller Dec 6, 2024
31d80c3
more attempts to make tests pass...
lukasmueller Dec 6, 2024
d5ea2c8
Merge branch 'master' into topic/repetitive_measurements2
lukasmueller Dec 6, 2024
a6f8ba0
fix upload_phenotype tests to handle potential delays
Sri-2023 Dec 12, 2024
46ff305
add strict and warnings options
Sri-2023 Dec 12, 2024
ed4cc06
add ability to load multiple phenotypic values by pushing on an array…
Dec 12, 2024
4479cc8
Merge remote-tracking branch 'origin/master' into topic/repetitive_me…
Sri-2023 Dec 12, 2024
2a6aea6
Merge remote-tracking branch 'origin/topic/repetitive_measurements2' …
Sri-2023 Dec 12, 2024
666d1bb
fix lint issues
Sri-2023 Dec 12, 2024
a32aa30
make Phenotype_with_multi_categories.t test pass more reliably by che…
lukasmueller Dec 12, 2024
487986a
fix all linting issues
Sri-2023 Dec 13, 2024
55dca30
update branch
Sri-2023 Dec 13, 2024
66076d9
fix this last lint issue
Sri-2023 Dec 13, 2024
39e79b9
update the manual with repetitive_measurements
Sri-2023 Dec 16, 2024
406823c
update bookdown docs
invalid-email-address Dec 16, 2024
ad285fc
make trait values dynamic as trait option changes
Sri-2023 Dec 17, 2024
1356040
update bookdown docs
invalid-email-address Dec 17, 2024
55af6b1
requested to make a defualt option - as Average on UI under repetitiv…
Sri-2023 Dec 17, 2024
47ebabf
typo in passing the type param
Sri-2023 Dec 17, 2024
4bb21d0
update bookdown docs
invalid-email-address Dec 17, 2024
873a49c
add a conversion file for ncsu excel format.
lukasmueller Dec 22, 2024
7fdb481
update bookdown docs
invalid-email-address Dec 22, 2024
66e8f49
Merge remote-tracking branch 'origin/master' into topic/repetitive_me…
Sri-2023 Jan 9, 2025
539f65f
Merge remote-tracking branch 'origin/topic/repetitive_measurements2' …
Sri-2023 Jan 9, 2025
ad65532
update bookdown docs
invalid-email-address Jan 9, 2025
bd78e5a
Merge remote-tracking branch 'origin/master' into topic/repetitive_me…
Sri-2023 Jan 16, 2025
9111ad5
update bookdown docs
invalid-email-address Jan 16, 2025
4aec3ff
parse date without timezone
Sri-2023 Jan 16, 2025
2b27a7f
fix mousover on zoomed-in graph
Sri-2023 Jan 16, 2025
4b13376
Merge remote-tracking branch 'origin/topic/repetitive_measurements2' …
Sri-2023 Jan 16, 2025
3993d35
update bookdown docs
invalid-email-address Jan 16, 2025
3042304
fix margin to display labees for zoomed-in grpah
Sri-2023 Jan 17, 2025
6d68199
update bookdown docs
invalid-email-address Jan 17, 2025
00802ff
make lint ignore docs dir
Sri-2023 Jan 17, 2025
9eee50b
update bookdown docs
invalid-email-address Jan 17, 2025
d189315
add spinning wheel for repetitive section
Sri-2023 Jan 20, 2025
b0b7f41
update bookdown docs
invalid-email-address Jan 20, 2025
a9fc8a9
add spinning wheel to phenotype raw data section
Sri-2023 Jan 21, 2025
44c021d
update bookdown docs
invalid-email-address Jan 21, 2025
363f436
Update linter.yml
ClayBirkett Jan 23, 2025
49e6c52
Create .htmlhintrc
ClayBirkett Jan 23, 2025
f18d15a
update bookdown docs
invalid-email-address Jan 23, 2025
22a0849
ignore linting in docs
Sri-2023 Jan 28, 2025
6577bbf
update bookdown docs
invalid-email-address Jan 28, 2025
1733219
store multiple measurements in the data structure for storage.
Feb 5, 2025
a2a22a3
update bookdown docs
invalid-email-address Feb 5, 2025
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
Prev Previous commit
Next Next commit
typo in passing the type param
  • Loading branch information
Sri-2023 committed Dec 17, 2024
commit 47ebabf86c40df0b0af88ac8589884daa1143ec4
10 changes: 5 additions & 5 deletions mason/breeders_toolbox/trial/phenotype_summary.mas
Original file line number Diff line number Diff line change
@@ -234,7 +234,7 @@ input[type="text"] {
//console.log("Slided moved Start_date in Pheno summ :", raw_phenotype_startDate);
//console.log("Slided moved End Date in pheno Summ :", raw_phenotype_endDate);

var html = setup_tables();
var html = setup_tables(type);
jQuery('#pheno_summary_table_div').empty().html(html);
datatables_display_phenosummary(type);
}
@@ -246,14 +246,14 @@ input[type="text"] {
});
jQuery("#summary_start_date").change( function() {
//datatables_display_phenosummary(type);
var html = setup_tables();
var html = setup_tables(type);
jQuery('#pheno_summary_table_div').empty().html(html);
datatables_display_phenosummary(type);
});

jQuery('#summary_end_date').change( function() {
//datatables_display_phenosummary(type);
var html = setup_tables();
var html = setup_tables(type);
jQuery('#pheno_summary_table_div').empty().html(html);
datatables_display_phenosummary(type);
});
@@ -428,14 +428,14 @@ input[type="text"] {
// get the earliest and last measurement date in the trial

jQuery(document).on('change', '#display_trial_phenosummary', function() {
var html = setup_tables();
var html = setup_tables(type);
jQuery('#pheno_summary_table_div').empty().html(html);
datatables_display_phenosummary(type);
});
//catch( function(r) { alert('An error occurred :-( '); )});
}

function setup_tables() {
function setup_tables(type) {
var html = '';
var display = jQuery('#display_trial_phenosummary').val();
if (display == 'plots' || display == 'plants' || display == 'subplots' || display == 'tissue_samples') {
Loading