Changeset 4454

Timestamp:

Mar 20, 2013, 9:20:05 AM (10 years ago)

Author:

olle

Message:

Refs #800. Removal of files from biomaterial implemented for extracts and labeled extracts.

Location:

trunk/client/servlet/src/org/proteios/action/extract

Files:

• ViewActiveExtract.java (modified) (4 diffs)
• ViewActiveLabeledExtract.java (modified) (4 diffs)

trunk/client/servlet/src/org/proteios/action/extract/ViewActiveExtract.java

@@ -39 +39 @@
 import org.proteios.action.file.AnnotateBioMaterial;
 import org.proteios.action.file.ViewFile;
+import org.proteios.action.sample.RemoveFilesFromBioMaterial;
 import org.proteios.action.write.AddAnnotation;
 import org.proteios.core.Annotation;
@@ -199 +200 @@
         Iterator<File> fileit = extract.getFiles().iterator();
         fileTable.setTitle("AssociatedFiles");
+        fileTable.add(new Column<Checkbox<VInteger>>(""));
         fileTable.add(new Column<String>("Name"));
         fileTable.add(new Column<String>("Type"));
@@ -205 +207 @@
             file = fileit.next();
             row = new Row(file.getId());
+            Checkbox<VInteger> cb = new Checkbox<VInteger>(RemoveFilesFromBioMaterial.VFILEID);
+            cb.setValue(file.getId());
+            Cell<Checkbox<VInteger>> chk = new Cell<Checkbox<VInteger>>(cb);
+            row.addCell(chk);
             Cell<?> nameCell = new Cell<String>(file.getName());
             ActionLink viewFile = getActionFactory().getActionLink(
@@ -234 +240 @@
         fileLink.addParameter(AnnotateBioMaterial.VBIOMATERIALID, extract.getId());
         tbf.add(fileLink);
+        ActionLink al = getActionFactory().getActionLink(
+            RemoveFilesFromBioMaterial.class, "Remove");
+        al.addParameter(RemoveFilesFromBioMaterial.VBIOMATERIALID, extract.getId());
+        tbf.add(al);
         /***********************************************************************
             * Layout

trunk/client/servlet/src/org/proteios/action/extract/ViewActiveLabeledExtract.java

@@ -38 +38 @@
 import org.proteios.action.file.AnnotateBioMaterial;
 import org.proteios.action.file.ViewFile;
+import org.proteios.action.sample.RemoveFilesFromBioMaterial;
 import org.proteios.action.write.AddAnnotation;
 import org.proteios.core.Annotation;
@@ -161 +162 @@
         Iterator<File> fileit = extract.getFiles().iterator();
         fileTable.setTitle("AssociatedFiles");
+        fileTable.add(new Column<Checkbox<VInteger>>(""));
         fileTable.add(new Column<String>("Name"));
         fileTable.add(new Column<String>("Type"));
@@ -167 +169 @@
             File file = fileit.next();
             Row row = new Row(file.getId());
+            Checkbox<VInteger> cb = new Checkbox<VInteger>(RemoveFilesFromBioMaterial.VFILEID);
+            cb.setValue(file.getId());
+            Cell<Checkbox<VInteger>> chk = new Cell<Checkbox<VInteger>>(cb);
+            row.addCell(chk);
             Cell<?> nameCell = new Cell<String>(file.getName());
             ActionLink viewFile = getActionFactory().getActionLink(
@@ -188 +194 @@
         fileLink.addParameter(AnnotateBioMaterial.VBIOMATERIALID, extract.getId());
         tbf.add(fileLink);
+        ActionLink al = getActionFactory().getActionLink(
+            RemoveFilesFromBioMaterial.class, "Remove");
+        al.addParameter(RemoveFilesFromBioMaterial.VBIOMATERIALID, extract.getId());
+        tbf.add(al);
         /** Disable buttons according to permissions **/
             try