Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
636 commits
Select commit Hold shift + click to select a range
1e02afd
Merge pull request #96 from WNPRC-EHR-Services/develop
gottfred Sep 26, 2019
bd07388
fixed issue where none could be selected in tandem with another reason
gottfred Sep 27, 2019
223921e
removed debugging code
gottfred Sep 27, 2019
7c341c1
Add wnprc_r24 module
Oct 4, 2019
5151ec4
Reset module version (from 15.19 back to 18.31). Automated test fix.
labkey-bpatel Oct 9, 2019
3cf77b0
Support Ticket 38497: Invoice A/R report - Payment Received on auto g…
labkey-bpatel Oct 9, 2019
b1bec70
Moved sortStore() from ehr's utils.js.
labkey-bpatel Oct 9, 2019
7d8733e
Add missing paren.
labkey-bpatel Oct 9, 2019
3736741
Update automated test for viewChargesAdjustmentsNotYetBilled -- remov…
labkey-bpatel Oct 10, 2019
4585947
Remove unneeded pregnancy view
csebranek Oct 10, 2019
285f157
Add necessary tables and columns to make schemaXMLTestCase happy
csebranek Oct 11, 2019
e73d141
Rename directories to table title instead of label, so that the qview…
csebranek Oct 17, 2019
43e7df4
Adding link to User initials.
dnicolalde Oct 18, 2019
d194376
Merge branch 'develop' of https://github.com/WNPRC-EHR-Services/wnprc…
dnicolalde Oct 18, 2019
addfa71
Bump lodash from 4.17.10 to 4.17.13
dependabot[bot] Oct 18, 2019
b1bcd17
Bump lodash from 4.17.11 to 4.17.15 in /AnimalRequests
dependabot[bot] Oct 18, 2019
bf45c5d
Bump mixin-deep from 1.3.1 to 1.3.2 in /AnimalRequests
dependabot[bot] Oct 18, 2019
a723719
Merge pull request #98 from WNPRC-EHR-Services/develop
dnicolalde Oct 18, 2019
c09d566
Merge pull request #99 from WNPRC-EHR-Services/dependabot/npm_and_yar…
csebranek Oct 18, 2019
66cb02e
Merge pull request #100 from WNPRC-EHR-Services/dependabot/npm_and_ya…
csebranek Oct 18, 2019
c11c22f
Merge pull request #101 from WNPRC-EHR-Services/dependabot/npm_and_ya…
csebranek Oct 18, 2019
49e1370
Bump underscore.string from 3.3.4 to 3.3.5
dependabot[bot] Oct 18, 2019
fec7867
Bump lodash-es from 4.17.11 to 4.17.15 in /AnimalRequests
dependabot[bot] Oct 18, 2019
06eb8dd
Merge pull request #102 from WNPRC-EHR-Services/dependabot/npm_and_ya…
csebranek Oct 18, 2019
874dc3a
Merge pull request #103 from WNPRC-EHR-Services/dependabot/npm_and_ya…
csebranek Oct 18, 2019
f5f0df2
removing animals that do not have primateId created.
dnicolalde Oct 18, 2019
9c9ae05
Ticket 38440: Dropdown menus cut off in taskDetails view
labkey-jeckels Oct 22, 2019
f43857e
Update displayWidth query metadata for some columns
csebranek Oct 22, 2019
1d725b4
Merge remote-tracking branch 'origin/develop' into develop
dnicolalde Oct 22, 2019
ee66397
Only show projects with r in animal assignments
csebranek Oct 22, 2019
0eb4665
Fixing MHC Haplotypes to only show concatenated version.
dnicolalde Oct 23, 2019
923330e
Merge remote-tracking branch 'origin/develop' into develop
dnicolalde Oct 23, 2019
8dab5a5
Remove displayWidth settings for several views and one pivot table view
csebranek Oct 24, 2019
bf46b0c
Removing empty primateIds and empty weights from the weight table.
dnicolalde Oct 24, 2019
e3e1cf2
Merge pull request #104 from WNPRC-EHR-Services/develop
dnicolalde Oct 24, 2019
faa3c29
Merge of master into wnprc18.3_master
csebranek Oct 24, 2019
a161aed
Add missing bootstrap dependencies for custom pages (necropsy, tb das…
csebranek Oct 24, 2019
ce6223d
removing objectid that are null in production for R24 grant.
dnicolalde Oct 25, 2019
800c903
Remove reference to non-existent Paging button.
labkey-jeckels Oct 25, 2019
b5d0b74
Adding another pathologist that will review necropsy records from the…
dnicolalde Oct 30, 2019
83ad99c
Revert "Add missing bootstrap dependencies for custom pages (necropsy…
gottfred Oct 31, 2019
e583e91
requiring behavior remarks in irregular obs, showing and hidding rema…
dnicolalde Nov 1, 2019
19ab90e
Adding all the ETL into one single file, only having one sub ETL
Nov 1, 2019
0e66f19
Email notification for new project request
dnicolalde Nov 5, 2019
56f3eda
18.3w fb misc billing fixes (#105)
labkey-bpatel Nov 5, 2019
b3758d8
updated breeding unit test
gottfred Nov 6, 2019
18f8c73
Change trigger to ran afterInsert so that we can use the row.key
dnicolalde Nov 6, 2019
c297fe2
fixed issue where date would show as Dec 31 1969 due to a null date
gottfred Nov 6, 2019
476a420
Merge pull request #106 from WNPRC-EHR-Services/develop
dnicolalde Nov 6, 2019
a4ff1d4
Adding VVC email to send when new ones come in.
dnicolalde Nov 7, 2019
4908f12
Merge remote-tracking branch 'origin/develop' into develop
dnicolalde Nov 7, 2019
9995639
Always showing other behavior text box independent on the behavior ch…
dnicolalde Nov 11, 2019
e5a39be
Add Observed SIB to required remark.
dnicolalde Nov 12, 2019
cf31b0c
Merge pull request #107 from WNPRC-EHR-Services/develop
dnicolalde Nov 13, 2019
cd19aaf
Revert animal portal change
csebranek Nov 20, 2019
ecf45c3
Fix more column width issues
csebranek Nov 22, 2019
eadaa7c
report added to help check that animal per diems are correct
gottfred Nov 22, 2019
06c9dae
Add project avail code n to animal billable days report
csebranek Nov 22, 2019
484284f
Patch for menu overlay LK issue 39076
csebranek Nov 25, 2019
55f75be
Merge pull request #109 from WNPRC-EHR-Services/develop
dnicolalde Nov 26, 2019
bf065af
Use LF instead of CRLF line endings
csebranek Nov 27, 2019
5eecdd0
Merge with master
csebranek Nov 27, 2019
92c413b
Merge remote-tracking branch 'remotes/origin/18.3w_fb_ticket38709Grid…
csebranek Dec 2, 2019
fd5c671
Test cleanup related to LK ticket 38659
csebranek Dec 2, 2019
766ffd0
Pause javascript error checker for clinical history panel test per ti…
csebranek Dec 2, 2019
b74d58c
Fixing tool tip for housing and assigments graph.
dnicolalde Dec 3, 2019
fe38c10
Fix for necropsy visual issues - ticket 6989
csebranek Dec 5, 2019
85ac609
fix for calendar date picker issue 6897
csebranek Dec 5, 2019
3c5cc1c
Refactor 'Mark Reviewed' button under More Actions for study.clinpath…
labkey-bpatel Dec 6, 2019
d606dee
Revert local test code committed by mistake.
labkey-bpatel Dec 6, 2019
57642da
Refactor "Schedule Task" button under More Actions for study.clinpath…
labkey-bpatel Dec 7, 2019
471f9d6
Clean up
labkey-bpatel Dec 7, 2019
35c6c08
Use existing create task button for creating weight task in demograph…
csebranek Dec 9, 2019
c0fdadf
Configure Mark Reviewed via metadata for wnprc.vvc.
labkey-bpatel Dec 9, 2019
f4fa9dc
Add approve vvc request status button
csebranek Dec 10, 2019
5850ca5
Convert blood request qc more actions button, delete unused per ticke…
csebranek Dec 10, 2019
9ec5a52
Remove action to add qc status
csebranek Dec 10, 2019
e13565b
Add change qc status to clinpath - use ehr button
csebranek Dec 10, 2019
b23b380
Adding tasks panel to taskdetails views per LK ticket 39076
csebranek Dec 11, 2019
109a80e
Removing dependency on Docker to ran load database script.
dnicolalde Dec 11, 2019
000f9bb
Add loading msg to schedule task action
csebranek Dec 11, 2019
88bc1c9
initial commit of email notifications for behavior related irregular …
gottfred Dec 16, 2019
86bdf69
small formatting fixes
gottfred Dec 16, 2019
ff83902
string concatenation fix
gottfred Dec 16, 2019
25b921b
Fix for dropdown issue w tasks and requests tabs LK ticket 39183
csebranek Dec 19, 2019
6e5bdd9
Partial fix w svn r64864 for animal history reports pages LK ticket 3…
csebranek Dec 19, 2019
896ef9e
updated to query for correct date/time ranges and added a couple of h…
gottfred Dec 20, 2019
2003d26
fixed formatting
gottfred Dec 20, 2019
57d7e26
Merge pull request #112 from WNPRC-EHR-Services/develop
dnicolalde Dec 23, 2019
8b3848e
add another blood alert notification at 14:15 each day
gottfred Jan 23, 2020
d7f2723
Merge branch 'master' into wnprc18.3_master
csebranek Jan 23, 2020
2b7c299
Update tomcat dockerfile to grab java 12
csebranek Jan 23, 2020
2fc3d05
Set up the edit/update urls before setting up ext4 items LK ticket 39498
csebranek Jan 24, 2020
54f7f50
Merge branch 'wnprc18.3_master' of https://github.com/WNPRC-EHR-Servi…
csebranek Jan 24, 2020
a99c7a9
Revert housing and assignments graph tooltip position
csebranek Jan 24, 2020
deb6218
Enable & customize bulk edit, updates to Billing Module, and other bu…
labkey-bpatel Jan 25, 2020
d395e7c
Show birth date in active assignements, ticket 5563
csebranek Jan 29, 2020
116328e
Fix for date serialization issue on new user tb dashboard form issue …
csebranek Jan 31, 2020
1907987
Temporarily disabling no active assigns in email alerts per ticket 7267
csebranek Jan 31, 2020
9c16894
Merge pull request #117 from WNPRC-EHR-Services/develop
csebranek Feb 4, 2020
aa2c697
Update docker files to use 18.3 images
csebranek Feb 4, 2020
f5fcb91
Fix for active assignments query timing out for email alerts, IDS tic…
csebranek Feb 5, 2020
47077ac
Update perl scripts to use most recent version of LabKey Query perl p…
csebranek Feb 6, 2020
028b3d6
Update perlscripts dockerfile
csebranek Feb 6, 2020
56300a9
moved behavior remarks to the bottom to prevent confusion with regula…
gottfred Feb 6, 2020
485a57e
Revert "Update perl scripts to use most recent version of LabKey Quer…
csebranek Feb 7, 2020
1065354
remove isQuickValidation check from species determination function so…
gottfred Feb 7, 2020
7b8ce62
Merge branch 'wnprc18.3-SNAPSHOT' of https://github.com/WNPRC-EHR-Ser…
gottfred Feb 7, 2020
fc525a7
Change from LogFile Errors
dnicolalde Feb 7, 2020
e3c72ed
Merge pull request #120 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde Feb 7, 2020
3bd354f
fix for tb dashboard date off by 6 hours
csebranek Feb 11, 2020
bc52cae
Merge branch 'wnprc18.3-SNAPSHOT' of https://github.com/WNPRC-EHR-Ser…
csebranek Feb 11, 2020
ab04959
only underline required fields, do not fill entire background
csebranek Feb 11, 2020
788f4a7
Fix study container for adminAlert script
csebranek Feb 11, 2020
68621f7
Upgrade Labkey perl for CSRF support; suppress LWP warnings see ticke…
csebranek Feb 11, 2020
d24102c
Temporary fix for no active assignments query timeout lk ticket 39601
csebranek Feb 11, 2020
f0fa8fe
Update docker file for test server env
csebranek Feb 11, 2020
42b2bdf
More fixes for email alerts
csebranek Feb 12, 2020
7383059
Update demographics stock assignment project numbers, related to tick…
csebranek Feb 13, 2020
3ffb3f8
Do not use query web part fix LK ticket 38440, but use ldk-querycmp x…
csebranek Feb 14, 2020
7d39aa4
Remove min-height constraint for some animal history panels
csebranek Feb 14, 2020
1c1893a
Merge branch 'wnprc18.3-SNAPSHOT' of https://github.com/WNPRC-EHR-Ser…
dnicolalde Feb 14, 2020
1e8a747
Adding species to supplemental pedigree and including in pedigree query.
dnicolalde Feb 14, 2020
4b02fdb
ignore directory of files that are generated by typescript
gottfred Feb 17, 2020
6c5942e
updated scripts to default to turning off bcreports and kinship calcu…
gottfred Feb 17, 2020
a82a665
remove old labkey perl module
csebranek Feb 17, 2020
3557e16
Merge pull request #121 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
gottfred Feb 17, 2020
aab2eab
Including another rhesus patterns to complete species in demographic …
dnicolalde Feb 18, 2020
b3916ef
Merge branch 'wnprc18.3-SNAPSHOT' of https://github.com/WNPRC-EHR-Ser…
dnicolalde Feb 18, 2020
c67c564
Add pointer cursor for data points on weight graph, IDS ticket 7294
csebranek Feb 18, 2020
96953d9
disable ldap sync on test servers to avoid an issue with users being …
gottfred Feb 19, 2020
7e3cda4
Remove warning suppression since its handled in labkey perl 1.07 see …
csebranek Feb 20, 2020
fc7818d
Fix issue with duplicate task, hiding on null window broken
csebranek Feb 20, 2020
c971970
Remove warning supression from treatment alerts
csebranek Feb 21, 2020
b25ad22
Adding naming patterns for unknown species
dnicolalde Feb 21, 2020
d28ff58
Merge branch 'wnprc18.3-SNAPSHOT' of https://github.com/WNPRC-EHR-Ser…
dnicolalde Feb 21, 2020
d1afe08
added a port option in case database is running on a non-default port
gottfred Feb 24, 2020
4f77c36
fix for null pointer when reason for housing change isn't in the look…
gottfred Feb 25, 2020
9298879
fixed pregnancy dropdown when updating existing records so that it do…
gottfred Feb 25, 2020
db9d1f6
Merge pull request #122 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
gottfred Feb 26, 2020
9a353e5
properly close the result set
gottfred Feb 27, 2020
9b2b88b
Changes to naming for rhesus
dnicolalde Feb 27, 2020
7a360a0
Bump diff from 3.4.0 to 3.5.0
dependabot[bot] Mar 2, 2020
b71bdd8
Bump mixin-deep from 1.3.0 to 1.3.2
dependabot[bot] Mar 2, 2020
6cd4d6c
Bump bower from 1.8.2 to 1.8.8
dependabot[bot] Mar 2, 2020
5fcdaeb
Removing default time for blood draws request and removing some colum…
Mar 7, 2020
9cf144f
Merge branch 'wnprc18.3-SNAPSHOT' of https://github.com/WNPRC-EHR-Ser…
Mar 7, 2020
a43cb53
Limit hematology and chemistry page limits (add bloodChemistry to be …
csebranek Mar 10, 2020
97badda
Merge pull request #126 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
csebranek Mar 12, 2020
175a61a
added gestational day calculator and a link to it on main ehrBegin page
gottfred Mar 16, 2020
27bd4df
changed location of gestation calculator link to fit in better
gottfred Mar 16, 2020
1e8c7b8
Merge branch 'wnprc18.3-SNAPSHOT' of https://github.com/WNPRC-EHR-Ser…
gottfred Mar 16, 2020
ebc38d9
added a clear form button and did some minor cleanup
gottfred Mar 17, 2020
1ecf18f
Initial commit for viral load queue email notification
csebranek Mar 18, 2020
131ad9b
Start to get more params via java api
csebranek Mar 18, 2020
c01fbfa
Use java api instead of javascript api to look up submitter and animalid
csebranek Mar 19, 2020
f054bee
Do action after update so we can get qc state
csebranek Mar 19, 2020
04a20e9
Check qc status of complete before sending email, use try w resources…
csebranek Mar 20, 2020
b6b0181
Item 6974 : Updates to Data Entry forms (#127)
labkey-bpatel Mar 21, 2020
f81deb9
Parse out additional email column to send notification to
csebranek Mar 23, 2020
20905c1
Add link to zika portal w animal id as filter
csebranek Mar 24, 2020
8708eac
changed so that breeding encounters greater than 6 months old can be …
gottfred Mar 25, 2020
43237f3
Merge pull request #128 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde Mar 25, 2020
5dde4b2
Further customize email body and add modified by email
csebranek Mar 26, 2020
fd7ddf2
Bump knockout from 3.4.0 to 3.5.0
dependabot[bot] Apr 1, 2020
5a05d26
make breeding encounter no longer required, but show warning if not f…
gottfred Apr 8, 2020
e5d6302
Change qc status label and place signature in email
csebranek Apr 14, 2020
9d4cf5e
Merge branch '18.3w_fb_vlqNotification' into wnprc18.3-SNAPSHOT
csebranek Apr 17, 2020
8b597a4
Merge pull request #129 from WNPRC-EHR-Services/dependabot/npm_and_ya…
csebranek Apr 17, 2020
5509cc8
Merge pull request #123 from WNPRC-EHR-Services/dependabot/npm_and_ya…
csebranek Apr 17, 2020
3f3ac22
Merge pull request #124 from WNPRC-EHR-Services/dependabot/npm_and_ya…
csebranek Apr 17, 2020
fa02475
Merge pull request #125 from WNPRC-EHR-Services/dependabot/npm_and_ya…
csebranek Apr 17, 2020
892b792
Merge pull request #130 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde Apr 20, 2020
58964da
update to projectQueries view to support new financial module changes…
gottfred Apr 23, 2020
579cb45
Merge pull request #132 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde Apr 23, 2020
aaad4f8
remove links so that users don't start entering charges accidentally
gottfred Apr 23, 2020
4198797
Merge pull request #133 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
gottfred Apr 23, 2020
3c4afa5
Start to add new dataset button to bulk perform actions
csebranek Apr 24, 2020
f9b64fa
Add sample date to email link, add to notification admin panel
csebranek Apr 27, 2020
7d7837d
Added rowids to custom action, need to make notification class handle…
csebranek Apr 29, 2020
0b5ecb6
Bump jquery from 3.3.1 to 3.5.0
dependabot[bot] Apr 29, 2020
0593e38
allow for multi-line comments on billing invoice pdfs
gottfred Apr 30, 2020
f7cdc3a
added some comments for the previous commit
gottfred Apr 30, 2020
f7ef62b
Use trigger script for bulk complete and only send on complete
csebranek Apr 30, 2020
c85b66c
added indenting for readability
gottfred Apr 30, 2020
eaa469f
comment length check fix
gottfred Apr 30, 2020
d101609
Merge pull request #135 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde May 1, 2020
c88805b
Rename stuff
csebranek May 1, 2020
9b8ac95
add experiment number field, and required field if complete
csebranek May 4, 2020
b4f3c2b
created a new calculated column that coalesces the new investigatorId…
gottfred May 6, 2020
3198548
changes made to support adding the EHR_BillingAdminPermission to the …
gottfred May 8, 2020
402c99d
add institution/city/state/zip to pdf. fix to make payable line so it…
gottfred May 8, 2020
5e48cd8
Changing action to download .zip file with Download Summary Invoices
May 8, 2020
787df0a
added institution and billing_contact_info columns
gottfred May 10, 2020
a9d5cc9
support for multiple addresses in a bulk email, currently combines by…
csebranek May 11, 2020
3f5dedd
change invoice pdf to show billing contact email rather than contact …
gottfred May 12, 2020
c95eee5
Do not allow completion without experiment number; more refactoring
csebranek May 12, 2020
f1d4226
Merge with snapshot
csebranek May 13, 2020
11229f4
Cover edge case where submitter might put themselves in notify column
csebranek May 14, 2020
ac13aee
don't charge a per diem for an animal for any day it's on a project w…
gottfred May 15, 2020
0023b7b
added comments for previous commit
gottfred May 15, 2020
494436c
Merge pull request #134 from WNPRC-EHR-Services/dependabot/npm_and_ya…
dnicolalde May 15, 2020
f220d97
change ehr_billing to ehr_billing_public so that certain users can en…
gottfred May 15, 2020
0cdbb3d
Adding page to allow staff outside finance to enter data to misc char…
May 15, 2020
7f8d48e
Merge remote-tracking branch 'origin/wnprc18.3-SNAPSHOT' into wnprc18…
May 15, 2020
8c75204
Merge branch 'wnprc18.3-SNAPSHOT' into 18.3w_fb_vlqNotification
csebranek May 15, 2020
9956242
Updates to JET CSV query and DataEntry form
labkey-bpatel May 16, 2020
bdec426
Add automated test to verify non-genCredit account in JET CSV preview…
labkey-bpatel May 16, 2020
b2eaed7
Make testJETWithNonGenCreditAccount public
labkey-bpatel May 16, 2020
0208633
Refactor data upload - Insert billing records using InsertRowsCommand
labkey-bpatel May 16, 2020
2b0f69e
Automated test failures fix attempt.
labkey-bpatel May 17, 2020
83443d3
Fix issues during setup.
labkey-bpatel May 18, 2020
6824ce8
New test updates/fixes.
labkey-bpatel May 18, 2020
2142c03
Automated test fix - enter date first.
labkey-bpatel May 19, 2020
791d024
Automated test fix - Move date before debited account for bulk edit a…
labkey-bpatel May 19, 2020
c3102a0
Revert "change ehr_billing to ehr_billing_public so that certain user…
gottfred May 19, 2020
1141f2d
Adding link to Finance Data Entry for non finance staff.
May 19, 2020
06f8b4d
Merge remote-tracking branch 'origin/wnprc18.3-SNAPSHOT' into wnprc18…
May 19, 2020
b84b27e
Merge pull request #136 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde May 19, 2020
7b16938
Fix testBilling().
labkey-bpatel May 20, 2020
a8dcf7c
Automated test fix - move toggle date field for bulk edit.
labkey-bpatel May 20, 2020
aa8778a
Merge branch 'wnprc18.3-SNAPSHOT' into 18.3w_fb_vlqNotification
csebranek May 20, 2020
c419a9e
Merge branch 'wnprc18.3-SNAPSHOT' into 18.3w_fb_JET_DataEntry
labkey-bpatel May 20, 2020
ca522c8
Updating gradle to build 18.3
May 20, 2020
e782f5d
Merge remote-tracking branch 'origin/wnprc18.3-SNAPSHOT' into wnprc18…
May 20, 2020
7b5879f
Merge pull request #139 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde May 20, 2020
10decc6
Merge pull request #137 from WNPRC-EHR-Services/18.3w_fb_JET_DataEntry
dnicolalde May 21, 2020
c29045b
add pi name above institution/address on internal invoices. added new…
gottfred May 21, 2020
3c498b9
Merge branch 'wnprc18.3-SNAPSHOT' of https://github.com/WNPRC-EHR-Ser…
gottfred May 21, 2020
3d185b5
Merge pull request #140 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde May 27, 2020
ee93c85
Adding hermaphrodites to kinship calculations and pedigree plots
Jun 3, 2020
75d0659
Merge pull request #141 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde Jun 3, 2020
f7ad64c
added missing comma after remark so that the remark and volume column…
gottfred Jun 9, 2020
6a93745
Merge pull request #142 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT
dnicolalde Jun 12, 2020
800d090
Merge remote-tracking branch 'origin/19.2_fb_wnprc_r24' into release2…
Jun 19, 2020
32419e6
updating location of wnprc-modules
Jun 19, 2020
1cda666
Merge branch 'release20.6-SNAPSHOT' into wnprc20.6-SNAPSHOT
Jun 25, 2020
bd805c5
Merging 18.3 to 20.6 to build wnprc modules in latest version of LabKey
Jun 25, 2020
786d561
#40688 Changing name of mutable column based on input from Binal
Jun 25, 2020
34f0535
Add self registration module
csebranek Jun 26, 2020
e669505
#40688 Changes to 20.6 to build wnprc-modules
Jun 30, 2020
2312250
Updating intermidiate tomcat and postgres version.
Jun 30, 2020
a43427d
Remove 'SOPRequirements' metadata from ehr_compliancedb module, and a…
labkey-bpatel Jul 16, 2020
fd9a136
Remove 'SOPAdmin' view from ehr_compliancedb module, and add to wnprc…
labkey-bpatel Jul 16, 2020
a52193e
Update import statements.
labkey-bpatel Jul 23, 2020
fa6520a
PullRequest #16 fixes for merging wnprc20.6
Aug 4, 2020
8d854f7
PullRequest #16 additional fixes for merging wnprc20.6
Aug 4, 2020
d0b2fab
Merge branch 'wnprc20.6-SNAPSHOT' into 20.6_fb_wnprc183_192Merge
Aug 4, 2020
e6ad018
Revert update to import statements.
labkey-bpatel Aug 4, 2020
5d0da0c
Merge branch '20.6_fb_wnprc183_192Merge' of https://github.com/WNPRC-…
labkey-bpatel Aug 4, 2020
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
  •  
  •  
  •  
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,21 @@ docker/**/data
docker/**/logs
docker/**/.env
docker/.gradle
docker/dev_*/**
docker/nginx/test-ehr*
docker/nginx/cert.pem
docker/nginx/key.pem

**/node_modules/
**/build/

**/resources/credits/dependencies.txt

**/.gradle

**/app.css
**/app.css.map
**/app.js
**/app.js.map

WNPRC_EHR/resources/web/wnprc_ehr/gen/
10 changes: 10 additions & 0 deletions AnimalRequests/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"env": {
"test": {
"presets":["@babel/preset-react","@babel/preset-typescript"],
"plugins": [
"transform-es2015-modules-commonjs"
]
}
}
}
6 changes: 6 additions & 0 deletions AnimalRequests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
app.css
app.css.map
app.js
app.js.map
*.swp
36 changes: 36 additions & 0 deletions AnimalRequests/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Animal Requests

This is a single page app that uses [React Final Form](https://github.com/final-form/react-final-form) along with [TypeScript](https://github.com/Microsoft/TypeScript) and LabKey's [JavaScript API](https://www.labkey.org/_webdav/Documentation/%40files/reference/javascript-api/index.html). The form allows a user to submit a request for animals.

Below is an example of one of the dropdown select fields within the form, followed by a brief explanation of each of the [props](https://reactjs.org/docs/components-and-props.html).

```
<Field
name="project"
className="col-xs-5 form-control-input"
component="select"
validate={required}
>
<option/>
<option value="TBD">TBD</option>
<DropdownOptions name="animal_requests_active_projects" rowkey="project"/>
</Field>
```

`Field` is a component imported from react-final-form.

The `className` prop in the `Field` component is the class of field element, using bootstrap grid.

The `name` prop is the name of the column in the insert DB.

The `component` prop describes to react-final-form what type of `Field` it is.

The `validate` prop takes a function that takes the field value, all the values of the form and the meta data about the field and returns an error if the value is invalid, or undefined if the value is valid.

`DropdownOptions` is a component that produces a list of select options given `name` and `rowkey` props.

The `name` prop in the `DropdownOptions` component is the name of the variable that holds the data in the react state.

The `rowkey` prop is the key of the data row returned by LabKey server.

More information about how the entire form works can be found in the documentation linked above. Also, another nice resource provided by react-final-form is its extensive [interactive examples](https://github.com/final-form/react-final-form#examples).
11 changes: 11 additions & 0 deletions AnimalRequests/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apply plugin: 'java'
apply plugin: 'org.labkey.module'
compileJava {
options.compilerArgs << "-Xlint:unchecked"

}

dependencies {
// BuildUtils.addLabKeyDependency(project: project, config: "compile", depProjectPath: ":server:modules:wnprc-modules:WNPRC_EHR", depProjectConfig: "apiCompile")
compile project(":server:modules:wnprc-modules:WNPRC_EHR")
}
21 changes: 21 additions & 0 deletions AnimalRequests/jest-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = {
"roots": [
"<rootDir>/src"
],
"globals": {
"LABKEY": {}
},
"transform": {
"^.+\\.tsx?$": "ts-jest",
".+\\.(css|styl|less|sass|scss)$": "jest-transform-css"
},
"testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$",
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"jsx",
"json",
"node"
],
}
7 changes: 7 additions & 0 deletions AnimalRequests/module.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ModuleClass: org.labkey.animalrequests.AnimalRequestsModule
ModuleDependencies: WNPRC_EHR
Label: Enter Animal Requests into EHR
Description: Simple module that utilizes React and Typescript to enter animal requests into WNPRC EHR
URL: https://github.com/WNPRC-EHR-Services/wnprc-modules/AnimalRequests
License: Apache 2.0
LicenseURL: http://www.apache.org/licenses/LICENSE-2.0
Loading