More work on compo entry adding

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/VotingBean.java

@@ -60,6 +60,10 @@ public class VotingBean implements VotingBeanLocal {
     	compoEntryFileFacade.create(compoEntryFile);
     	compoEntryFileFacade.create(compoEntryFile);
     }
     }
     
     
+    public Compo getCompoById(Integer compoId) {
+    	return compoFacade.find(compoId);
+    }
+
     public List<Compo> getCompoList() {
     public List<Compo> getCompoList() {
     	return compoFacade.getList();
     	return compoFacade.getList();
     }
     }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/VotingBeanLocal.java

@@ -13,4 +13,5 @@ public interface VotingBeanLocal {
 	public void createCompo(Compo c);
 	public void createCompo(Compo c);
 	public void addEntry(CompoEntry compoEntry, CompoEntryFile compoEntryFile);
 	public void addEntry(CompoEntry compoEntry, CompoEntryFile compoEntryFile);
 	public List<Compo> getCompoList();
 	public List<Compo> getCompoList();
+	public Compo getCompoById(Integer compoId);
 }
 }

code/LanBortalWeb/WebContent/voting/addentry.xhtml

@@ -9,7 +9,7 @@
 <h:body>
 <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 		<f:metadata>
-			<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
+			<f:viewParam name="compoId" value="#{votingCompoAddEntryView.compoId}"></f:viewParam>
 		</f:metadata>
 		</f:metadata>
 		<ui:define name="content">
 		<ui:define name="content">
 			<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->
 			<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCompoAddEntryView.java

@@ -31,6 +31,8 @@ public class VotingCompoAddEntryView {
 	@NotNull
 	@NotNull
 	private UploadedFile uploadedFile;
 	private UploadedFile uploadedFile;
 
 
+	private Integer compoId;
+	
 	public UploadedFile getUploadedFile() {
 	public UploadedFile getUploadedFile() {
 		return uploadedFile;
 		return uploadedFile;
 	}
 	}
@@ -61,7 +63,7 @@ public class VotingCompoAddEntryView {
 		compoEntry.setName(name);
 		compoEntry.setName(name);
 		compoEntry.setNotes(notes);
 		compoEntry.setNotes(notes);
 		compoEntry.setScreenMessage(screenMessage);
 		compoEntry.setScreenMessage(screenMessage);
-		compoEntry.setCompo(null);
+		compoEntry.setCompo(votingBean.getCompoById(compoId));
 		CompoEntryFile cef = new CompoEntryFile(compoEntry);
 		CompoEntryFile cef = new CompoEntryFile(compoEntry);
 		cef.setFileData(this.uploadedFile.getContents());
 		cef.setFileData(this.uploadedFile.getContents());
 		cef.setFileName(uploadedFile.getFileName());
 		cef.setFileName(uploadedFile.getFileName());