Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4153 commits
Select commit Hold shift + click to select a range
56f3d5f
Merge branch 'topic/solgs/pca-pheno-dataset-fix' into topic/pca-analy…
isaak Oct 21, 2025
32aec4f
query for list metadata
isaak Oct 21, 2025
f973dfd
Match transcriptomics protocol creation fields to BrAPI spec
bm743 Oct 21, 2025
2b45a37
convert static wizard download filenames into tempfiles
isaak Oct 22, 2025
4c2ce0c
Trying to make PNGs show up properly
ryan-preble Oct 22, 2025
976ad31
Fix QRcode artifacts and make custom page sizes work
ryan-preble Oct 22, 2025
e0e9fb9
Add option to change text alignment
ryan-preble Oct 22, 2025
65dd55f
Remove right alignment option, keep middle and left
ryan-preble Oct 22, 2025
bea1ebc
fix up some typos in the basic website usage section.
lukasmueller Oct 22, 2025
80ae1cc
Add metric and imperial margin selectors
ryan-preble Oct 22, 2025
79b814e
Add tooltip on object mouseover
ryan-preble Oct 22, 2025
aa11910
revert variable type back
titima15 Oct 22, 2025
665248d
Appeasing the linter
ryan-preble Oct 22, 2025
6165dce
Appeasing the linter
ryan-preble Oct 22, 2025
999d8fe
update bookdown docs
invalid-email-address Oct 23, 2025
8f74235
Add default value for text alignment if not specified
ryan-preble Oct 23, 2025
8693ab9
Change header names for trnasciptomics data file
bm743 Oct 23, 2025
ff2ff11
Merge pull request #5754 from solgenomics/topic/compare_list_test
lukasmueller Oct 23, 2025
d11d6f4
Merge pull request #5752 from solgenomics/topic/solgs/pca-pheno-datas…
lukasmueller Oct 23, 2025
b1054b3
Merge pull request #5737 from solgenomics/topic/experiment_design_imp…
lukasmueller Oct 23, 2025
3f5269b
make filenames easier to read
isaak Oct 24, 2025
51249d0
Allow verify button to be clicked again when there is an error. More …
bm743 Oct 24, 2025
9d6af91
Round out numbers in display
ryan-preble Oct 24, 2025
3da800f
Conver to POST
ryan-preble Oct 24, 2025
d22838a
Merge pull request #5760 from solgenomics/topic/manual_basic_usage_ch…
lukasmueller Oct 27, 2025
67c3d17
Merge pull request #5757 from solgenomics/topic/pca-analysis-log
lukasmueller Oct 27, 2025
f749ea3
Merge pull request #5747 from solgenomics/topic/brapi_field_map_creat…
lukasmueller Oct 27, 2025
5b88070
Use CXGN::Job
ryan-preble Oct 27, 2025
eb761bb
fixed merge conflict
titima15 Oct 27, 2025
2cbd9a5
Debugging
ryan-preble Oct 27, 2025
6fe0d57
Wrong branch
ryan-preble Oct 27, 2025
16a8f92
Debugging
ryan-preble Oct 27, 2025
3b45561
Debugging
ryan-preble Oct 27, 2025
cb5e3f1
Debugging
ryan-preble Oct 27, 2025
cf9419f
Debugging
ryan-preble Oct 27, 2025
de184bd
Debugging
ryan-preble Oct 27, 2025
5831486
Debugging
ryan-preble Oct 27, 2025
6e318b1
Debugging
ryan-preble Oct 27, 2025
7793a1b
Debugging
ryan-preble Oct 27, 2025
edddede
Cleanup
ryan-preble Oct 27, 2025
593d74f
enable COMP trait image upload
afpowell Oct 27, 2025
0ebc3b5
Marker Metadata: Add optional Alias column to data upload
dwaring87 Oct 27, 2025
0b41001
Find Geno by Acc List: create lists from results
dwaring87 Oct 28, 2025
b31fcc8
Find Geno by Acc List: display dialog of matching / missing accessions
dwaring87 Oct 29, 2025
bfef6de
fix typo
titima15 Oct 29, 2025
9d64560
Find Geno by Acc List: add accession usage data table
dwaring87 Oct 29, 2025
6866971
Merge pull request #5768 from solgenomics/topic/greenhouse_design
titima15 Oct 29, 2025
18c3c5f
Clarify measurement unit on edit additional settings modal
ryan-preble Oct 30, 2025
557a330
Fix loop condition for stock types iteration
bvsam Oct 31, 2025
d0c9287
Merge pull request #5762 from solgenomics/topic/fix-breebasegenottype…
lukasmueller Nov 2, 2025
a9022c9
Merge pull request #5759 from solgenomics/topic/label_designer_improv…
lukasmueller Nov 2, 2025
9d304c9
Merge pull request #5733 from solgenomics/topic/major_loci
lukasmueller Nov 2, 2025
2032362
Merge pull request #5774 from solgenomics/topic/accession_genotype_se…
lukasmueller Nov 3, 2025
cc6f74b
Merge pull request #5769 from solgenomics/topic/spatial_corrections_b…
lukasmueller Nov 3, 2025
e833c2e
fix primer3 link in form.
lukasmueller Nov 3, 2025
b2c9e01
try to fix long string in yaml format.
lukasmueller Nov 3, 2025
36f0265
relax some blast dataset checks to make code work with latest blast e…
lukasmueller Nov 4, 2025
4567e45
add nicotiana specific primers.
lukasmueller Nov 4, 2025
f74671c
move use strict to appease linter.
lukasmueller Nov 4, 2025
2ff3807
Add nirs protocols brapi endpoint
bm743 Nov 5, 2025
19284fc
do not import already imported css, which confuses other css settings.
lukasmueller Nov 5, 2025
9f93c88
tweak the size of the instructions modal.
lukasmueller Nov 5, 2025
5b387de
Fix an issue with primer3
lukasmueller Nov 5, 2025
32feb1e
Accession Transform: return ids in same order as original name list
dwaring87 Nov 5, 2025
205829f
Accession Transform: remove variable name conflicts
dwaring87 Nov 6, 2025
255ebd1
Merge branch 'master' into topic/vector_viewer
lukasmueller Nov 6, 2025
ce55707
close vector viewer section if there is nothing to display.
lukasmueller Nov 6, 2025
4c15cf3
remove debug alerts
lukasmueller Nov 6, 2025
414c6d0
Trial Metadata: support folder column
dwaring87 Nov 6, 2025
794d70a
the new logo.
lukasmueller Nov 7, 2025
c56914c
Merge pull request #5778 from bvsam/fix-stock-search
lukasmueller Nov 7, 2025
b0f7f5e
display repetitive measurements for accessions
isaak Nov 7, 2025
bf2592a
retrieve phenotype data for accessions
isaak Nov 7, 2025
e707934
Trial Metadata: fix tests
dwaring87 Nov 7, 2025
9a4b59b
Trial Download: fix start / end date param names
dwaring87 Nov 7, 2025
f96793a
require login to display analysis job submission feedback message
isaak Nov 10, 2025
ae06596
fix wrong namespace for createGenoData function
isaak Nov 10, 2025
e82e8ae
Merge pull request #5786 from solgenomics/topic/adopt_new_cass_logo
lukasmueller Nov 10, 2025
1080800
Merge pull request #5783 from solgenomics/topic/accession_transform_o…
lukasmueller Nov 10, 2025
b317efe
Merge pull request #5781 from solgenomics/topic/vector_viewer
lukasmueller Nov 10, 2025
21df1c5
Merge pull request #5771 from solgenomics/topic/comp_trait_image_upload
lukasmueller Nov 10, 2025
214b881
CXGN::Trial::Download - allow start and end date to be undef
dwaring87 Nov 13, 2025
f7d471e
Fix issue of custom page row/col data getting wiped. Add option to sa…
ryan-preble Nov 13, 2025
75815cd
Trial Metadata: return warning if folder does not exist
dwaring87 Nov 13, 2025
811f5e2
Trial Metadata: fix tests
dwaring87 Nov 14, 2025
74236f8
Make finish_logfile a required field of CXGN::Jobs
ryan-preble Nov 14, 2025
f06f500
syntax error
ryan-preble Nov 14, 2025
20eb153
Add correct test config key
ryan-preble Nov 14, 2025
282d905
Clean up db
ryan-preble Nov 14, 2025
261f92a
Do metric by default. Save units as part of design. Make sure pixel v…
ryan-preble Nov 14, 2025
d7d9c1d
Print errors for rows with broken jobs
ryan-preble Nov 14, 2025
870995c
Merge pull request #5799 from solgenomics/topic/label_designer_improv…
lukasmueller Nov 16, 2025
47be71f
Merge pull request #5796 from solgenomics/topic/job_finish_log_fix
lukasmueller Nov 16, 2025
62593f5
Merge pull request #5789 from solgenomics/topic/trial_phenotype_excel…
lukasmueller Nov 16, 2025
7a9c6fa
fix error when there are no tissue samples
ClayBirkett Nov 17, 2025
1ffa05f
Add dropdown options to protocol creation
bm743 Nov 17, 2025
b4914c1
Create transciptomics upload test
bm743 Nov 17, 2025
7771a8d
Fix test
bm743 Nov 17, 2025
d10f2f1
Add test csv files and fix store and verify tests
bm743 Nov 18, 2025
98215a7
Remove print statement
bm743 Nov 18, 2025
835cc32
fix conflicts
titima15 Nov 19, 2025
993f471
move dbpatch
titima15 Nov 19, 2025
1f43c7b
derived accessions upload
titima15 Nov 19, 2025
759ed02
add genotyping_facilities to sequencing center dropdown
bm743 Nov 19, 2025
64b996d
add unit fixture test
ClayBirkett Nov 20, 2025
8089e39
upload plugin
titima15 Nov 20, 2025
abf7cf0
debug
titima15 Nov 20, 2025
469f24d
js function and error message
titima15 Nov 20, 2025
86d266a
validation plugin
titima15 Nov 21, 2025
6671c43
make repetitive data retrieval error message more informative
isaak Nov 24, 2025
d5dd8fa
Merge pull request #5787 from solgenomics/topic/repetitive-measuremen…
afpowell Nov 24, 2025
8ed38f5
Merge pull request #5766 from solgenomics/topic/transcriptomics_upload
afpowell Nov 24, 2025
7a07814
fix error in file creation, only need file name
ClayBirkett Nov 24, 2025
3b4f9f3
error messages
titima15 Nov 25, 2025
399cf46
refactor js function
titima15 Nov 25, 2025
28e5865
add OLS equation and R-squared to repetitive measurements plot
isaak Dec 1, 2025
39144f6
Merge pull request #5785 from solgenomics/topic/trial_metadata_folders
lukasmueller Dec 1, 2025
527858a
store stock type name as additional metadata
titima15 Dec 1, 2025
24da475
error message
titima15 Dec 1, 2025
5785e34
add trendline to repetitive measures
isaak Dec 2, 2025
8f0fa0d
clean up
isaak Dec 2, 2025
26b15f1
get original stock info
titima15 Dec 2, 2025
83e5bd8
change SQL to handle large number of markers
ClayBirkett Dec 2, 2025
b810fe7
refactor add derived accession fn
titima15 Dec 2, 2025
83bd25b
list info
titima15 Dec 2, 2025
50666d8
refactor for ease of readability
isaak Dec 3, 2025
637ae44
update github action
ClayBirkett Dec 3, 2025
4d3bc83
Update checkout action to version 5
ClayBirkett Dec 3, 2025
9052d12
code cleanup
ClayBirkett Dec 3, 2025
0af6895
Merge branch 'genotype-project-delete' of https://github.com/solgenom…
ClayBirkett Dec 3, 2025
525c390
get derived accession relationship fn
titima15 Dec 3, 2025
6340fd8
code cleanup
ClayBirkett Dec 3, 2025
d21ce37
remove bad test
ClayBirkett Dec 3, 2025
254c253
refactor
titima15 Dec 3, 2025
54b3815
code cleanup
ClayBirkett Dec 4, 2025
7ee2144
modify pedigree
titima15 Dec 4, 2025
afd0970
retrieve original stock
titima15 Dec 4, 2025
fbee7da
add trait name to large repetitive measures plot
isaak Dec 5, 2025
79b9e82
display both direct source and original source
titima15 Dec 5, 2025
d50f112
ignore original source if direct source is an accession
titima15 Dec 5, 2025
1e9b22a
modify separator
titima15 Dec 5, 2025
e1e3128
fix paths for motif finder files.
Dec 6, 2025
9e4c72c
fix output path for motif finder.
Dec 6, 2025
369a58b
try to squash linting issues.
lukasmueller Dec 6, 2025
a815be6
fix indentation.
lukasmueller Dec 6, 2025
f06d8aa
Nirs protocols and instances backend
bm743 Dec 8, 2025
08ff6d6
Add Nirs protocol and instances endpoints to brapi.pm
bm743 Dec 8, 2025
8d4aec9
Nirs protocols and instances tests
bm743 Dec 8, 2025
22d1e3f
Fix undefined arrayref error
bm743 Dec 8, 2025
6f88ea3
Fix linting errors
bm743 Dec 8, 2025
82625bb
Replace object-method synonyms with SQL call synonyms
ryan-preble Dec 8, 2025
38c9144
cannot obsolete stock if the stock is a parent
titima15 Dec 8, 2025
7dcb9d7
Add nirs test data upload file
bm743 Dec 8, 2025
dab2094
regroup mixed variables declaration for readability, move up accessio…
isaak Dec 9, 2025
291d668
regroup multiple variables declaration by type
isaak Dec 9, 2025
b468605
Fix test using different db ids
bm743 Dec 9, 2025
5657bba
modify get trials for accession function
titima15 Dec 9, 2025
da65748
optimize plant query
ryan-preble Dec 9, 2025
45f015f
more optimizations
ryan-preble Dec 9, 2025
b8227eb
fix ajax trial info for stock
titima15 Dec 9, 2025
794af8c
check progenies fn
titima15 Dec 9, 2025
8a3be47
fix tempfile permission issues
isaak Dec 10, 2025
8381a86
derived accession info
titima15 Dec 10, 2025
70e45d9
test
titima15 Dec 11, 2025
d993f83
test
titima15 Dec 12, 2025
91e817a
Move trait_summary_hist_display_change inside of traits_assayed onswitch
bm743 Dec 12, 2025
2fce741
Add loading message to phenotype summary stats datatable
bm743 Dec 12, 2025
1b021eb
remove added new stocks and trial after test
titima15 Dec 12, 2025
60bd455
Merge branch 'master' into topic/plant_to_accession
titima15 Dec 12, 2025
d2c3b5c
modify dbpatch
titima15 Dec 12, 2025
3d3efc9
modify info and column header
titima15 Dec 13, 2025
66f0f35
add eval fn
titima15 Dec 13, 2025
c02a8db
fix tissue_samples list type
titima15 Dec 14, 2025
ed3bc91
check required description
titima15 Dec 14, 2025
f022ec4
error message
titima15 Dec 14, 2025
16bdaa4
remove refresh matviews
titima15 Dec 15, 2025
2771d68
improve ols equation color and placement
isaak Dec 16, 2025
38b6f1d
retrieve seedlot info by class method
titima15 Dec 16, 2025
a9ed03a
clean up
isaak Dec 17, 2025
42d7075
Merge branch 'master' into topic/gbsappui
amberlockrow Dec 17, 2025
85309cf
Change name from gbsappui to snpsnapp
amberlockrow Dec 17, 2025
b99fd0d
modify retrieve seedlot fn
titima15 Dec 17, 2025
f55d7f5
modify usage info
titima15 Dec 17, 2025
ccb605d
change from iframePostForm to ajax
titima15 Dec 18, 2025
8afb313
check all uniquenames in the database including obsoleted names
titima15 Dec 18, 2025
fa94550
fix new accession name validation step
titima15 Dec 18, 2025
e938fef
Merge pull request #5821 from solgenomics/topic/data_loading_message
lukasmueller Dec 18, 2025
56b5abe
Merge pull request #5820 from solgenomics/topic/label_designer_loading
lukasmueller Dec 18, 2025
23ea62b
Merge pull request #5818 from solgenomics/topic/fix_slow_exp_details
lukasmueller Dec 18, 2025
fe4f045
Merge pull request #5810 from solgenomics/topic/repetitive-measuremen…
lukasmueller Dec 18, 2025
5574f79
Merge pull request #5806 from solgenomics/fix_download_gbs_action
lukasmueller Dec 18, 2025
4515bf8
Merge pull request #5728 from solgenomics/genotype-project-delete
lukasmueller Dec 18, 2025
f3bc7f7
Merge branch 'master' into topic/manual_update
lukasmueller Dec 18, 2025
3bf7077
update bookdown docs
invalid-email-address Dec 18, 2025
9d802a2
Merge pull request #5822 from solgenomics/topic/plant_to_accession
titima15 Dec 18, 2025
943ba1b
fix conflict
titima15 Dec 18, 2025
fe5c99e
display seedlot material type
titima15 Dec 18, 2025
ddb2d33
Fix missing bold character and make walkthrough text consistent
ryan-preble Dec 19, 2025
98cc69b
Merge pull request #5817 from solgenomics/topic/nirs_brapi_endpoints
lukasmueller Dec 19, 2025
c28e0b0
update bookdown docs
invalid-email-address Dec 19, 2025
0de8182
add defaults for tempfiles_base_motifs_finder and cluster_motifs_find…
lukasmueller Dec 19, 2025
18a1951
stock seedlot info
titima15 Dec 19, 2025
f1550f2
Extend sleep length before failing test
amberlockrow Dec 19, 2025
487ab9b
Extend sleep in trialscompare even more
amberlockrow Dec 19, 2025
dc4c4db
remove unused function
titima15 Jan 5, 2026
1d5f7dd
fix seedlot to list
titima15 Jan 5, 2026
8fb100a
clean up
titima15 Jan 5, 2026
397c129
add test
titima15 Jan 5, 2026
7eca6a4
BrAPI: Add study create date to additional info
dwaring87 Jan 6, 2026
8488e51
fix attribute
titima15 Jan 6, 2026
d114adf
Trial Fixture Test: add create date to results
dwaring87 Jan 6, 2026
f25ffb7
Trial Mech Test: add create date to results
dwaring87 Jan 6, 2026
85093cf
add pod
titima15 Jan 6, 2026
aefbf2b
Add upload and download transcriptomics data to high dim phenotypes c…
bm743 Jan 8, 2026
f894d1e
Merge pull request #5837 from solgenomics/topic/accession_seedlots
lukasmueller Jan 8, 2026
45167c2
Merge pull request #5826 from solgenomics/topic/manual_update
lukasmueller Jan 8, 2026
b675ecc
Merge pull request #5815 from solgenomics/topic/motif_finder_fixes
lukasmueller Jan 8, 2026
94a96f2
update bookdown docs
invalid-email-address Jan 8, 2026
e75e1a2
Add support for Synonym Search Tool auth client
dwaring87 Jan 8, 2026
2864871
Add options to include accession name, obs unit name, and plot id for…
bm743 Jan 8, 2026
a9daed1
Merge pull request #5841 from solgenomics/topic/transcriptomics_manual
bm743 Jan 9, 2026
52edf2e
Find Geno by Acc List: change to POST and allow specifying array of a…
dwaring87 Jan 12, 2026
7eeab4b
Find Geno by Acc List: add endpoint and component to search projects …
dwaring87 Jan 12, 2026
45346a1
Add plot number option to download
bm743 Jan 12, 2026
3cbff72
Geno Proj Lists: fix missing ID transformation
dwaring87 Jan 13, 2026
9af0993
optimize loading the field trial layout
ktmeaton Jan 15, 2026
e001e58
Add error check to wizard-datasets.js
ryan-preble Jan 16, 2026
9fba0d0
Tests: add tests for geno proto and proj filter by accessions
dwaring87 Jan 16, 2026
18d0eb2
Tests: remove debugging output
dwaring87 Jan 16, 2026
7bdd3d4
Tests: sort keys in arrays of expected responses
dwaring87 Jan 20, 2026
6ba2dfe
Make in-plot coords work in greenhouse trials
ryan-preble Jan 20, 2026
2df09a3
Use crossName if stock type is cross
bm743 Jan 22, 2026
5a5bfbd
Merge pull request #5842 from solgenomics/topic/oauth_synonym_search_…
lukasmueller Jan 22, 2026
c968c02
Merge pull request #5847 from solgenomics/topic/fix_geno_proj_lists
lukasmueller Jan 22, 2026
12e4f2b
Merge pull request #5833 from solgenomics/topic/brapi_study_create_date
lukasmueller Jan 22, 2026
5ac9b75
Merge branch 'master' into topic/gbsappui
lukasmueller Jan 22, 2026
f726b25
Find Geno by Acc List: fix protocol/project length calculation
dwaring87 Jan 22, 2026
3950234
Fix tests
ryan-preble Jan 22, 2026
6f5a047
fix response key in /user/logged_in function.
lukasmueller Jan 23, 2026
3baf862
shorten some sleep values.
lukasmueller Jan 23, 2026
6c69ea9
Merge pull request #5848 from solgenomics/topic/accession_genotype_se…
lukasmueller Jan 23, 2026
3eb8092
Change to cross/accession name in download options
bm743 Jan 26, 2026
3d7b351
Fix selenium test
ryan-preble Jan 26, 2026
7076d25
Merge pull request #5851 from solgenomics/topic/fix_duplicate_dataset
lukasmueller Jan 26, 2026
595db56
Chanage download option name based on trial stock type
bm743 Jan 26, 2026
7fad40f
Add scrollX attribute to experimental design datatables
ryan-preble Jan 28, 2026
1ecf58c
Merge pull request #5855 from solgenomics/topic/fix_save_plants_in_de…
lukasmueller Jan 29, 2026
098971f
Merge pull request #5850 from BFF-AFIRMS/topic/field-map-optimize
lukasmueller Jan 29, 2026
cfc57db
Merge pull request #5843 from solgenomics/topic/spatial_layout_download
lukasmueller Jan 29, 2026
c5ddc4a
Merge pull request #5824 from solgenomics/topic/gbsappui
lukasmueller Jan 29, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/docs/*
5 changes: 5 additions & 0 deletions .github/linters/.htmlhintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"head-script-disabled": false,
"alt-require": false,
"id-class-value": false
}
3 changes: 3 additions & 0 deletions .github/workflows/.htmlhintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"head-script-disabled": false
}
50 changes: 50 additions & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
name: Lint

on: # yamllint disable-line rule:truthy
push:
branches:
- 'master'
pull_request:
branches:
- 'master'

permissions: {}

env:
FILTER_REGEX_EXCLUDE: "docs/.*"

jobs:
build:
name: Lint
runs-on: ubuntu-latest

permissions:
contents: read
packages: read
# To report GitHub Actions status checks
statuses: write

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
# super-linter needs the full git history to get the
# list of files that changed across commits
fetch-depth: 0

- name: Super-linter
uses: super-linter/super-linter@v7.1.0 # x-release-please-version
env:
# To report GitHub Actions status checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HTMLHINT_CONFIG_FILE: .github/linters/.htmlhintrc
VALIDATE_ALL_CODEBASE: false
VALIDATE_ANSIBLE: false
VALIDATE_CHECKOV: false
VALIDATE_JSCPD: false
VALIDATE_LATEX: false
FIX_YAML_PRETTIER: true
VALIDATE_JAVASCRIPT_PRETTIER: false
VALIDATE_JAVASCRIPT_STANDARD: false
VALIDATE_SQLFLUFF: false
47 changes: 47 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes/marge targeting the default branch
push:
branches: ["master"]
paths:
- 'docs/**'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job since we're just deploying
deploy_static_pages:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload docs only
path: './docs'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4


2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

steps:
- name: Checkout sgn
uses: actions/checkout@v2
uses: actions/checkout@v5

- name: Run unit tests
run: prove --recurse t/unit 2>/dev/null
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/test_static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Simple workflow for deploying static content to GitHub Pages
name: Build documentation with R bookmark

on:
# Runs on pushes/marge targeting the default branch
pull_request:
paths:
- 'docs/r_markdown_docs/**'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: write
id-token: write

jobs:
# Single deploy job since we're just deploying
build_and_deploy_static_pages_for_manual:
runs-on: ubuntu-latest
container:
image: bienkowskid/fedora40-r-bookdown
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
- name: Save directory for checkout
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Create gitbook
working-directory: ./docs/r_markdown_docs
run: R -q -e 'bookdown::render_book("index.Rmd", "bookdown::gitbook")'
- name: Create manual pdf
working-directory: ./docs/r_markdown_docs
run: R -q -e 'bookdown::render_book("index.Rmd", "bookdown::pdf_book")'
- name: Commit and push documentation
run: |
date > generated.txt
git config user.name github-actions
git config user.email github-actions@github.com
git add --force --all docs/
git commit -m "update bookdown docs"
git push
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,7 @@ typescript
docs/Gemfile.lock
docs/_site/
.DS_Store
sgn.iml
sgn.iml
docs/*
!docs/r_markdown_docs
.idea/
116 changes: 116 additions & 0 deletions R/DRRC.r
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@

args=commandArgs(TRUE)

##args is now a list of character vectors
## First check to see if arguments are passed.
## Then cycle through each element of the list and evaluate the expressions.

if(length(args)==0){
print("No arguments supplied.")
##supply default values
paramfile=''
} else {
for(i in 1:length(args)){
print(paste("Processing arg ", args[[i]]));
eval(parse(text=args[[i]]))
}
}

library(reshape2)
library(dplyr)
library(blocksdesign)

source(paramfile)
## 1) Preparing dataframe
all.clones <- treatments
nTrt <- length(all.clones)
nRep <- nRep
nRows <- nRow
nCols <- nCol
# nCols <- nTrt*nRep/nRows
rowsPerBlock <- nTrt/nCols
colsPerBlock <- nTrt/nRows
superCols <- nCols/colsPerBlock
totalPlots <- nTrt*nRep

plot_type <- plot_type
plot_start <- plot_start

blocks = data.frame(block_number = gl(nRep,nTrt),
Cols = gl(superCols,colsPerBlock,totalPlots),
row_number = gl(nRows,nCols,totalPlots),
col_number = gl(nCols,1,totalPlots))

## Setting rep number orthogonal to block number
rep_number = as.numeric(blocks$Cols)


# treatments = data.frame(treatments =gl(nTrt,1,totalPlots))
Z=design(all.clones,blocks, searches = 50, weighting=0.5)
fieldBook <- Z$Design

trialMatrix <- matrix(0,nRows,nCols)

for(i in 1:nrow(fieldBook)){
trialMatrix[fieldBook$subRows[i],fieldBook$subCols[i]]<-fieldBook$treatments[i]
}
trialMatrix

## Adding plot number
colnames(fieldBook)[5] <- "plot_number"

fieldBook$block_number <- as.integer(fieldBook$block_number)
fieldBook$row_number <- as.integer(fieldBook$row_number)
fieldBook$col_number <- as.integer(fieldBook$col_number)

# Load dplyr
library(dplyr)

# Arrange fieldBook by row_number and col_number
fieldBook <- fieldBook %>% arrange(row_number, col_number)
fieldBook$plot_number <- c(1:totalPlots)
fieldBook$plot_id <- c(1:nTrt)



## Number start
## 00101 will be added for NCSU
if(plot_start == "00101"){
fieldBook$plot_number = paste0(formatC(fieldBook$block_number,width=3,flag="0"),
formatC(fieldBook$plot_id,width=2,flag="0"))
}else if (plot_start == 1001){
fieldBook$plot_number <- (1000*fieldBook$block_number)+fieldBook$plot_id
}else if (plot_start == 101) {
fieldBook$plot_number <- (100*fieldBook$block_number)+fieldBook$plot_id
}

cat("plot start is ", plot_start,"\n")
cat("plot type is ", plot_type,"\n")

plot_type = "serpentine"
## Plot number format
if(plot_type == "serpentine"){
for(i in 1:nRows){
if(i%%2==0){
fieldBook[fieldBook$row_number == i, "plot_number"] <- rev(fieldBook[fieldBook$row_number==i,"plot_number"])
}
}
}

fieldBook$rep_number <- rep_number


#### create is_a_control
names(fieldBook)[names(fieldBook) == "treatments"] <- "accession_name"
fieldBook <- transform(fieldBook, is_a_control = ifelse(fieldBook$accession_name %in% controls, 1, 0))

design <- fieldBook %>% dplyr::select(block_number, rep_number, row_number, col_number, plot_number, accession_name, is_a_control)

head(design)

# save result files
basefile <- tools::file_path_sans_ext(paramfile)
outfile = paste(basefile, ".design", sep="");
sink(outfile)
write.table(design, quote=F, sep='\t', row.names=FALSE)
sink();
Loading