From 64e36548be25710e83c2a249f30b7ba764a41dea Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 20 Jun 2014 07:25:12 +0000
Subject: [PATCH] SSDM-504: Some renaming.
SVN: 31743
---
.../as/webapps/newbrowser/html/js/config/Profile.js | 10 +++++-----
.../newbrowser/html/js/controllers/MainController.js | 6 +++---
.../as/webapps/newbrowser/html/js/views/Inspector.js | 4 ++--
.../webapps/newbrowser/html/js/views/SampleForm.js | 12 ++++++------
.../webapps/newbrowser/html/js/views/SampleTable.js | 10 +++++-----
.../newbrowser/html/js/widgets/SampleLinksWidget.js | 4 ++--
.../newbrowser/html/js/widgets/SideMenuWidget.js | 2 +-
.../as/webapps/newbrowser/html/js/widgets/Storage.js | 2 +-
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
index 1e6293d9030..c75115b7c37 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
@@ -212,7 +212,7 @@ $.extend(DefaultProfile.prototype, {
return null;
}
- this.getTypeForTypeCode = function(typeCode) {
+ this.getSampleTypeForSampleTypeCode = function(typeCode) {
for(var i = 0; i < this.allSampleTypes.length; i++) {
if(this.allSampleTypes[i].code === typeCode) {
return this.allSampleTypes[i];
@@ -235,7 +235,7 @@ $.extend(DefaultProfile.prototype, {
this.getAllPropertiCodesForTypeCode = function(typeCode) {
var allPropertiCodes = new Array();
- var sampleType = this.getTypeForTypeCode(typeCode);
+ var sampleType = this.getSampleTypeForSampleTypeCode(typeCode);
for(var i = 0; i < sampleType.propertyTypeGroups.length; i++) {
var propertyGroup = sampleType.propertyTypeGroups[i].propertyTypes;
for(var j = 0; j < propertyGroup.length; j++) {
@@ -248,7 +248,7 @@ $.extend(DefaultProfile.prototype, {
this.getPropertyDisplayNamesForTypeCode = function(sampleTypeCode, propertyTypeCode) {
var propertyDisplayName = "";
- var sampleType = this.getTypeForTypeCode(sampleTypeCode);
+ var sampleType = this.getSampleTypeForSampleTypeCode(sampleTypeCode);
for(var i = 0; i < sampleType.propertyTypeGroups.length; i++) {
var propertyGroup = sampleType.propertyTypeGroups[i].propertyTypes;
@@ -265,7 +265,7 @@ $.extend(DefaultProfile.prototype, {
this.getPropertiesDisplayNamesForTypeCode = function(sampleTypeCode, propertiesTypeCode) {
var allPropertiDisplayNames = new Array();
- var sampleType = this.getTypeForTypeCode(sampleTypeCode);
+ var sampleType = this.getSampleTypeForSampleTypeCode(sampleTypeCode);
for(var i = 0; i < propertiesTypeCode.length; i++) {
var propertyTypeCode = propertiesTypeCode[i];
@@ -1057,7 +1057,7 @@ $.extend(LSILabProfile.prototype, DefaultProfile.prototype, {
groupOfMenuItems = new GroupOfMenuItems(typeGroupCode,this.typeGroups[typeGroupCode]["DISPLAY_NAME"],[]);
for(var i = 0; i < this.typeGroups[typeGroupCode]["LIST"].length; i++) {
- var sampleType = this.getTypeForTypeCode(this.typeGroups[typeGroupCode]["LIST"][i]);
+ var sampleType = this.getSampleTypeForSampleTypeCode(this.typeGroups[typeGroupCode]["LIST"][i]);
if(sampleType !== null) {
var description = sampleType.code;
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
index 55fda151d6c..9cd3968e276 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
@@ -290,7 +290,7 @@ function MainController(profile) {
this._showSamplesPage = function(sampleTypeCode) {
//Update menu
- var sampleType = this.profile.getTypeForTypeCode(sampleTypeCode);
+ var sampleType = this.profile.getSampleTypeForSampleTypeCode(sampleTypeCode);
var sampleTypeDisplayName = sampleType.description;
if(sampleTypeDisplayName === null) {
sampleTypeDisplayName = sampleTypeCode;
@@ -316,7 +316,7 @@ function MainController(profile) {
this._showCreateSubExperimentPage = function(sampleTypeCode, experimentIdentifier) {
//Update menu
- var sampleTypeDisplayName = this.profile.getTypeForTypeCode(sampleTypeCode).description;
+ var sampleTypeDisplayName = this.profile.getSampleTypeForSampleTypeCode(sampleTypeCode).description;
if(sampleTypeDisplayName === null) {
sampleTypeDisplayName = sampleTypeCode;
}
@@ -329,7 +329,7 @@ function MainController(profile) {
this._showCreateSamplePage = function(sampleTypeCode) {
//Update menu
- var sampleTypeDisplayName = this.profile.getTypeForTypeCode(sampleTypeCode).description;
+ var sampleTypeDisplayName = this.profile.getSampleTypeForSampleTypeCode(sampleTypeCode).description;
if(sampleTypeDisplayName === null) {
sampleTypeDisplayName = sampleTypeCode;
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/Inspector.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/Inspector.js
index 3f0cb6a71c5..81aa96471f5 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/Inspector.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/Inspector.js
@@ -206,7 +206,7 @@ function Inspector(serverFacade, containerId, profile) {
var allParentCodesAsText = "";
for(var sampleType in allParentCodesByType) {
- var displayName = profile.getTypeForTypeCode(sampleType).description;
+ var displayName = profile.getSampleTypeForSampleTypeCode(sampleType).description;
if(displayName === null) {
displayName = sampleType;
}
@@ -288,7 +288,7 @@ function Inspector(serverFacade, containerId, profile) {
//
// Fix to show vocabulary labels instead of codes
//
- var sampleType = this.profile.getTypeForTypeCode(entity.sampleTypeCode);
+ var sampleType = this.profile.getSampleTypeForSampleTypeCode(entity.sampleTypeCode);
var propertyType = this.profile.getPropertyTypeFrom(sampleType, propertyCode);
if(propertyType && propertyType.dataType === "CONTROLLEDVOCABULARY") {
var vocabulary = null;
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
index e3ce2860c41..817fc5f0181 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
@@ -71,7 +71,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
Util.blockUI();
var localReference = this;
this.serverFacade.listSpacesWithProjectsAndRoleAssignments(null, function(data) {
- var sampleType = localReference.profile.getTypeForTypeCode(localReference.sampleTypeCode);
+ var sampleType = localReference.profile.getSampleTypeForSampleTypeCode(localReference.sampleTypeCode);
//Collection information
localReference.listSpacesWithProjectsAndRoleAssignmentsCallback(data);
@@ -123,7 +123,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
$("#sampleCode").prop('disabled', true);
//Populate fields
- var sampleType = localReference.profile.getTypeForTypeCode(localReference.sampleTypeCode);
+ var sampleType = localReference.profile.getSampleTypeForSampleTypeCode(localReference.sampleTypeCode);
for(var i = 0; i < sampleType.propertyTypeGroups.length; i++) {
var propertyTypeGroup = sampleType.propertyTypeGroups[i];
for(var j = 0; j < propertyTypeGroup.propertyTypes.length; j++) {
@@ -342,7 +342,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
this.repaint = function() {
$("#"+this.containerId).empty();
- var sampleType = profile.getTypeForTypeCode(this.sampleTypeCode);
+ var sampleType = profile.getSampleTypeForSampleTypeCode(this.sampleTypeCode);
var sampleTypeDisplayName = sampleType.description;
if(!sampleTypeDisplayName) {
@@ -640,7 +640,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
this.showSamplesWithoutPage = function(event) {
var sampleTypeCode = event.target.value;
- var sampleType = this.profile.getTypeForTypeCode(sampleTypeCode);
+ var sampleType = this.profile.getSampleTypeForSampleTypeCode(sampleTypeCode);
if(sampleType !== null) {
sampleTable = new SampleTable(this.serverFacade,"sampleSearchContainer", this.profile, sampleTypeCode, false, false, true, false, true);
@@ -654,7 +654,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
//Other properties
var properties = {};
- var sampleType = profile.getTypeForTypeCode(this.sampleTypeCode);
+ var sampleType = profile.getSampleTypeForSampleTypeCode(this.sampleTypeCode);
for(var i = 0; i < sampleType.propertyTypeGroups.length; i++) {
var propertyTypeGroup = sampleType.propertyTypeGroups[i];
for(var j = 0; j < propertyTypeGroup.propertyTypes.length; j++) {
@@ -815,7 +815,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
var errorMessage = stacktrace.substring(startIndex, endIndex).trim();
Util.showError(errorMessage, function() {Util.unblockUI();});
} else if (response.result.columns[0].title === "STATUS" && response.result.rows[0][0].value === "OK") { //Success Case
- var sampleType = profile.getTypeForTypeCode(this.sampleTypeCode);
+ var sampleType = profile.getSampleTypeForSampleTypeCode(this.sampleTypeCode);
var sampleTypeDisplayName = sampleType.description;
if(!sampleTypeDisplayName) {
sampleTypeDisplayName = this.sampleTypeCode;
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
index 6a0412d3de8..763cbfe215f 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
@@ -169,7 +169,7 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe
if(this.isSearch) {
component += "<h1>Search Results</h1>";
} else {
- var sampleType = this.profile.getTypeForTypeCode(this.sampleTypeCode);
+ var sampleType = this.profile.getSampleTypeForSampleTypeCode(this.sampleTypeCode);
var sampleTypeDisplayName = Util.getEmptyIfNull(sampleType.description);
if(sampleTypeDisplayName === "") {
sampleTypeDisplayName = sampleType.code;
@@ -256,7 +256,7 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe
//
// Fix to use vocabulary labels instead of codes
//
- var sampleType = localReference.profile.getTypeForTypeCode(localReference.sampleTypeCode);
+ var sampleType = localReference.profile.getSampleTypeForSampleTypeCode(localReference.sampleTypeCode);
var propertyType = localReference.profile.getPropertyTypeFrom(sampleType, propertyCode);
if(!propertyType) {
propertyType = localReference.profile.getPropertyTypeFrom(sampleType, propertyCode.replace('$',''));
@@ -374,7 +374,7 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe
var searchText = $('#search').val();
var searchRegexpText = ("*" + searchText + "*").replace(/\*/g, ".*");
var searchRegexp = new RegExp(searchRegexpText, "i");
- var sampleType = this.profile.getTypeForTypeCode(this.sampleTypeCode);
+ var sampleType = this.profile.getSampleTypeForSampleTypeCode(this.sampleTypeCode);
var localReference = this;
selection.enter()
@@ -518,7 +518,7 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe
if (!this.isEmbedded && !this.isSearch) {
$("#paginationContainerTop").append("<span class='toolBox' id='toolBoxContainer'></span>");
- var sampleType = this.profile.getTypeForTypeCode(this.sampleTypeCode);
+ var sampleType = this.profile.getSampleTypeForSampleTypeCode(this.sampleTypeCode);
var sampleTypeDisplayName = Util.getEmptyIfNull(sampleType.description);
if(sampleTypeDisplayName === "") {
sampleTypeDisplayName = sampleType.code;
@@ -710,7 +710,7 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe
//
// Fix to use vocabulary labels instead of codes
//
- var sampleType = this.profile.getTypeForTypeCode(this.sampleTypeCode);
+ var sampleType = this.profile.getSampleTypeForSampleTypeCode(this.sampleTypeCode);
var propertyType = this.profile.getPropertyTypeFrom(sampleType, propertyCode);
if(!propertyType) {
propertyType = this.profile.getPropertyTypeFrom(sampleType, propertyCode.replace('$',''));
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
index bdd99c086d6..cd86701c40c 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
@@ -170,7 +170,7 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
var _this = this;
$("#sampleTypeSelector").on("change", function(event) {
var sampleTypeCode = $("#sampleTypeSelector")[0].value;
- var sampleType = _this.profile.getTypeForTypeCode(sampleTypeCode);
+ var sampleType = _this.profile.getSampleTypeForSampleTypeCode(sampleTypeCode);
if(sampleType !== null) {
if(_this._lastUsedId) {
@@ -263,7 +263,7 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
$buttonTextField.click(function(elem) {
var $buttonClicked = $(elem);
var sampleTypeCode = sampleTypeHint["TYPE"];
- var sampleType = _this.profile.getTypeForTypeCode(sampleTypeCode);
+ var sampleType = _this.profile.getSampleTypeForSampleTypeCode(sampleTypeCode);
if(sampleType !== null) {
//Clear last state
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
index 6a29716bfa6..53211242cbe 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
@@ -171,7 +171,7 @@ function SideMenuWidget(mainController, containerId, serverFacade) {
}
for(var i = 0; i < typeGroups[typeGroupCode]["LIST"].length; i++) {
- var sampleType = profile.getTypeForTypeCode(typeGroups[typeGroupCode]["LIST"][i]);
+ var sampleType = profile.getSampleTypeForSampleTypeCode(typeGroups[typeGroupCode]["LIST"][i]);
if(sampleType !== null) {
var description = Util.getEmptyIfNull(sampleType.description);
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/Storage.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/Storage.js
index d660ec013ea..b03c3b7d14f 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/Storage.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/Storage.js
@@ -30,7 +30,7 @@ function Storage(serverFacade, containerId, profile, sampleTypeCode, sample, isD
this.serverFacade = serverFacade;
this.containerId = containerId;
this.profile = profile;
- this.sampleType = profile.getTypeForTypeCode(sampleTypeCode);
+ this.sampleType = profile.getSampleTypeForSampleTypeCode(sampleTypeCode);
this.isStorageAvailable = false;
this.sample = sample; // Needed for edit mode
this.isDisabled = isDisabled; //Needed for view mode
--
GitLab