Changeset 16199

Timestamp:

14/07/08 11:27:05 (1 month ago)

Author:

contrino

Message:

modencode tiles: some cleaning, additions, corrections

Files:

• trunk/modmine/webapp/resources/webapp/dataCategories.jsp (modified) (1 diff)
• trunk/modmine/webapp/resources/webapp/model/providerSubmissions.jsp (modified) (2 diffs)
• trunk/modmine/webapp/src/org/modmine/web/ProviderSubmissionsController.java (modified) (4 diffs)

trunk/modmine/webapp/resources/webapp/dataCategories.jsp

@@ -8 +8 @@
-
-<html:xhtml/>
+
+<div class="body">
-
-<im:boxarea title="Data" stylename="plainbox"><p><fmt:message key="dataCategories.intro"/></p></im:boxarea>

trunk/modmine/webapp/resources/webapp/model/providerSubmissions.jsp

@@ -15 +15 @@
-    <th>Provider</th>
-    <th>Affiliation</th>
+    <th>Project</th>
-    <th>Submissions</th>
-  </tr>
@@ -22 +23 @@
- ${item.key.name}
-    </html:link>
+ <td>${item.key.affiliation}
+ <td>
+      <c:forEach items="${project}" var="proj">
+        <c:if test="${proj.key eq item.key}">
+          <c:set var="pName" value="${proj.value.name}" />
+          <c:set var="pId" value="${proj.value.id}" />
+        </c:if>
+      </c:forEach> 
+     <html:link  href="/${WEB_PROPERTIES['webapp.path']}/objectDetails.do?id=${pId}">
+ ${pName}
+    </html:link>
- 
-
+
+
- <c:forEach items="${item.value}" var="sub">
-

trunk/modmine/webapp/src/org/modmine/web/ProviderSubmissionsController.java

@@ -27 +27 @@
-import org.apache.struts.tiles.actions.TilesAction;
-import org.flymine.model.genomic.ExperimentSubmission;
+import org.flymine.model.genomic.ModEncodeProject;
-import org.flymine.model.genomic.ModEncodeProvider;
-import org.intermine.objectstore.ObjectStore;
@@ -67 +68 @@
-            Results results = os.executeSingleton(q);
-
-ExperimentSubmission
-ExperimentSubmission
+Set<ExperimentSubmission>
+Set<ExperimentSubmission>
-
-Set<ExperimentSubmission>> ps2
-Set<ExperimentSubmission>
+ModEncodeProject> pp
+ModEncodeProject
-
-            Map<String, List<String>> providerSubs = 
-                new HashMap<String, List<String>>();
-            Map<String, String> ugo = 
-                new HashMap<String, String>();
-
-            // for each provider, get its attributes and set the values for jsp
@@ -83 +82 @@
-                ModEncodeProvider provider = (ModEncodeProvider) i.next();
-                Set<ExperimentSubmission> subs = provider.getExperimentSubmissions();
-
-
-
+
+
+
+
+
-                //List<String> thisProviderSubs = providerSubs.get(provider);
-//              for (ExperimentSubmission experiment: subs) {
-//              ps.put(provider, experiment);                    
-//              }
-//              String mostra = "qq77 sono qui";
-//              request.setAttribute("esempio", mostra);
-//              request.setAttribute("experiments", providerSubs);
-
-            }
-
+
+
-
-        } catch (Exception err) {
@@ -190 +188 @@
-
-
-
-//Results results =
-//MicroArrayHelper.queryExperimentsInvolvingGene(gene.getPrimaryIdentifier(), os);
-//if (results != null) {
-//ArrayList<Object> experiments = new ArrayList<Object>();
-//for (Iterator iter = results.iterator(); iter.hasNext(); ) {
-//ResultsRow row = (ResultsRow) iter.next();
-//experiments.add(row.get(0));
-//}
-//request.setAttribute("experiments", experiments);
-//}
-
-//request.setAttribute("experiments", subs.toString());
-
-
-