Skip to content

Commit ead74d8

Browse files
bbimberbbimber
authored
Merge pull request #151 from LabKey/fb_merge_22.11_to_develop
Merge discvr-22.11 to develop
2 parents baede8c + 0bcc3c3 commit ead74d8

File tree

50 files changed

+5675
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5675
-311
lines changed

‎LabPurchasing/build.gradle‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import org.labkey.gradle.util.BuildUtils;
2+
3+
dependencies {
4+
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
5+
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "apiJarFile")
6+
7+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "published", depExtension: "module")
8+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "published", depExtension: "module")
9+
}

‎LabPurchasing/resources/data/purchasingUnits.tsv‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Unit
2+
Each
3+
Pack
4+
Case
5+
Kit
6+
Liter
7+
Milliliter
8+
Microliter
9+
Gallon
10+
Microgram
11+
Milligram
12+
Gram
13+
Kilogram

‎LabPurchasing/resources/data/referenceItems.tsv‎

Lines changed: 2580 additions & 0 deletions
Large diffs are not rendered by default.

‎LabPurchasing/resources/data/vendors.tsv‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
vendorName phone fax email address city state zip country url vendorId
2+
10X Genomics
3+
Aaper Alcohol Products 800-456-1017 800-456-1017 P.O. Box 339 Shelbyville KY 40066 USA
4+
Abaxis
5+
AbCam USA
6+
AbD Serotec USA
7+
AddGene USA www.addgene.org
8+
Advanced Cell Diagnostics
9+
Affymetrix 888-362-2447 800-499-7309 customerservice@affymetrix.com UW contract number 27465
10+
Agilent Technologies USA www.genomics.agilent.com
11+
AIDS Reagent Program WA USA www.aidsreagent.org
12+
AliMed USA www.alimed.com
13+
Amazon.com USA www.Amazon.com
14+
anatech LTD http://www.mcssl.com/store/anatechltd/formaldehyde-free-prefer
15+
Animal Health Express
16+
APIChem
17+
Applied Biosystems 800-327-3002 650-638-5884 850 Lincoln Centre Drive Foster City CA 94404
18+
ATCC 800-638-6597 703-365-2700 10801 University Blvd Manassas VA 20110
19+
BD Biosciences USA http://www.bdbiosciences.com/home.jsp
20+
Beaver Visitec
21+
Beckman Coulter 1-800-635-3497 305-380-5317 11800 South West 147 Ave. Miami FL 33196
22+
Becton Dickinson
23+
Bertin
24+
BioIVT
25+
BIOLEGEND INCORPORATED USA
26+
BIOO Scientific
27+
Biorad
28+
Biosource International(Invitrogen) 800-242-0607 805-987-3385 542 Flynn Rd Camarillo CA 93012
29+
Biosynthesis USA
30+
Biotek Instruments, Inc. USA www.biotek.com
31+
Biotium
32+
Bio-World
33+
Brady Labels Inc 888-250-3082 USA www.bradyid.com
34+
Braun
35+
Buffalo Technology USA www.buffalotech.com
36+
Captisol
37+
ChemieTek
38+
CodonCode 781-686-1131 781-407-0807 sales@codoncode.com 58 Beech Street Dedham MA 2026
39+
Cole Parmer
40+
Corning
41+
Covetrus
42+
Creative Biolabs
43+
Creative Diagnostics
44+
Custom Biogenics Systems
45+
Dako 1 805 566 6655 1 805 566 6688 USA www.dako.com/
46+
Denver Instruments USA www.denverinstrumentusa.com
47+
DigiCare Animal Health
48+
eBioscience USA
49+
Electron Microscopy Sciences USA
50+
EMD Chemicals USA
51+
EMD Millipore
52+
Epicentre 258-3080 258-3088 customerservice@epicentre.com 726 Post Road Madison WI 53713 www.epibio.com/main.asp
53+
Eppendorf 800-766-7000 800-926-1166 1600 W. Glenlake Ave Itasca IL 60143 www.eppendorfna.com/int/?l=131
54+
Equitech Bio
55+
eSutures.com
56+
Finnzymes 1-800-993-1283 1-617-245-1962 info@finnzymes.com 800 West Cummings Park, Suite 5550 Woburn MA 1801
57+
Fisher Scientific 800-766-7000 800-926-1166 1600 W. Glenlake Ave Itasca IL 60143 www.fishersci.com
58+
FlowJo, LLC 800-366-6045 541-482-3153 office@treestar.com 340 A Street Bd. 1 #203 Ashland OR 97520
59+
FOTODYNE Incorporated 800-362-3686 800-362-4642-Orders- info@fotodyne.com 950 Walnut Ridge Drive Hartland WI 53029
60+
Foxx Life Sciences
61+
GE Healthcare 800-526-3593 877-295-8102 800 Centennial Ave. Piscataway NJ 8854
62+
GeminiBio
63+
GeneTex
64+
GENSCRIPT USA INCORPORATED 120 CENTENNIAL AVENUE, SUITE 105 NJ 8854 USA
65+
Haemonetics
66+
HealthyKin.com
67+
HIV reagent program https://www.hivreagentprogram.org/Home.aspx
68+
HyClone 800-492-5663 435-792-0297 info@hyclone.com 95 West 1800 South Logan UT 84321
69+
ICU Medical
70+
IHC World USA
71+
Illumina
72+
Immune Technology
73+
Infectious Disease Research Institute
74+
Innova Biosciences
75+
innovative research https://www.innov-research.com/product/single-donor-human-whole-blood/
76+
Integrated DNA Technologies
77+
Invitrogen 800-828-6686 800-331-2286 PO Box 68 Grand Island NY 14072 USA
78+
InvivoGen 858 457 5873
79+
Irvine Scientific
80+
ISC BioExpress 800-999-2901 info@bioexpress.com 420 N. Kays Drive Kaysville UT 84037 www.bioexpress.com
81+
Jackson ImmunoResearch
82+
Japan BioProducts
83+
JPT
84+
JT Baker USA
85+
Labnet International, Inc. USA http://www.labnetinternational.com
86+
Labrepco
87+
LabScientific (978) 907-4243 (978) 739-5640 Lab Scientific bioKEMIX, 10 Electronics Avenue Danvers MA 1923 USA
88+
Lampire
89+
Leinco Technologies
90+
Life Technologies USA
91+
Lomir
92+
Lonza Walkersville Incorporated USA www.lonzabio.com
93+
LSBio
94+
Lucigen 888 575 9695
95+
Mabtech USA
96+
Macherey-Nagel
97+
Main Campus Research Stores USA
98+
MediaTech, Inc. USA
99+
Medline
100+
midsci
101+
Millipore 800-MILLIPORE 781-533-3110 80 Ashby Road Bedford MA 1730
102+
Miltenyi Biotec Inc 1-800-367-6227 530-888-8925 251 Auburn Ravine Rd., Suite 208 Auburn CA 95603
103+
Miltex USA
104+
Mirus Bio
105+
Moni-Comp Tech 3 USA
106+
MoreDirect USA
107+
Mountainside Medical Equipment (888) 687-4334
108+
Mybiosource.com
109+
National Diagnostics USA https://www.nationaldiagnostics.com/
110+
New England Biolabs 800-632-5227 978-921-1350 orders@neb.com 32 Tozer Road Berkely MA 1915 USA
111+
NHP Reagent Resource
112+
NIH AIDS Resource Program
113+
Nonhuman Primate Reagent Resource
114+
Northern Safety
115+
NovaTech International USA
116+
Novus Biologicals
117+
NuAire
118+
Open Biosystem USA
119+
Operon Biotechnologies, Inc. 800-688-2248 510-865-8644 dna@operon.com 2211 Seminole Drive Huntsville AL 35805 USA
120+
Owens and Minor
121+
Oz Biosciences USA www.ozbiosciences.com
122+
Patterson Veterinary
123+
PeproTech
124+
Perkin-Elmer USA
125+
Phoenix Freezer Boxex USA
126+
PNABio
127+
Promega 800-356-9526 800-356-1970 2800 Woods Hollow Road Madison WI 53711 www.promega.com
128+
Prozyme
129+
PSL Equipment Inc.
130+
Qiagen 800-426-8157 800-718-2056 28159 Avenue Stanford Valencia CA 91355
131+
R&D Systems, Inc. 1-800-343-7475 614 McKinley Place NE MN 55413 USA
132+
Rackyard.com
133+
Rainin 800-472-4646 781-932-1152 5400 Hollis St Emeryville CA 94608
134+
Roche 800-262-1640 9115 Hague Rd Indianapolis IN 46259 USA
135+
Rockland
136+
Roquette
137+
Santa Cruz Biotechnology, Inc. USA
138+
Sanyo Biomedical 1-800-858-8442 USA http://us.sanyo.com/biomedical
139+
Sarstedt 800-257-5101 704-465-4003 P. O. Box 468 Newton NC 28658
140+
SBI
141+
Scientific Notebook Company 616-429-8285 616-429-2105 P.O. Box 208 Stevensville MI 49127 www.snco.com
142+
Scy Tek USA
143+
Sears USA www.sears.com
144+
Selleck chemicals
145+
Sigma-Aldrich 800-325-3010 800-325-5052 P.O.Box 14508 St. Louis MO 63178 www.sigma-aldrich.com
146+
Smartsheet
147+
Sorvall/Kendro Lab Products(Thermo Electron) 800-522-7746 203-270-2166 31 Pecks Lane Newtown CT 6470 www.sorvall.com
148+
SouthernBiotech
149+
Spex SamplePrep
150+
Spherotech USA
151+
St John Laboratory
152+
Staples.com USA https://www.eway.com/ce/eway/enter?ps=N
153+
StemCell Technologies 1-800-667-0322 1-800-567-2899 777 West Broadway, Suite 808 Vancouver Br Canada www.stemcell.com
154+
Stratagene 800-424-5444 619-535-0045 11011 N. Torrey Pines Rd La Jolla CA 92037
155+
Takara
156+
Terumo
157+
The Gel Company USA
158+
Thomas Scientific
159+
Trevigen 301-216-2800 USA www.trevigen.com/
160+
US Biological
161+
USA Scientific USA
162+
UW Madiosn USA
163+
Vector Laboratories, Inc 650-697-3600 650-697-0339 30 Ingold Road Burlingame CA 94010
164+
Viaflo 063-577-5529 603-578-5800 2 Wentworth Drive Hudson NH 3051 www.viaflo.com
165+
ViraQuest, Inc. 319-665-4190 319-665-4191 richard-anderson@viraquest.com 310 West Zeller. PO box 525 North Liberty IA 52317 www.viraquest.com
166+
Virogen
167+
VWR USA
168+
West Campus Store USA
169+
Wilson Wolf http://www.wilsonwolf.com/product-and-order-info/
170+
World Courier 1800-221-6600 USA http://www.worldcourier.com/
171+
Worthington Biochemical USA https://www.worthingtonweb.com/
172+
Yecuris
173+
ZeptoMetrix Corporation 800-274-5487 872 Main Street Buffalo NY 14202
174+
Zoetis
175+
Zoro.com
176+
Zymo Research

‎LabPurchasing/resources/queries/labpurchasing/duplicateReferenceItems.query.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="" tableDbType="TABLE">
5+
<tableTitle>Duplicate Reference Items</tableTitle>
6+
<pkColumnName>rowId</pkColumnName>
7+
<columns>
8+
<column columnName="rowId">
9+
<isKeyField>true</isKeyField>
10+
</column>
11+
<column columnName="alternateRowIds">
12+
<columnTitle>Other Row Id(s)</columnTitle>
13+
</column>
14+
<column columnName="alternateName">
15+
<columnTitle>Other Item Name(s)</columnTitle>
16+
</column>
17+
<column columnName="alternateUnits">
18+
<columnTitle>Other Units(s)</columnTitle>
19+
</column>
20+
<column columnName="alternateUnitCost">
21+
<columnTitle>Other Unit Cost(s)</columnTitle>
22+
</column>
23+
</columns>
24+
<buttonBarOptions alwaysShowRecordSelectors="true" includeStandardButtons="true">
25+
<includeScript>laboratory.context</includeScript>
26+
<includeScript>labpurchasing/GridButtons.js</includeScript>
27+
<item permission="DELETE" text="Delete" requiresSelection="true" iconCls="trash" insertPosition="end">
28+
<onClick>LabPurchasing.buttons.deleteDuplicateReferenceItems(dataRegionName)</onClick>
29+
</item>
30+
<item text="Print" hidden="true">
31+
<originalText>Print</originalText>
32+
</item>
33+
<item text="Charts" hidden="true">
34+
<originalText>Charts</originalText>
35+
</item>
36+
</buttonBarOptions>
37+
</table>
38+
</tables>
39+
</metadata>
40+
</query>

‎LabPurchasing/resources/queries/labpurchasing/duplicateReferenceItems.sql‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
SELECT
2+
r1.rowId,
3+
r1.vendorId,
4+
r1.itemNumber,
5+
6+
r1.itemName,
7+
r1.units,
8+
r1.unitCost,
9+
10+
GROUP_CONCAT(DISTINCT r2.rowId, ',') as alternateRowId,
11+
GROUP_CONCAT(CASE WHEN r1.itemName = r2.itemName THEN null ELSE r2.itemName END, ',') as alternateName,
12+
GROUP_CONCAT(CASE WHEN r1.units = r2.units THEN null ELSE r2.units END, ',') as alternateUnits,
13+
GROUP_CONCAT(CASE WHEN r1.unitCost = r2.unitCost THEN null ELSE r2.unitCost END, ',') as alternateUnitCost
14+
15+
FROM labpurchasing.referenceItems r1
16+
JOIN labpurchasing.referenceItems r2 ON (
17+
r1.itemNumber = r2.itemNumber and
18+
r1.vendorId = r2.vendorId
19+
)
20+
WHERE (
21+
r1.itemName != r2.itemName OR
22+
r1.units != r2.units OR
23+
r1.unitCost != r2.unitCost
24+
) AND r1.itemNumber NOT IN ('NA', '1')
25+
26+
GROUP BY r1.rowId, r1.vendorId, r1.itemNumber, r1.itemName, r1.units, r1.unitCost

‎LabPurchasing/resources/queries/labpurchasing/duplicateReferenceItems/.qview.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<sorts>
3+
<sort column="vendorId/vendorName"/>
4+
<sort column="ItemNumber"/>
5+
</sorts>
6+
</customView>

‎LabPurchasing/resources/queries/labpurchasing/itemsNotInReference.query.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="" tableDbType="TABLE">
5+
<tableTitle>Purchases Not In Reference Items</tableTitle>
6+
<columns>
7+
<column columnName="rowId">
8+
<isKeyField>true</isKeyField>
9+
</column>
10+
11+
</columns>
12+
<buttonBarOptions alwaysShowRecordSelectors="true" includeStandardButtons="true">
13+
<includeScript>laboratory.context</includeScript>
14+
<includeScript>labpurchasing/GridButtons.js</includeScript>
15+
<item permission="DELETE" text="Add To Reference Items" requiresSelection="true" iconCls="plus" insertPosition="beginning">
16+
<onClick>LabPurchasing.buttons.addToReferenceItems(dataRegionName)</onClick>
17+
</item>
18+
<item permission="INSERT" text="Exclude From Reference Items" requiresSelection="true" iconCls="trash" insertAfter="Add To Reference Items">
19+
<onClick>LabPurchasing.buttons.excludeFromReferenceItems(dataRegionName)</onClick>
20+
</item>
21+
<item text="Print" hidden="true">
22+
<originalText>Print</originalText>
23+
</item>
24+
<item text="Charts" hidden="true">
25+
<originalText>Charts</originalText>
26+
</item>
27+
</buttonBarOptions>
28+
</table>
29+
</tables>
30+
</metadata>
31+
</query>

‎LabPurchasing/resources/queries/labpurchasing/itemsNotInReference.sql‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
SELECT
2+
p.rowId,
3+
p.vendorId,
4+
p.itemName,
5+
p.itemNumber,
6+
p.units,
7+
p.unitCost,
8+
p.orderDate
9+
10+
FROM labpurchasing.purchases p
11+
LEFT JOIN labpurchasing.referenceItems r ON (p.itemNumber = r.itemNumber and p.vendorId = r.vendorId)
12+
WHERE r.rowId IS NULL AND (p.excludeFromRefItems IS NULL OR p.excludeFromRefItems = false)

‎LabPurchasing/resources/queries/labpurchasing/itemsNotInReference/.qview.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<sorts>
3+
<sort column="vendorId/vendorName"/>
4+
<sort column="itemNumber"/>
5+
<sort column="itemName"/>
6+
</sorts>
7+
</customView>

0 commit comments

Comments
 (0)