diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl
index c51a4ac53e..556bb1d9d6 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl
@@ -49,7 +49,7 @@
${message("file.report.transferred.items")}
<#list properties.transferNodes as transferNode>
- <#if transferNode.folder>
+ <#if transferNode.properties["isFolder"]>
${transferNode.properties["name"]?html}
@@ -58,7 +58,18 @@
<#-- FIXME: Records -->
<#else>
- <#-- FIXME: Records -->
+
+
+ ${transferNode.properties["name"]?html}
+
+ (${message("file.report.unique.record.identifier")}: ${transferNode.properties["identifier"]?html})
+ <#if transferNode.properties["isDeclared"]>
+ ${message("file.report.declared.by")}
+ ${transferNode.properties["declaredBy"]?html}
+ ${message("file.report.declared.on")}
+ ${transferNode.properties["declaredOn"]?string(message("file.report.date.format"))?html}
+ #if>
+
#if>
#list>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties
index 5df2c889b3..f5a08e6703 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties
@@ -1,6 +1,8 @@
# File Report Template
file.report.acession.report=Accession Report
file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy
+file.report.declared.by=declared by
+file.report.declared.on=on
file.report.destroyed=Destroyed
file.report.destroyed.records=Destroyed Records
file.report.destruction.report=Destruction Report
@@ -14,4 +16,5 @@ file.report.transferred.items=Transferred Items
file.report.performed.by=Performed By
file.report.record=Record
file.report.record.folder=Record Folder
-file.report.unique.folder.identifier=Unique Folder Identifier
\ No newline at end of file
+file.report.unique.folder.identifier=Unique Folder Identifier
+file.report.unique.record.identifier=Unique Record Identifier
\ No newline at end of file
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferNode.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferNode.java
index e3136c0fe0..624d08376b 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferNode.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferNode.java
@@ -34,21 +34,16 @@ public class TransferNode
/** Transfer node reference */
private NodeRef nodeRef;
- /** Transfer node type */
- private boolean folder;
-
/** Transfer node properties */
private Map properties;
/**
* @param nodeRef
- * @param folder
* @param properties
*/
- public TransferNode(NodeRef nodeRef, boolean folder, Map properties)
+ public TransferNode(NodeRef nodeRef, Map properties)
{
this.nodeRef = nodeRef;
- this.folder = folder;
this.properties = properties;
}
@@ -60,14 +55,6 @@ public class TransferNode
return this.nodeRef;
}
- /**
- * @return transfer node type
- */
- public boolean isFolder()
- {
- return this.folder;
- }
-
/**
* @return transfer node properties
*/
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferReportAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferReportAction.java
index 482e63c877..477f5f1c16 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferReportAction.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferReportAction.java
@@ -20,6 +20,7 @@ package org.alfresco.module.org_alfresco_module_rm.report.action;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -71,9 +72,8 @@ public class TransferReportAction extends BaseReportAction
for (ChildAssociationRef assoc : assocs)
{
NodeRef childRef = assoc.getChildRef();
- boolean isFolder = dictionaryService.isSubClass(nodeService.getType(childRef), ContentModel.TYPE_FOLDER);
- Map properties = getTransferNodeProperties(childRef, isFolder);
- transferNodes.add(new TransferNode(childRef, isFolder, properties));
+ Map properties = getTransferNodeProperties(childRef);
+ transferNodes.add(new TransferNode(childRef, properties));
}
return transferNodes;
}
@@ -82,22 +82,29 @@ public class TransferReportAction extends BaseReportAction
* Helper method to get the properties of a transfer node
*
* @param childRef Node reference
- * @param isFolder Type of the transfer node
* @return Transfer node properties
*/
- private Map getTransferNodeProperties(NodeRef childRef, boolean isFolder)
+ private Map getTransferNodeProperties(NodeRef childRef)
{
- Map transferNodeProperties = new HashMap(2);
- if (isFolder)
+ Map transferNodeProperties = new HashMap(3);
+
+ Map properties = nodeService.getProperties(childRef);
+ transferNodeProperties.put("name", properties.get(ContentModel.PROP_NAME));
+ transferNodeProperties.put("identifier", properties.get(RecordsManagementModel.PROP_IDENTIFIER));
+
+ boolean isFolder = dictionaryService.isSubClass(nodeService.getType(childRef), ContentModel.TYPE_FOLDER);
+ transferNodeProperties.put("isFolder", isFolder);
+
+ if (isFolder == false)
{
- Map properties = nodeService.getProperties(childRef);
- transferNodeProperties.put("name", properties.get(ContentModel.PROP_NAME));
- transferNodeProperties.put("identifier", properties.get(RecordsManagementModel.PROP_IDENTIFIER));
- }
- else
- {
- // FIXME: Record
+ boolean isDeclared = nodeService.hasAspect(childRef, RecordsManagementModel.ASPECT_DECLARED_RECORD);
+ String declaredBy = (String) properties.get(RecordsManagementModel.PROP_DECLARED_BY);
+ Date declaredOn = (Date) properties.get(RecordsManagementModel.PROP_DECLARED_AT);
+ transferNodeProperties.put("isDeclared", isDeclared);
+ transferNodeProperties.put("declaredBy", declaredBy);
+ transferNodeProperties.put("declaredOn", declaredOn);
}
+
return transferNodeProperties;
}