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

Automatic Hit Selection #6123

Merged
merged 37 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
966aa36
Initial hit criteria
labkey-nicka Nov 26, 2024
849cfd3
GWTFilterCriteria
labkey-nicka Nov 27, 2024
55215d3
Lombok?
labkey-nicka Nov 27, 2024
35d2262
Bump scripts
labkey-nicka Nov 27, 2024
739fab9
Round-trip filter criteria
labkey-nicka Nov 27, 2024
c0a7b1b
HitCriterion -> FilterCriteria
labkey-nicka Nov 27, 2024
a8326f5
assay.HitCriteria -> assay.FilterCriteria
labkey-nicka Nov 27, 2024
8a9f28f
SQL Server
labkey-nicka Nov 28, 2024
aa918dc
FilterCriteriaColumnsAction
labkey-nicka Dec 3, 2024
2ae5912
Apply hit criteria
labkey-nicka Dec 4, 2024
c2d5b6f
Remove action
labkey-nicka Dec 4, 2024
b1107a6
Bump components
labkey-nicka Dec 6, 2024
131f39a
Bump components
labkey-nicka Dec 6, 2024
705dae4
Replicate stats: retain data upon colum rename
labkey-nicka Dec 6, 2024
ab5b274
Filter criteria: support creation upon domain creation
labkey-nicka Dec 11, 2024
362433e
More validation
labkey-nicka Dec 11, 2024
07f53fc
Add metrics
labkey-nicka Dec 11, 2024
abf8041
Be more permissive
labkey-nicka Dec 12, 2024
3b0cc9d
Rebump
labkey-nicka Dec 12, 2024
734d186
Excluded rows
labkey-nicka Dec 12, 2024
55339de
Add "Hit Selection Criteria" column for plate-based assay runs
labkey-nicka Dec 12, 2024
e2a5eba
Bump components
labkey-alan Dec 16, 2024
d2e5bf8
Bump components
labkey-alan Dec 16, 2024
c983ca3
Bump components
labkey-alan Dec 16, 2024
cb356dd
Bump components
labkey-alan Dec 17, 2024
7cf3d48
Negative propertyId, check name against self first
labkey-nicka Dec 17, 2024
2091df7
Bump components
labkey-alan Dec 18, 2024
6c16e90
Code review feedback
labkey-nicka Dec 18, 2024
4723d68
Bump components
labkey-alan Dec 18, 2024
d09c22b
Bump components
labkey-alan Dec 18, 2024
b00aa47
Bump components
labkey-alan Dec 18, 2024
80c0a45
Bump components
labkey-alan Dec 18, 2024
4aadecd
It is a very comma problem
labkey-nicka Dec 18, 2024
bd147c4
Bump components
labkey-alan Dec 19, 2024
2934e20
Bump components
labkey-alan Dec 19, 2024
6b75c38
Bump components
labkey-alan Dec 19, 2024
044369f
Bump components
labkey-alan Dec 20, 2024
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
116 changes: 12 additions & 104 deletions api/gwtsrc/org/labkey/api/gwt/client/model/GWTConditionalFormat.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@
package org.labkey.api.gwt.client.model;

import com.google.gwt.user.client.rpc.IsSerializable;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;

/**
* User: jeckels
* Date: Aug 23, 2010
*/
@Getter
@Setter
@EqualsAndHashCode
public class GWTConditionalFormat implements Serializable, IsSerializable
{
public static final String COLOR_REGEX = "[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]";

public static final String DATA_REGION_NAME = "format";
public static final String COLUMN_NAME = "column";

private boolean _bold = false;
private boolean _italic = false;
private boolean _strikethrough = false;
private String _textColor = null;
private String _backgroundColor = null;

private String _filter;
private boolean bold = false;
private boolean italic = false;
private boolean strikethrough = false;
private String textColor = null;
private String backgroundColor = null;
private String filter;

public GWTConditionalFormat() {}

Expand All @@ -47,98 +47,6 @@ public GWTConditionalFormat(GWTConditionalFormat f)
setStrikethrough(f.isStrikethrough());
setTextColor(f.getTextColor());
setBackgroundColor(f.getBackgroundColor());

setFilter(f.getFilter());
}

public boolean isBold()
{
return _bold;
}

public void setBold(boolean bold)
{
_bold = bold;
}

public boolean isItalic()
{
return _italic;
}

public void setItalic(boolean italic)
{
_italic = italic;
}

public boolean isStrikethrough()
{
return _strikethrough;
}

public void setStrikethrough(boolean strikethrough)
{
_strikethrough = strikethrough;
}

public String getTextColor()
{
return _textColor;
}

public void setTextColor(String textColor)
{
_textColor = textColor;
}

public String getBackgroundColor()
{
return _backgroundColor;
}

public void setBackgroundColor(String backgroundColor)
{
_backgroundColor = backgroundColor;
}

public String getFilter()
{
return _filter;
}

public void setFilter(String filter)
{
_filter = filter;
}

@Override
public boolean equals(Object o)
{
if (this == o) return true;
if (!(o instanceof GWTConditionalFormat)) return false;

GWTConditionalFormat that = (GWTConditionalFormat) o;

if (_bold != that._bold) return false;
if (_italic != that._italic) return false;
if (_strikethrough != that._strikethrough) return false;
if (_backgroundColor != null ? !_backgroundColor.equals(that._backgroundColor) : that._backgroundColor != null)
return false;
if (_filter != null ? !_filter.equals(that._filter) : that._filter != null) return false;
if (_textColor != null ? !_textColor.equals(that._textColor) : that._textColor != null) return false;

return true;
}

@Override
public int hashCode()
{
int result = (_bold ? 1 : 0);
result = 31 * result + (_italic ? 1 : 0);
result = 31 * result + (_strikethrough ? 1 : 0);
result = 31 * result + (_textColor != null ? _textColor.hashCode() : 0);
result = 31 * result + (_backgroundColor != null ? _backgroundColor.hashCode() : 0);
result = 31 * result + (_filter != null ? _filter.hashCode() : 0);
return result;
}
}
Loading