Ignore:
Timestamp:
Jan 10, 2008, 1:44:06 PM (13 years ago)
Author:
mbayer
Message:

file mappings now filter through into tab2mage file but still have to implement two channel arrays

Location:
branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/experiment.jsp

    r529 r530  
    44<%@ page import="java.util.*"%>
    55
    6 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="application"/>
     6<jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="session"/>
    77<!-- submits the form data back to the bean assuming that each form element is matched to a variable in the bean by the same name -->
    88<jsp:setProperty name="inputDataBean" property="*"/>
     
    1111final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
    1212final String ID = sc.getId();
    13 final String requestID = request.getParameter("requestID");
     13final String requestId = request.getParameter("requestId");
    1414
    1515//we also need to figure out the name/id of the currently selected experiment that this import is getting initiated from
     
    130130<form name="experimentData" action="<%= request.getContextPath()%>/plugins/uk/ac/ebi/nugo/plugins/protocols.jsp" method="post">
    131131<input type="hidden" name="ID" value="<%=ID%>">
    132 <input type="hidden"name="requestID" value="<%=requestID%>">
     132<input type="hidden"name="requestId" value="<%=requestId%>">
    133133
    134134<table cellpadding="0" cellspacing="0">
  • branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/hybridizations.jsp

    r529 r530  
    44<%@ page import="java.util.*"%>
    55
    6 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="application" />
     6<jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="session" />
    77<!-- submits the form data back to the bean assuming that each form element is matched to a variable in the bean by the same name -->
    88<jsp:setProperty name="inputDataBean" property="*" />
     
    1111final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
    1212final String ID = sc.getId();
    13 final String requestID = request.getParameter("requestID");
     13final String requestId = request.getParameter("requestId");
    1414 %>
    1515
     
    8787<form name="hybridizations"action="<%= request.getContextPath()%>/plugins/uk/ac/ebi/nugo/plugins/mappings.jsp" method="post">
    8888<input type="hidden" name="ID" value="<%=ID%>"> <input type="hidden" name="cmd" value="SetParameters">
    89 <input type="hidden"name="requestID" value="<%=requestID%>">
     89<input type="hidden"name="requestId" value="<%=requestId%>">
    9090
    9191<input type="hidden" name="file_id" value="">
  • branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/mappings.jsp

    r529 r530  
    77<%@ page import="uk.ac.ebi.nugo.plugins.*"%>
    88
    9 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="application" />
     9<jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="session" />
    1010<!-- submits the form data back to the bean assuming that each form element is matched to a variable in the bean by the same name -->
    1111<jsp:setProperty name="inputDataBean" property="*" />
     
    1414  final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
    1515  final String ID = sc.getId();
    16   final String requestID = request.getParameter("requestID");
     16  final String requestId = request.getParameter("requestId");
    1717%>
    1818
     
    3131function submit()
    3232{
     33  gatherValues();
     34  document.mappings.submit();
     35}
     36
     37
     38function getRoot()
     39{
     40  return '/base/';
     41}
     42
     43function getScale()
     44{
     45  return 1.0;
     46}
     47
     48
     49//collects all the values from the file selector boxes and strings them together so they can be
     50//passed on as a single parameter for plugin configuration
     51function gatherValues()
     52{
     53  var fileString = '';
    3354  var frm = document.forms['mappings'];
    34   frm.submit();
    35 }
    36 
    37 
    38 function getRoot()
    39 {
    40   return '/base/';
    41 }
    42 
    43 function getScale()
    44 {
    45   return 1.0;
    46 }
     55  var numElements = frm.elements.length;
     56  //document.write(numElements);
     57  //document.write("<br />");
     58  for(var i = 0; i < numElements; i++)
     59  {
     60    var value = frm.elements[i].value;
     61    var id = frm.elements[i].id;
     62
     63    if(id.match("fileinput"))
     64    {
     65      //document.write("id = " + id);
     66      //document.write("<br />");
     67      //document.write("value = " + value);
     68      //document.write("<br />");
     69      fileString += frm.elements[i].value + '\t';
     70    }
     71  }
     72  //document.write('combined output = ' + fileString);
     73  frm.fileStringParam.value = fileString;
     74  //document.write('value of hidden input = ' + frm.fileStringParam.value);
     75}
     76
    4777</script>
    4878
     
    5787<input type="hidden" name="ID" value="<%=ID%>">
    5888<input type="hidden" name="cmd" value="SetParameters">
    59 <input type="hidden" name="requestID" value="<%=requestID%>">
    60 <input type="hidden" id="fileStringParam" name="param:fileStringParam" value""/>
     89<input type="hidden" name="requestId" value="<%=requestId%>">
     90<input type="hidden" id="fileStringParam" name="parameter:fileStringParam" value""/>
    6191
    6292<!-- these are the parameters from the previous input pages; need to pick them up individually from the bean here; ugly as hell but can't be done any other way -->
     
    249279</form>
    250280
    251 <script language="JavaScript" type="text/javascript">
    252 //collects all the values from the file selector boxes and strings them together so they can be
    253 //passed on as a single parameter for plugin configuration
    254 {
    255   var fileString = '';
    256   var frm = document.forms['mappings'];
    257   var numElements = frm.elements.length;
    258   document.write(numElements);
    259   document.write("<br />");
    260   for(var i = 0; i < numElements; i++)
    261   {
    262     var value = frm.elements[i].value;
    263     var id = frm.elements[i].id;
    264 
    265     if(id.match("fileinput"))
    266     {
    267       document.write("id = " + id);
    268       document.write("<br />");
    269       document.write("value = " + value);
    270       document.write("<br />");
    271       fileString += frm.elements[i].value + '\t';
    272     }
    273   }
    274   document.write('combined output = ' + fileString);
    275   frm.fileStringParam.value = fileString;
    276   document.write('value of hidden input = ' + frm.fileStringParam.value);
    277 }
    278 </script>
     281
    279282
    280283</body>
  • branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/protocols.jsp

    r529 r530  
    55<%@ page import="java.lang.*"%>
    66
    7 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="application" />
     7<jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="session" />
    88<!-- submits the form data back to the bean assuming that each form element is matched to a variable in the bean by the same name -->
    99<jsp:setProperty name="inputDataBean" property="*" />
     
    3434final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
    3535final String ID = sc.getId();
    36 final String requestID = request.getParameter("requestID");
     36final String requestId = request.getParameter("requestId");
    3737
    3838
     
    120120<form name="protocols" action="<%= request.getContextPath()%>/plugins/uk/ac/ebi/nugo/plugins/hybridizations.jsp" method="post">
    121121<input type="hidden" name="ID" value="<%=ID%>">
    122 <input type="hidden"name="requestID" value="<%=requestID%>">
     122<input type="hidden"name="requestId" value="<%=requestId%>">
    123123
    124124<h1>Tab2MAGE Importer -- Your Protocols</h1>
Note: See TracChangeset for help on using the changeset viewer.