Skip to content

Merge from wnprc18.3 svn r.64261 to r.65647 #38

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.

Sign up for GitHub

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

Merged
labkey-jeckels merged 12 commits into from
Sep 1, 2020
Merged

Merge from wnprc18.3 svn r.64261 to r.65647 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
61d71ae
Merge from wnprc18.3 svn r.64261-64312
labkey-bpatel Jul 6, 2020
2341f8e
Merge from wnprc18.3 svn r.64313-64598
labkey-bpatel Jul 6, 2020
46cb48c
Fix merge.
labkey-bpatel Jul 7, 2020
c0c1b99
Remove duplicate code.
labkey-bpatel Jul 7, 2020
44d4613
Various test fixes, including:
labkey-jeckels Aug 16, 2020
f887fc4
Use ExtJS4 instead of 3
labkey-jeckels Aug 16, 2020
2a04bd6
Cascade user delete though ehr_billing.dataaccess
labkey-jeckels Aug 16, 2020
ec53ef1
Remove other parts of the merge
labkey-jeckels Aug 16, 2020
5f152b9
Flip meaning of argument at controls de-duplication of IDs
labkey-jeckels Aug 18, 2020
cf425d2
Update AssayTemplatePanel.js
bbimber Aug 18, 2020
ecdb1dc
Fix ViralLoadAssayTest - restore WNPRC test code, updated to new DOM …
labkey-jeckels Aug 28, 2020
5d76ae4
Merge remote-tracking branch 'origin/20.6_fb_merge_from_wnprc18.3' in…
labkey-jeckels Aug 28, 2020
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
12 changes: 11 additions & 1 deletion LDK/resources/web/LDK/StoreUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ LDK.StoreUtils = new function(){
* @param config.fileName
* @param config.labelProperty
* @param config.skippedColumns
* @param config.includeDescription
*/
createExcelTemplate: function(config){
Ext4.applyIf(config, {
Expand All @@ -72,7 +73,16 @@ LDK.StoreUtils = new function(){
if (config.skippedColumns && Ext4.Array.contains(config.skippedColumns, field.name))
return;

header.push(field[config.labelProperty]);
//Sending label property and comment in case of including description
if (config.includeDescription){
header.push({
value: field[config.labelProperty],
cellComment: field['description']
});
}
else{
header.push(field[config.labelProperty]);
}
}
}, this);

Expand Down
6 changes: 4 additions & 2 deletions LDK/resources/web/LDK/Utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ LDK.Utils = new function(){
window.location = LABKEY.ActionURL.buildURL('ldk', 'updateQuery', null, params);
},

splitIds: function(subjectArray, unsorted){
splitIds: function(subjectArray, unsorted, preserveDuplicates){
if (!subjectArray){
return [];
}
Expand All @@ -556,7 +556,9 @@ LDK.Utils = new function(){
}

if (subjectArray.length > 0) {
subjectArray = Ext4.unique(subjectArray);
if (!preserveDuplicates) {
subjectArray = Ext4.unique(subjectArray);
}
if (!unsorted) {
subjectArray.sort();
}
Expand Down
43 changes: 29 additions & 14 deletions LDK/resources/web/LDK/panel/TabbedReportPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
}, this);
}
}

return subjects;
},

Expand Down Expand Up @@ -764,19 +764,34 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
scope: this
};

//special case these two properties because they are common
if (tab.report.viewName){
queryConfig.viewName = tab.report.viewName;
}

if (tab.report.containerPath){
queryConfig.containerPath = tab.report.containerPath;
}

//allow any other supported properties to be applied through here
if (tab.report.queryConfig){
Ext4.apply(queryConfig, tab.report.queryConfig);
}
//
// Define a list of configuration options. These can be set on the report tab to override default values.
// This list can be obtained by going to the URL for the
// LABKEY.QueryWebPart API, and looking in the config summary table. If you'd like to get it programatically, // https://www.labkey.org/download/clientapi_docs/javascript-api/symbols/LABKEY.QueryWebPart.html#constructor
// run the function commented out to the right of this message (you'll need to load jQuery first). It will //
// output an array of configuration options. //getConfigOptions = function() {
// // var summaryTable = jQuery('table.summaryTable')
var configOptions = [ // // Filter for the table with the config object
"aggregates", "allowChooseQuery", "allowChooseView", "bodyClass", // .filter(function(index,element){ return jQuery(element).attr("summary").match(/config object/); });
"buttonBar", "buttonBarPosition", "containerFilter", "containerPath", //
"dataRegionName", "deleteURL", "detailsURL", "errorType", // var options = [];
"failure", "filters", "frame", "importURL", //
"insertURL", "linkTarget", "maskEl", "maxRows", // var configRegex = /^config\./;
"metadata", "offset", "parameters", "queryName", // summaryTable.find('td.nameDescription a').each(function(index,element){
"removeableFilters", "removeableSort", "renderTo", "reportId", // var configOption = jQuery(element).text();
"schemaName", "scope", "shadeAlternatingRows", "showBorders", //
"showDeleteButton", "showDetailsColumn", "showExportButtons", "showInsertNewButton", //
"showPagination", "showRecordSelectors", "showReports", "showRows", // if (configOption.match(configRegex)) {
"showSurroundingBorder", "showUpdateColumn", "showViewPanel", "sort", // options.push(configOption.replace(configRegex, ''));
"sql", "success", "suppressRenderErrors", "timeout", // }
"title", "titleHref", "updateURL", "viewName" // });
]; //

Ext4.each(configOptions, function(option, index, list) {
if (option in tab.report) {
queryConfig[option] = tab.report[option];
}
});

tab.add({
xtype: 'ldk-querycmp',
Expand Down
6 changes: 6 additions & 0 deletions LDK/resources/web/LDK/ux/DateTimeField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@ Ext4.define('Ext.ux.form.field.DateTime', {
}, me.timeConfig));
me.items.push(me.timeField);

// Allow times in the style of "1423" to be accepted by the time field, instead of requiring colons
// for 24 hour fields.
var formats = me.timeField.altFormats.split("|");
formats.push("Hi");
me.timeField.altFormats = formats.join("|");

for (; i < me.items.length; i++) {
if(me.items[i].xtype == 'splitter')
continue;
Expand Down
5 changes: 4 additions & 1 deletion LDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
import org.jetbrains.annotations.Nullable;
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.components.domain.DomainFormPanel;
import org.labkey.test.pages.ReactAssayDesignerPage;
import org.labkey.test.params.FieldDefinition;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
import org.labkey.test.util.UIAssayHelper;
Expand All @@ -30,6 +33,7 @@
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
import java.util.Random;

import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -190,7 +194,6 @@ public void addRecordsToAssayTemplate(String[][] data, List<String> expectedColu
}

_test.waitForText("Sample Information");
_test._ext4Helper.waitForMaskToDisappear();
_test.waitAndClick(Ext4Helper.Locators.ext4Button("Add From Spreadsheet"));
_test.waitForElement(Ext4Helper.Locators.window("Spreadsheet Import"));

Expand Down
2 changes: 1 addition & 1 deletion laboratory/resources/web/laboratory/panel/AbstractAssayPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ Ext4.define('Laboratory.panel.AbstractAssayPanel', {
importMethodToggle: importMethod
});

imf.fireEvent('change', this, imf.getValues, current);
imf.fireEvent('change', this, imf.getValue(), current);
}

var target = this.down('#templatePreviewPanel');
Expand Down
20 changes: 15 additions & 5 deletions laboratory/resources/web/laboratory/panel/AssayTemplatePanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ Ext4.define('Laboratory.panel.AssayTemplatePanel', {
}, this);
},

appendDownloadMenuItems: function(){
appendDownloadMenuItems: function() {
var btn = this.down('#downloadBtn');
if(!this.templateMetadata.hideDownloadBtn)
btn.setVisible(true);
},

validateForm: function(){
validateForm: function() {
var title = this.down('#templateTitle').getValue();
if (!title){
Ext4.Msg.alert('Error', 'Must choose a name for this run');
Expand Down Expand Up @@ -267,8 +267,18 @@ Ext4.define('Laboratory.panel.AssayTemplatePanel', {
scope: this,
failure: LDK.Utils.getErrorCallback(),
success: function(results){
if (results.rows.length)
this.setTemplate(results.rows[0], true);
if (results.rows.length) {
var row = results.rows[0];
if (row.importMethod) {
this.selectedMethod = this.getImportMethodByName(row.importMethod);
var field = this.down('#templateImportMethod');
if (field) {
field.setValue(this.selectedMethod.name);
}
this.toggleImportMethod();
}
this.setTemplate(row, true);
}
}
})
},
Expand Down Expand Up @@ -456,4 +466,4 @@ Ext4.define('Laboratory.panel.AssayTemplatePanel', {
resultFields.setVisible(false);
}
},
});
});
7 changes: 4 additions & 3 deletions laboratory/resources/web/laboratory/panel/WellLayoutPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,14 @@ Ext4.define('Laboratory.ext.WellLayoutPanel', {
},

drawWell: function(){
if (!this.store.getCount()){
var platePanel = this.down('#plate');
var legendPanel = this.down('#legend');

if (!this.store.getCount() || !platePanel || !legendPanel){
this.store.on('load', this.drawWell, this, {single: true});
return;
}

var platePanel = this.down('#plate');
var legendPanel = this.down('#legend');
var notAssigned = 0;
var unknownWells = [];

Expand Down