Skip to content

Commit 97bb4b2

Browse files
labkey-adamlabkey-adam
authored
Migrate inline handlers (#137)
1 parent e59f201 commit 97bb4b2

File tree

3 files changed

+134
-161
lines changed

3 files changed

+134
-161
lines changed

‎OConnor/resources/views/BloodCalendar.html‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,27 @@
280280
theWindow.show();
281281

282282
}
283-
283+
284+
LABKEY.Utils.onReady(function(){
285+
document.getElementById('previousButton')['onclick'] = previous;
286+
document.getElementById('nextButton')['onclick'] = next;
287+
document.getElementById('jumpButton')['onclick'] = jump;
288+
});
284289
</script>
285290
<body>
286291
<div align="center">
287292

288293
<table>
289294
<tr>
290295
<td>
291-
<input value='Previous' type='button' onclick='previous()'>
296+
<input value='Previous' type='button' id='previousButton'>
292297
</td>
293298
<td id="week"></td>
294299
<td>
295-
<input value='Next' type='button' onclick='next()'>
300+
<input value='Next' type='button' id='nextButton'>
296301
</td>
297302
<td>
298-
<input value='Jump To' type='button' onclick='jump()'>
303+
<input value='Jump To' type='button' id='jumpButton'>
299304
</td>
300305
</tr>
301306
<tr>
@@ -309,6 +314,7 @@
309314
</div>
310315
<br>
311316
<table width = '900 '><tr><td>*Unsubmitted</td></tr></table>
317+
</div>
312318

313319
</body>
314320
</html>

‎OConnor/resources/views/Elispot_Matrix.html‎

Lines changed: 114 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
});
1717
}
1818

19-
2019
var trad1 = '';
2120
var trad2 = '';
2221
var matrix1 = '';
@@ -26,10 +25,6 @@
2625

2726
Ext.onReady(main);
2827

29-
30-
31-
32-
3328
function main(){
3429

3530
var tradExps = LABKEY.ActionURL.getParameter('trad');
@@ -63,8 +58,7 @@
6358
success: runPeptides,
6459

6560
});
66-
67-
61+
6862
function runPeptides(d){
6963

7064
matrixPeptides = [];
@@ -108,154 +102,134 @@
108102
});
109103
}
110104

111-
function getPeptides(d){
112-
113-
table = document.getElementById('dataregion_theTable');
114-
rows = table.childNodes[3].getElementsByTagName('tr');
105+
function getPeptides(d){
106+
table = document.getElementById('dataregion_theTable');
107+
rows = table.childNodes[3].getElementsByTagName('tr');
108+
109+
var tradArray = [];
110+
var matrixArray = [];
111+
112+
for (var i = 0; i < d.rows.length; i++){
113+
for (var t = 0; t < matrixPeptides.length; t++){
114+
if(d.rows[i].peptide_number == matrixPeptides[t]){
115+
var tempString = d.rows[i].pool_contents;
116+
tempString = tempString.replace(/\s+/g,"");
117+
matrixArray.push(tempString.split(','));
118+
}
119+
}
120+
for (var t = 0; t < traditionalPeptides.length; t++){
121+
if(d.rows[i].peptide_number == traditionalPeptides[t]){
122+
var tempString = d.rows[i].pool_contents;
123+
tempString = tempString.replace(/\s+/g,"");
124+
125+
if (tempString.indexOf('-') != -1){
126+
var idx = tempString.indexOf('-');
127+
var tempArray = [];
128+
129+
var start = +tempString.substring(0,idx);
130+
var end = +tempString.substring(idx+1,tempString.length);
131+
132+
for(var p = start; p <= end; p++){
133+
tempArray.push(p);
134+
}
135+
136+
tradArray.push(tempArray);
137+
}
138+
else
139+
{
140+
tradArray.push(tempString.split(','));
141+
}
142+
}
143+
}
144+
}
115145

116-
117-
118-
var tradArray = [];
119-
var matrixArray = [];
120-
121-
for(var i = 0; i < d.rows.length; i++){
122-
for(var t = 0; t < matrixPeptides.length; t++){
123-
if(d.rows[i].peptide_number == matrixPeptides[t]){
124-
var tempString = d.rows[i].pool_contents;
125-
tempString = tempString.replace(/\s+/g,"");
126-
matrixArray.push(tempString.split(','));
127-
}
128-
129-
}
130-
for(var t = 0; t < traditionalPeptides.length; t++){
131-
if(d.rows[i].peptide_number == traditionalPeptides[t]){
132-
var tempString = d.rows[i].pool_contents;
133-
tempString = tempString.replace(/\s+/g,"");
134-
135-
if (tempString.indexOf('-') != -1){
136-
var idx = tempString.indexOf('-');
137-
var tempArray = [];
138-
139-
var start = +tempString.substring(0,idx);
140-
var end = +tempString.substring(idx+1,tempString.length);
141-
142-
for(var p = start; p <= end; p++){
143-
tempArray.push(p);
144-
}
145-
146-
tradArray.push(tempArray);
147-
148-
}else{
149-
tradArray.push(tempString.split(','));
150-
}
151-
}
152-
153-
}
154-
}
155-
156-
157-
158-
var allMatrix = [];
159-
160-
for(var i = 0; i < matrixArray.length; i++){
161-
for(var t = 0; t < matrixArray[i].length; t++){
162-
allMatrix.push(matrixArray[i][t]);
163-
}
164-
}
165-
166-
var allTrad = [];
167-
168-
for(var i = 0; i < tradArray.length; i++){
169-
for(var t = 0; t < tradArray[i].length; t++){
170-
allTrad.push(tradArray[i][t]);
171-
}
172-
}
173-
174-
var shared = [];
175-
176-
for(var i = 0; i < allMatrix.length; i++){
177-
for(var t = 0; t < allTrad.length; t++){
178-
if(allMatrix[i] == allTrad[t])
179-
shared.push(allMatrix[i]);
180-
}
181-
}
182-
183-
184-
185-
186-
187-
188-
for(var i = 0; i < matrixArray.length; i++)
189-
highlight(matrixArray[i],"#00FF00");
190-
191-
for(var i = 0; i < tradArray.length; i++)
192-
highlight(tradArray[i],"#FF3333");
193-
194-
highlight(shared,"#FFFF00");
146+
var allMatrix = [];
195147

196-
makeQuery(shared);
197-
198-
199-
function highlight(highPep,color){
200-
201-
for (var i = 0; i < rows.length; i++){
202-
if(rows[i].className == 'labkey-row' || rows[i].className == 'labkey-alternate-row'){
203-
for(var t = 0; t < rows[i].childNodes.length; t++){
204-
205-
for(var p = 0; p < highPep.length; p++){
206-
if(rows[i].childNodes[t].innerHTML.indexOf(highPep[p]) != -1)
207-
rows[i].childNodes[t].style.backgroundColor = color;
208-
}
209-
}
210-
211-
}
212-
213-
}
214-
215-
}
216-
217-
218-
function makeQuery(peptides){
219-
220-
var qwp2 = new LABKEY.QueryWebPart({
221-
renderTo: 'peptides',
222-
schemaName: 'oconnor',
223-
queryName: 'peptides',
224-
containerPath: 'WNPRC/WNPRC_Laboratories/oconnor/',
225-
frame: 'none',
226-
buttonBarPosition: 'top',
227-
allowChooseQuery: false,
228-
showDeleteButton: false,
229-
showInsertNewButton: false,
230-
showUpdateColumn: false,
231-
showDetailsColumn : false,
232-
showRecordSelectors : true,
233-
filterArray: [LABKEY.Filter.create('peptide_number', peptides.join(';'), LABKEY.Filter.Types.EQUALS_ONE_OF)],
234-
containerPath: 'WNPRC/WNPRC_Laboratories/oconnor/',
148+
for(var i = 0; i < matrixArray.length; i++){
149+
for(var t = 0; t < matrixArray[i].length; t++){
150+
allMatrix.push(matrixArray[i][t]);
151+
}
152+
}
235153

236-
});
237-
238-
239-
}
240-
241-
242-
}
154+
var allTrad = [];
155+
156+
for(var i = 0; i < tradArray.length; i++){
157+
for(var t = 0; t < tradArray[i].length; t++){
158+
allTrad.push(tradArray[i][t]);
159+
}
160+
}
161+
162+
var shared = [];
163+
164+
for(var i = 0; i < allMatrix.length; i++){
165+
for(var t = 0; t < allTrad.length; t++){
166+
if(allMatrix[i] == allTrad[t])
167+
shared.push(allMatrix[i]);
168+
}
169+
}
243170

171+
for(var i = 0; i < matrixArray.length; i++)
172+
highlight(matrixArray[i],"#00FF00");
173+
174+
for(var i = 0; i < tradArray.length; i++)
175+
highlight(tradArray[i],"#FF3333");
176+
177+
highlight(shared,"#FFFF00");
178+
179+
makeQuery(shared);
180+
181+
function highlight(highPep,color){
182+
183+
for (var i = 0; i < rows.length; i++){
184+
if(rows[i].className == 'labkey-row' || rows[i].className == 'labkey-alternate-row'){
185+
for(var t = 0; t < rows[i].childNodes.length; t++){
186+
187+
for(var p = 0; p < highPep.length; p++){
188+
if(rows[i].childNodes[t].innerHTML.indexOf(highPep[p]) != -1)
189+
rows[i].childNodes[t].style.backgroundColor = color;
190+
}
191+
}
192+
}
193+
}
194+
}
195+
196+
function makeQuery(peptides){
197+
198+
var qwp2 = new LABKEY.QueryWebPart({
199+
renderTo: 'peptides',
200+
schemaName: 'oconnor',
201+
queryName: 'peptides',
202+
containerPath: 'WNPRC/WNPRC_Laboratories/oconnor/',
203+
frame: 'none',
204+
buttonBarPosition: 'top',
205+
allowChooseQuery: false,
206+
showDeleteButton: false,
207+
showInsertNewButton: false,
208+
showUpdateColumn: false,
209+
showDetailsColumn : false,
210+
showRecordSelectors : true,
211+
filterArray: [LABKEY.Filter.create('peptide_number', peptides.join(';'), LABKEY.Filter.Types.EQUALS_ONE_OF)],
212+
containerPath: 'WNPRC/WNPRC_Laboratories/oconnor/',
213+
});
214+
}
215+
}
244216
}
245217

246218
function newExps(){
247219
matrixElispotSelection(null, matrix1, matrix2, trad1, trad2);
248220
}
249221

250-
222+
LABKEY.Utils.onReady(function(){
223+
document.getElementById('newExps')['onclick'] = newExps;
224+
});
251225
</script>
252-
<INPUT style="font-size:16px;" type="button" value="New Experiments" name="button6" onClick='newExps()'>
226+
<INPUT style="font-size:16px;" type="button" value="New Experiments" name="button6" id='newExps'>
253227
<span id="experiments" style="font-size:18px; line-height:16px; vertical-align:text-bottom;"></span>
254-
<br></br>
228+
<br>
255229
<div id="matches" style="font-size:20px">
256230
</div>
257231
<div id="peptides"></div>
258-
<br></br>
232+
<br>
259233
<div id="matrix"></div>
260234
</html>
261235

‎OConnor/resources/views/WebPartRemoval.html‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
11
<html>
22
<script type="text/javascript" nonce="<%=scriptNonce%>">
33

4-
5-
64
function remove(){
7-
8-
var lastID;
95
LABKEY.Portal.getWebParts({
10-
success: function(d){
11-
LABKEY.Portal.removeWebPart({
12-
updateDOM : true,
13-
webPartId : d.body[d.body.length-2].webPartId
14-
15-
});
16-
}
17-
6+
success: function(d){
7+
LABKEY.Portal.removeWebPart({
8+
updateDOM : true,
9+
webPartId : d.body[d.body.length-2].webPartId
10+
});
11+
}
1812
});
19-
2013
}
2114

22-
23-
24-
15+
LABKEY.Utils.onReady(function(){
16+
document.getElementById('removeLastWebPart')['onclick'] = remove;
17+
});
2518
</script>
2619
<FORM>
27-
<INPUT type="button" value="Remove Last WebPart" name="button6" onClick='remove()'>
20+
<INPUT type="button" value="Remove Last WebPart" name="button6" id="removeLastWebPart">
2821
</FORM>
2922

3023
</html>

0 commit comments

Comments
 (0)