Changeset 16200

Timestamp:

14/07/08 12:56:16 (1 month ago)

Author:

contrino

Message:

modmine tiles: added providers tile to menu

Files:

• trunk/intermine/webapp/main/resources/webapp/WEB-INF/classes/InterMineWebApp.properties (modified) (2 diffs)
• trunk/modmine/webapp/resources/struts-config-model.xml (modified) (2 diffs)
• trunk/modmine/webapp/resources/tiles-defs-model.xml (modified) (2 diffs)
• trunk/modmine/webapp/resources/webapp/dataCategories.jsp (modified) (3 diffs)
• trunk/modmine/webapp/resources/webapp/menu.jsp (modified) (1 diff)
• trunk/modmine/webapp/resources/webapp/model/projects.jsp (added)
• trunk/modmine/webapp/resources/webapp/model/providers.jsp (added)
• trunk/modmine/webapp/src/org/modmine/web/ProjectsController.java (added)
• trunk/modmine/webapp/src/org/modmine/web/ProviderSubmissionsController.java (modified) (5 diffs)
• trunk/modmine/webapp/src/org/modmine/web/ProvidersController.java (added)

trunk/intermine/webapp/main/resources/webapp/WEB-INF/classes/InterMineWebApp.properties

@@ -15 +15 @@
-menu.logout = Log out
-menu.noResults = No results
-#menu.projectSubmissions = Projects
-menu.projects = Projects
+menu.providers = Providers
-
-
@@ -754 +754 @@
-
-# MODENCODE
-modEncodeProjects.title = Projects
-modEncodeProjects.description = Projects
-modEncodeProjects.tab = modEncodeProjects
-modEncodeProjects.noFollow = true
-modEncodeProjects.intro = Projects.
-#modEncodeProjects.viewTemplates = View templates
-modEncodeProjects.intro = All the projects in the ModEncode consortium. \
-                      NOTE:  All external links open in a new window.
-
-
-projectSubmissions.title = Projects
-projectSubmissions.description = Projects
-projectSubmissions.tab = projectSubmissions
-projectSubmissions.noFollow = true
-projectSubmissions.intro = Projects.
-
-projectSubmissions.intro = All the projects in the ModEncode consortium. \
-                      NOTE:  All external links open in a new window.
-
-
-
-
-
-projects.title = Projects
-projects.description = Projects
-projects.tab = projects
-projects.noFollow = true
-projects.intro = Projects.
-
-projects.intro = All the projects in the ModEncode consortium. \
-                      NOTE:  All external links open in a new window.
+
+providers.title = providers
+providers.description = providers
+providers.tab = providers
+providers.noFollow = true
+providers.intro = All the providers in the ModEncode consortium. \
+                      NOTE:  All external links open in a new window.
+                      

trunk/modmine/webapp/resources/struts-config-model.xml

@@ -12 +12 @@
-
-
+<action path="/initProjects"
+  type="org.modmine.web.ProjectsController" />
+<action path="/projects" forward="projects.page">
+</action>
+
+<action path="/initProviders"
+  type="org.modmine.web.ProvidersController" />
+<action path="/providers" forward="providers.page">
+</action>
+
+
-<action path="/initProviderSubmissions"
-  type="org.modmine.web.ProviderSubmissionsController" />
-<action path="/initProjectSubmissions"
-  type="org.modmine.web.ProjectSubmissionsController" />
-<action path="/initProjects"
-  type="org.modmine.web.ProjectsController" />
-<action path="/initModEncodeProjects"
-  type="org.modmine.web.ModEncodeProjectsController" />
@@ -25 +34 @@
-<action path="/projectSubmissions" forward="projectSubmissions.page">
-</action>
-
-
+
+
-
-<!-- 

trunk/modmine/webapp/resources/tiles-defs-model.xml

@@ -7 +7 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<definition name="projectSubmissions.tile" path="/model/projectSubmissions.jsp" 
-        controllerUrl="/initProjectSubmissions.do"/>
-<definition name="modEncodeProjects.tile" path="/model/modEncodeProjects.jsp" 
-        controllerUrl="/initModEncodeProjects.do"/>
-<definition name="projects.tile" path="/model/projects.jsp" 
-        controllerUrl="/initProjects.do"/>
-        
-<definition name="modEncodeProjects.page" extends="layout.template">
-    <put name="body" value="modEncodeProjects.tile"/>
@@ -26 +37 @@
-  </definition>
-
-  <definition name="projects.page" extends="layout.template">
-    <put name="body" value="projects.tile"/>
-    <put name="pageName" value="projects"/>
-  </definition>
-  

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

@@ -32 +32 @@
-  </tr>
-
-
-  <tr><td rowspan="1"  class="leftcol">
-        <html:link action="/aspect?name=Comparative%20Genomics">
@@ -39 +38 @@
-    <td>
-       <p><i>D. melanogaster</i></p>
-
-
-
-
-
+
-<p><i>C. elegans</i></p>
-    </td>
@@ -290 +285 @@
-
-</table>
-
-
-

trunk/modmine/webapp/resources/webapp/menu.jsp

@@ -49 +49 @@
-    </a>
-  </li>
+  <li id="providers"  <c:if test="${tab == 'providers'}">class="activelink"</c:if>>
+    <a href="/${WEB_PROPERTIES['webapp.path']}/providers.do">
+      <fmt:message key="menu.providers"/>
+    </a>
+  </li>
- 
-  

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

@@ -11 +11 @@
- */
-
-import java.util.HashMap;
-import java.util.Iterator;
-st
+nkedHashMap
-import java.util.Map;
-import java.util.Set;
@@ -34 +33 @@
-import org.intermine.objectstore.query.QueryField;
-import org.intermine.objectstore.query.Results;
+import org.intermine.objectstore.query.ResultsRow;
-import org.intermine.web.logic.Constants;
-
@@ -59 +59 @@
-            Query q = new Query();  
-            QueryClass qc = new QueryClass(ModEncodeProvider.class);
-c
+f
-
-            q.addFrom(qc);
-            q.addToSelect(qc);
-c
+f
-
-
-Singleton
+
+
-
-            Map<ModEncodeProvider, Set<ExperimentSubmission>> ps =
-
+Linked
-
-            Map<ModEncodeProvider, ModEncodeProject> pp =
-
-
-
-
+
-
-            // for each provider, get its attributes and set the values for jsp
-
-
-
+
+
+
+
+
-                Set<ExperimentSubmission> subs = provider.getExperimentSubmissions();
-                ModEncodeProject project = provider.getProject();
@@ -86 +85 @@
-                ps.put(provider, subs);
-                pp.put(provider, project);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            request.setAttribute("experiments", ps);
-            request.setAttribute("project", pp);
@@ -101 +108 @@
-    }
-}
-
-
-
-//Map<String, String> ugo = 
-//new HashMap<String, String>();
-
-////for each provider, get its attributes and set the values for jsp
-//Iterator i = results.iterator();
-//while (i.hasNext()) {
-//ModEncodeProvider provider = (ModEncodeProvider) i.next();
-//Set<ExperimentSubmission> subs = provider.getExperimentSubmissions();
-
-////List<String> thisProviderSubs = providerSubs.get(provider);
-//for (ExperimentSubmission experiment: subs) {
-//ugo.put(provider.getName(), experiment.getTitle());                    
-
-////    thisProviderSubs.add(experiment.getTitle());
-//}
-////providerSubs.put(provider.getName(), thisProviderSubs);                    
-//}
-//String mostra = "qq77 sono qui";
-//request.setAttribute("esempio", mostra);
-////request.setAttribute("experiments", providerSubs);
-//request.setAttribute("experiments", ugo);
-
-
-
-
-
-
-
-
-//List<String> currentSubs = providerSubs.get(provider);
-//
-//for (ExperimentSubmission experiment: subs) {
-//if (providerSubs.containsKey(provider)) {
-//currentSubs.add(experiment.getTitle());
-////providerSubs.remove(provider);
-//} 
-//providerSubs.put(provider.getName(), currentSubs);                    
-
-
-//Iterator<ExperimentSubmission> e = subs.iterator();
-//while (e.hasNext()) {
-//if (providerSubs.containsKey(provider)) {
-//List<String> currentSubs = providerSubs.get(provider);
-//currentSubs.add(e.next().);
-////get all the vlaues, put in the list, check , add, rm, put
-//String daSub = providerSubs.get(provider);
-//currentSubs.addAll(providerSubs.values());
-//currentSubs..addAll(providerSubs.values());
-//(providerSubs.values().toArray());
-//providerSubs.values()..add(e.next().toString());
-//.put(provider.getName(), (ExperimentSubmission) e.next().toString());                      
-//}
-//providerSubs.put(provider.getName(), (ExperimentSubmission) e.next().toString());
-////providerSubs.addToMap(provider.getName(), e.next());
-//}
-
-//for (ModEncodeProvider modEncodeProvider: results) {
-//modEncodeProvider
-
-
-//while (i.hasNext()) {
-//ModEncodeProvider provider = (ModEncodeProvider) i.next();
-//Set<ExperimentSubmission> subs = provider.getExperimentSubmissions();
-//
-//Iterator e = subs.iterator();
-//while (e.hasNext()) {
-//providerSubs.put(provider.getName(), (ExperimentSubmission) e.next());
-//}
-//}
-
-
-
-//Model model = os.getModel();
-//PathQuery q = new PathQuery(model);
-//
-//q.setView("ModEncodeProvider.name, ModEncodeProvider.affiliation, " 
-//+ "ModEncode.experimentSubmissions.title");
-
-//ModEncodeProvider provider = (ModEncodeProvider) request.getAttribute("object");
-//Set<ExperimentSubmission> subs = provider.getExperimentSubmissions();
-
-
-
-