Skip to content

Commit e74f9dd

Browse files
committed
Bugfix to MCC notification
1 parent 340b69e commit e74f9dd

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

mcc/resources/views/mccRequestSummary.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
queryName: 'requestScores',
3838
showRecordSelectors: true,
3939
showDetailsColumn: true,
40-
pageSize: 10
40+
maxRows: 10
4141
}).render(webpart.wrapperDivId + '-webpartAll');
4242
});
4343
</script>

mcc/src/org/labkey/mcc/notification/MCCDataNotification.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ public MCCDataNotification(Module owner)
2626
super(owner);
2727
}
2828

29+
@Override
30+
public String getCategory()
31+
{
32+
return "MCC";
33+
}
34+
2935
@Override
3036
public String getName()
3137
{
@@ -123,7 +129,7 @@ protected void doParentSexCheck(final Container c, User u, final StringBuilder m
123129
{
124130
TableInfo demographics = getStudySchema(c, u).getTable("demographics");
125131

126-
SimpleFilter filter = new SimpleFilter(FieldKey.fromString("dam/gender/origgender"), "f", CompareType.NEQ_OR_NULL);
132+
SimpleFilter filter = new SimpleFilter(FieldKey.fromString("dam/Demographics/gender/origgender"), "f", CompareType.NEQ_OR_NULL);
127133
TableSelector ts = new TableSelector(demographics, filter, null);
128134
long count = ts.getRowCount();
129135
if (count > 0)
@@ -133,7 +139,7 @@ protected void doParentSexCheck(final Container c, User u, final StringBuilder m
133139
msg.append("<hr>\n\n");
134140
}
135141

136-
filter = new SimpleFilter(FieldKey.fromString("sire/gender/origgender"), "m", CompareType.NEQ_OR_NULL);
142+
filter = new SimpleFilter(FieldKey.fromString("sire/Demographics/gender/origgender"), "m", CompareType.NEQ_OR_NULL);
137143
ts = new TableSelector(demographics, filter, null);
138144
count = ts.getRowCount();
139145
if (count > 0)

0 commit comments

Comments
 (0)