bb173251387dd27fcb3a6f87b9ce10399e52e18d kate Wed Mar 7 21:42:59 2012 -0800 Colors and labels (from review with Katrina) diff --git src/hg/js/encodeDataSummary.js src/hg/js/encodeDataSummary.js index c9390b7..9cb787b 100644 --- src/hg/js/encodeDataSummary.js +++ src/hg/js/encodeDataSummary.js @@ -67,39 +67,48 @@ tfbsExps[target]++; } else { dataType = encodeProject.getDataType(exp.dataType); if (dataType !== undefined) { dataType = dataType.label; } else { dataType = exp.dataType; } if (!cellAssayExps[dataType]) { cellAssayExps[dataType] = 0; } cellAssayExps[dataType]++; } }); // fill in tables and activate buttons - tableOut("#refGenomeTable", refGenomeTypes, refGenomeExps, false); - tableOut("#elementTable", elementTypes, cellAssayExps, false); - $("#buttonDataMatrix").click(function () { - window.location = "encodeDataMatrixHuman.html"; + tableOut('#refGenomeTable', refGenomeTypes, refGenomeExps, false); + tableOut('#elementTable', elementTypes, cellAssayExps, false); + $('#buttonDataMatrix').click(function () { + window.location = 'encodeDataMatrixHuman.html'; }); // TODO: enable selectable items in antibody table - tableOut("#tfbsTable", tfbsTypes, tfbsExps, true); - $("#buttonChipMatrix").click(function () { - window.location = "encodeChipMatrixHuman.html"; + tableOut('#tfbsTable', tfbsTypes, tfbsExps, true); + $('#buttonChipMatrix').click(function () { + window.location = 'encodeChipMatrixHuman.html'; + }); + + // add row highlight + $('.summaryTable').delegate('.even, .odd', 'mouseover mouseleave', function (ev) { + if (ev.type == 'mouseover') { + $(this).addClass('rowHighlight'); + } else { + $(this).removeClass('rowHighlight'); + } }); } function tableOut(table, types, exps, isChipSeq) { // Helper function to output tables to document var total = 0, row = 0; var dataType, antibodyTarget; $.each(exps, function (key, value) { types.push(key); total += parseInt(value, 10); }); types.sort(encodeProject.cmpNoCase); // lay out table @@ -109,49 +118,50 @@ antibodyTarget = encodeProject.getAntibodyTarget(value); if (antibodyTarget !== undefined) { description = antibodyTarget.description; } } else { dataType = encodeProject.getDataTypeByLabel(value); if (dataType !== undefined) { description = dataType.description; } } // quote the end tags so HTML validator doesn't whine $(table).append("<tr class='" + (row % 2 === 0 ? "even" : "odd") + "'><td title='" + description + "'>" + value + "<\/td><td id='" + value + "' class='dataItem' title='Click to search for " + value + " data'>" + exps[value] + "<\/td><\/tr>"); row++; }); - $(".dataItem").addClass("selectable"); - $(".dataItem").click(function () { + /* $(".dataItem").addClass("selectable"); */ + $(".even, .odd").click(function () { // TODO: base on preview ? var url = encodeMatrix.getSearchUrl(encodeProject.getAssembly()); if (isChipSeq) { - target = $(this).attr("id"); + target = $(this).children('.dataItem').attr("id"); url += '&hgt_mdbVar1=antibody'; antibodyTarget = encodeProject.getAntibodyTarget(target); $.each(antibodyTarget.antibodies, function (i, antibody) { url += '&hgt_mdbVal1=' + antibody; }); } else { - dataType = $(this).attr("id"); + dataType = $(this).children('.dataItem').attr("id"); url += '&hgt_mdbVar1=dataType&hgt_mdbVal1=' + dataType; } url += '&hgt_mdbVar2=view&hgt_mdbVal2=Any'; // TODO: open search window window.open(url, "searchWindow"); //window.location = url; }); $(table).append("<tr><td class='totals'>Total: " + types.length + "<\/td><td class='totals'>" + total + "<\/td><\/tr>"); if (total === 0) { $(table).remove(); } } // initialize encodeMatrix.start($summaryTables); // load data from server encodeProject.loadAllFromServer(requests, handleServerData); }); +