SSDM-1445 : User creator/modifier don't appears correctly showing etlserver instead.

SVN: 33368

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js

@@ -362,6 +362,10 @@ function ServerFacade(openbisServer) {
 	// ELN Custom API
  	//
  	this.createReportFromAggregationService = function(dataStoreCode, parameters, callbackFunction) {
+ 		if(!parameters) {
+ 			parameters = {};
+ 		}
+ 		parameters["sessionToken"] = this.openbisServer.getSession();
 		this.openbisServer.createReportFromAggregationService(dataStoreCode, "newbrowserapi", parameters, callbackFunction);
 	}
 	

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormView.js

@@ -94,6 +94,25 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 		}
 		$wrapper.append(FormUtil.getFieldForLabelWithText(ownerName, owner));
 		
+		//
+		// Registration and modification info
+		//
+		if(this._dataSetFormModel.mode !== FormMode.CREATE) {
+			var registrationDetails = this._dataSetFormModel.dataSet.registrationDetails;
+			
+			var $registrator = FormUtil.getFieldForLabelWithText("Registrator", registrationDetails.userId);
+			$wrapper.append($registrator);
+			
+			var $registationDate = FormUtil.getFieldForLabelWithText("Registration Date", (new Date(registrationDetails.registrationDate)).toLocaleString())
+			$wrapper.append($registationDate);
+			
+			var $modifier = FormUtil.getFieldForLabelWithText("Modifier", registrationDetails.modifierUserId);
+			$wrapper.append($modifier);
+			
+			var $modificationDate = FormUtil.getFieldForLabelWithText("ModificationDate", (new Date(registrationDetails.modificationDate)).toLocaleString());
+			$wrapper.append($modificationDate);
+		}
+		
 		//Metadata Container
 		$wrapper.append($('<div>', { 'id' : 'metadataContainer'}));
 		

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormView.js

@@ -86,9 +86,6 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
 			$codeField.val(identifierParts[3]);
 			$codeField.hide();
 			$formColumn.append($codeField);
-			
-			$formColumn.append(FormUtil.getFieldForLabelWithText("Registrator", this._experimentFormModel.experiment.registrationDetails.userId));
-			$formColumn.append(FormUtil.getFieldForLabelWithText("Registration Date", (new Date(this._experimentFormModel.experiment.registrationDetails.registrationDate)).toLocaleString()));
 		} else if(this._experimentFormModel.mode === FormMode.CREATE){
 			var $codeField = FormUtil._getInputField("text", null, "code", null, true);
 			$codeField.keyup(function() {
@@ -123,6 +120,25 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
 			}
 		}
 		
+		//
+		// Registration and modification info
+		//
+		if(this._experimentFormModel.mode !== FormMode.CREATE) {
+			var registrationDetails = this._experimentFormModel.experiment.registrationDetails;
+			
+			var $registrator = FormUtil.getFieldForLabelWithText("Registrator", registrationDetails.userId);
+			$formColumn.append($registrator);
+			
+			var $registationDate = FormUtil.getFieldForLabelWithText("Registration Date", (new Date(registrationDetails.registrationDate)).toLocaleString())
+			$formColumn.append($registationDate);
+			
+			var $modifier = FormUtil.getFieldForLabelWithText("Modifier", registrationDetails.modifierUserId);
+			$formColumn.append($modifier);
+			
+			var $modificationDate = FormUtil.getFieldForLabelWithText("ModificationDate", (new Date(registrationDetails.modificationDate)).toLocaleString());
+			$formColumn.append($modificationDate);
+		}
+		
 		//
 		// Metadata Fields
 		//

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ProjectForm/ProjectFormView.js

@@ -113,15 +113,23 @@ function ProjectFormView(projectFormController, projectFormModel) {
 			$formColumn.append(FormUtil.getFieldForLabelWithText("Description", description));
 		}
 		
+		//
+		// Registration and modification info
+		//
 		if(this._projectFormModel.mode !== FormMode.CREATE) {
-			$formColumn.append(FormUtil.getFieldForLabelWithText("Registered By", this._projectFormModel.project.registrationDetails.userId));
-			$formColumn.append(FormUtil.getFieldForLabelWithText("Registration Date", new Date(this._projectFormModel.project.registrationDetails.registrationDate).toLocaleString()));
+			var registrationDetails = this._projectFormModel.project.registrationDetails;
 			
-			if(this._projectFormModel.project.registrationDetails.modificationDate) {
-				$formColumn.append(FormUtil.getFieldForLabelWithText("Modification Date", new Date(this._projectFormModel.project.registrationDetails.modificationDate).toLocaleString()));
-			} else {
-				$formColumn.append(FormUtil.getFieldForLabelWithText("Modification Date", "Never modified"));
-			}
+			var $registrator = FormUtil.getFieldForLabelWithText("Registrator", registrationDetails.userId);
+			$formColumn.append($registrator);
+			
+			var $registationDate = FormUtil.getFieldForLabelWithText("Registration Date", (new Date(registrationDetails.registrationDate)).toLocaleString())
+			$formColumn.append($registationDate);
+			
+			var $modifier = FormUtil.getFieldForLabelWithText("Modifier", registrationDetails.modifierUserId);
+			$formColumn.append($modifier);
+			
+			var $modificationDate = FormUtil.getFieldForLabelWithText("ModificationDate", (new Date(registrationDetails.modificationDate)).toLocaleString());
+			$formColumn.append($modificationDate);
 		}
 		
 		if(this._projectFormModel.mode !== FormMode.VIEW) {

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js

@@ -159,6 +159,26 @@ function SampleFormView(sampleFormController, sampleFormModel) {
 		if(profile.hideCodes) {
 			$codeField.hide();
 		}
+		
+		//
+		// Registration and modification info
+		//
+		if(this._sampleFormModel.mode !== FormMode.CREATE) {
+			var registrationDetails = this._sampleFormModel.sample.registrationDetails;
+			
+			var $registrator = FormUtil.getFieldForLabelWithText("Registrator", registrationDetails.userId);
+			$formColumn.append($registrator);
+			
+			var $registationDate = FormUtil.getFieldForLabelWithText("Registration Date", (new Date(registrationDetails.registrationDate)).toLocaleString())
+			$formColumn.append($registationDate);
+			
+			var $modifier = FormUtil.getFieldForLabelWithText("Modifier", registrationDetails.modifierUserId);
+			$formColumn.append($modifier);
+			
+			var $modificationDate = FormUtil.getFieldForLabelWithText("ModificationDate", (new Date(registrationDetails.modificationDate)).toLocaleString());
+			$formColumn.append($modificationDate);
+		}
+		
 		//
 		// LINKS TO PARENTS
 		//

plasmid/source/core-plugins/newbrowser/1/dss/reporting-plugins/newbrowserapi/script.py

@@ -30,10 +30,16 @@ def process(tr, parameters, tableBuilder):
 	
 	isOk = False;
 	
+	# Obtain the user using the dropbox
+	sessionToken = parameters.get("sessionToken"); #String
+	sessionId = sessionToken.split("-")[0]; #String
+	tr.setUserId(sessionId);
+	
 	if method == "init":
 		isOk = init(tr, parameters, tableBuilder);
 	if method == "registerUserPassword":
 		isOk = registerUserPassword(tr, parameters, tableBuilder);
+	
 	if method == "insertProject":
 		isOk = insertUpdateProject(tr, parameters, tableBuilder);
 	if method == "updateProject":