From 1e4926fb21d39c45ed8521e5a03269b39b598375 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 14 Oct 2014 08:00:16 +0000
Subject: [PATCH] SSDM-1038 ELN UI - PAPER - Moving older code
SVN: 32606
---
.../1/as/webapps/newbrowser/html/index.html | 14 +-
.../StickersNavigatorController.js | 25 --
.../StickersNavigatorModel.js | 19 --
.../StickersNavigatorView.js | 243 ------------------
4 files changed, 4 insertions(+), 297 deletions(-)
delete mode 100644 plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorController.js
delete mode 100644 plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorModel.js
delete mode 100644 plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorView.js
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/index.html b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/index.html
index 11536098af9..3b4be130788 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/index.html
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/index.html
@@ -90,10 +90,6 @@
<script type="text/javascript" src="./js/util/FormUtil.js"></script>
<script type="text/javascript" src="./js/util/BlockScrollUtil.js"></script>
- <script type="text/javascript" src="./js/views/legacy/Inspector.js"></script>
- <script type="text/javascript" src="./js/views/legacy/SampleHierarchy.js"></script>
- <script type="text/javascript" src="./js/views/legacy/SampleTable.js"></script>
-
<script type="text/javascript" src="./js/views/StorageManager/StorageManagerController.js"></script>
<script type="text/javascript" src="./js/views/StorageManager/StorageManagerModel.js"></script>
<script type="text/javascript" src="./js/views/StorageManager/StorageManagerView.js"></script>
@@ -103,12 +99,7 @@
<script type="text/javascript" src="./js/views/StorageManager/widgets/GridController.js"></script>
<script type="text/javascript" src="./js/views/StorageManager/widgets/GridModel.js"></script>
<script type="text/javascript" src="./js/views/StorageManager/widgets/GridView.js"></script>
- <!--
- <script type="text/javascript" src="./js/views/StickersNavigator/StickersNavigatorController.js"></script>
- <script type="text/javascript" src="./js/views/StickersNavigator/StickersNavigatorModel.js"></script>
- <script type="text/javascript" src="./js/views/StickersNavigator/StickersNavigatorView.js"></script>
- -->
-
+
<script type="text/javascript" src="./js/views/DataGrid/DataGridController.js"></script>
<script type="text/javascript" src="./js/views/DataGrid/DataGridModel.js"></script>
<script type="text/javascript" src="./js/views/DataGrid/DataGridView.js"></script>
@@ -142,6 +133,9 @@
<script type="text/javascript" src="./js/views/legacy/DataSetViewer.js"></script>
<script type="text/javascript" src="./js/views/legacy/SampleLinksWidget.js"></script>
<script type="text/javascript" src="./js/views/legacy/SideMenuWidget.js"></script>
+ <script type="text/javascript" src="./js/views/legacy/Inspector.js"></script>
+ <script type="text/javascript" src="./js/views/legacy/SampleHierarchy.js"></script>
+ <script type="text/javascript" src="./js/views/legacy/SampleTable.js"></script>
<script type="text/javascript">
//
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorController.js
deleted file mode 100644
index 3182ee2fd5d..00000000000
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorController.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-function StickersNavigatorController(mainController) {
- this._mainController = mainController;
- this._examineModel = new ExamineModel();
- this._examineView = new ExamineView(this._examineModel);
-
- this.init = function($container) {
- this._examineView.repaint($container);
- }
-}
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorModel.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorModel.js
deleted file mode 100644
index a20f4483db6..00000000000
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorModel.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-function StickersNavigatorModel() {
- this.inspectedEntities = new Array();
-}
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorView.js
deleted file mode 100644
index e691e597459..00000000000
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/StickersNavigator/StickersNavigatorView.js
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-function StickersNavigatorView(examineModel) {
- this._examineModel = examineModel;
-
- this.repaint = function($container) {
- $container.empty();
- $container.append("Hello world!");
- }
-
- this.getSampleRelationsLinks = function(parentsChildrenList, withLinks) {
- var allParentCodesByType = {};
-
- if(parentsChildrenList) {
- for(var i = 0; i < parentsChildrenList.length; i++) {
- var parent = parentsChildrenList[i];
- var parentsWithType = allParentCodesByType[parent.sampleTypeCode];
- if(parentsWithType === null || parentsWithType === undefined) {
- parentsWithType = new Array();
- }
- parentsWithType.push(parent);
-
- allParentCodesByType[parent.sampleTypeCode] = parentsWithType;
- }
- }
-
- var allParentCodesAsText = "";
-
- for(var sampleType in allParentCodesByType) {
- var displayName = mainController.profile.getSampleTypeForSampleTypeCode(sampleType).description;
- if(displayName === null) {
- displayName = sampleType;
- }
- allParentCodesAsText += displayName + ": ";
- var parents = allParentCodesByType[sampleType];
- for(var i = 0; i < parents.length; i++) {
- var parent = parents[i];
- if(withLinks) {
- allParentCodesAsText += "<a href=\"javascript:mainController.inspector.showSampleOnInspector('" + parent.permId + "');\">" + parent.code + "</a> ";
- } else {
- allParentCodesAsText += parent.code + " ";
- }
- }
- allParentCodesAsText += "</br>";
- }
-
- return allParentCodesAsText;
- }
-
- this.getSampleBlock = function(sample, showClose, withColors, withLinks, optionalTitle, isCondensed) {
- var defaultColor = null;
-
- if(!withColors) {
- defaultColor = "#ffffff"
- } else {
- defaultColor = mainController.profile.getColorForInspectors(sample.sampleTypeCode);
- }
-
- var inspector = "";
- var divID = sample.sampleTypeCode + "_" + sample.code + "_INSPECTOR";
-
- var inspectorClass = null;
- if(isCondensed) {
- inspectorClass = 'inspectorCondensed';
- } else {
- inspectorClass = 'inspector';
- }
-
- inspector += "<div id='"+divID+"' class='" + inspectorClass + "' style='background-color:" + defaultColor + ";' >";
-
- if(showClose) {
- var removeButton = "<span class='btn inspectorToolbar btn-default' style='float:left; margin: 2px' onclick='mainController.inspector.closeNewInspector(\""+sample.id+"\")'><i class='glyphicon glyphicon-remove'></i></span>";
- inspector += removeButton;
- }
-
- if(withLinks) {
- var toogleButton = "<span class='btn inspectorToolbar btn-default' style='float:left; margin: 2px' onclick='mainController.inspector.toogleInspector(\""+sample.permId+"_TOOGLE\")'><i id='"+sample.permId+"_TOOGLE_ICON' class='glyphicon glyphicon-chevron-up'></i></span>";
- inspector += toogleButton;
- }
-
- if(optionalTitle) {
- inspector += optionalTitle;
- } else {
- inspector += "<strong>" + sample.code + "</strong>";
- }
-
-
- if(withLinks) {
- var printButton = "<span class='btn btn-default inspectorToolbar' style='float:right; margin: 2px;' onclick='javascript:mainController.inspector.printInspector(\""+sample.permId+"\")'><i class='glyphicon glyphicon-print'></i></span>";
- inspector += printButton;
- var viewButton = "<span class='btn btn-default inspectorToolbar' style='float:right; margin: 2px' onclick='javascript:mainController.changeView(\"showViewSamplePageFromPermId\",\""+sample.permId+"\")'><i class='glyphicon glyphicon-edit'></i></span>";
- inspector += viewButton;
- var hierarchyButton = "<span class='btn btn-default inspectorToolbar' style='float:right; margin: 2px' onclick=\"javascript:mainController.changeView('showSampleHierarchyPage','"+sample.permId+"');\"><img src='./img/hierarchy-icon.png' style='width:16px; height:17px;' /></span>";
- inspector += hierarchyButton;
- }
-
- inspector += "<table id='" + sample.permId +"_TOOGLE' class='properties table table-condensed'>"
-
- //Show Properties following the order given on openBIS
- var sampleTypePropertiesCode = mainController.profile.getAllPropertiCodesForTypeCode(sample.sampleTypeCode);
- var sampleTypePropertiesDisplayName = mainController.profile.getPropertiesDisplayNamesForTypeCode(sample.sampleTypeCode, sampleTypePropertiesCode);
-
- for(var i = 0; i < sampleTypePropertiesCode.length; i++) {
-
- var propertyCode = sampleTypePropertiesCode[i];
- var propertyLabel = sampleTypePropertiesDisplayName[i];
- var propertyContent = sample.properties[propertyCode];
-
- //
- // Fix to show vocabulary labels instead of codes
- //
- var sampleType = mainController.profile.getSampleTypeForSampleTypeCode(sample.sampleTypeCode);
- var propertyType = mainController.profile.getPropertyTypeFrom(sampleType, propertyCode);
- if(propertyType && propertyType.dataType === "CONTROLLEDVOCABULARY") {
- var vocabulary = null;
- if(isNaN(propertyType.vocabulary)) {
- vocabulary = mainController.profile.getVocabularyById(propertyType.vocabulary.id);
- } else {
- vocabulary = mainController.profile.getVocabularyById(propertyType.vocabulary);
- }
-
- if(vocabulary) {
- for(var j = 0; j < vocabulary.terms.length; j++) {
- if(vocabulary.terms[j].code === propertyContent) {
- propertyContent = vocabulary.terms[j].label;
- break;
- }
- }
- }
- }
- // End Fix
-
- propertyContent = Util.getEmptyIfNull(propertyContent);
-
- var isSingleColumn = false;
- if((propertyContent instanceof String) || (typeof propertyContent === "string")) {
- var transformerResult = mainController.profile.inspectorContentTransformer(sample, propertyCode, propertyContent);
- isSingleColumn = transformerResult["isSingleColumn"];
- propertyContent = transformerResult["content"];
- propertyContent = propertyContent.replace(/\n/g, "<br />");
- }
-
- if(propertyContent !== "") {
- propertyContent = Util.replaceURLWithHTMLLinks(propertyContent);
- inspector += "<tr>";
-
- if(isSingleColumn) {
- inspector += "<td class='property' colspan='2'>"+propertyLabel+"<br />"+propertyContent+"</td>";
- } else {
- inspector += "<td class='property'>"+propertyLabel+"</td>";
- inspector += "<td class='property'>"+propertyContent+"</td>";
- }
-
- inspector += "</tr>";
- }
- }
-
- //Show Properties not found on openBIS (TO-DO Clean duplicated code)
- for(propertyCode in sample.properties) {
- if($.inArray(propertyCode, sampleTypePropertiesCode) === -1) {
- var propertyLabel = propertyCode;
- var propertyContent = sample.properties[propertyCode];
- propertyContent = Util.getEmptyIfNull(propertyContent);
-
- var isSingleColumn = false;
- if((propertyContent instanceof String) || (typeof propertyContent === "string")) {
- var transformerResult = mainController.profile.inspectorContentTransformer(sample, propertyCode, propertyContent);
- isSingleColumn = transformerResult["isSingleColumn"];
- propertyContent = transformerResult["content"];
- propertyContent = propertyContent.replace(/\n/g, "<br />");
- }
-
- if(propertyContent !== "") {
- inspector += "<tr>";
-
- if(isSingleColumn) {
- inspector += "<td class='property' colspan='2'>"+propertyLabel+"<br />"+propertyContent+"</td>";
- } else {
- inspector += "<td class='property'>"+propertyLabel+"</td>";
- inspector += "<td class='property'>"+propertyContent+"</td>";
- }
-
- inspector += "</tr>";
- }
- }
- }
-
- //Show Parent Codes
- var allParentCodesAsText = this.getSampleRelationsLinks(sample.parents, withLinks);
- if(allParentCodesAsText.length > 0) {
- inspector += "<tr>";
- inspector += "<td class='property'>Parents</td>";
- inspector += "<td class='property'>"+allParentCodesAsText+"</td>";
- inspector += "</tr>";
- }
-
- //Show Children Codes
- var allChildrenCodesAsText = this.getSampleRelationsLinks(sample.children, withLinks);
- if(allChildrenCodesAsText.length > 0) {
- inspector += "<tr>";
- inspector += "<td class='property'>Children</td>";
- inspector += "<td class='property'>"+allChildrenCodesAsText+"</td>";
- inspector += "</tr>";
- }
-
- //Show Modification Date
- inspector += "<tr>";
- inspector += "<td class='property'>Modification Date</td>";
- inspector += "<td class='property'>"+new Date(sample.registrationDetails["modificationDate"])+"</td>";
- inspector += "</tr>";
-
- //Show Creation Date
- inspector += "<tr>";
- inspector += "<td class='property'>Registration Date</td>";
- inspector += "<td class='property'>"+new Date(sample.registrationDetails["registrationDate"])+"</td>";
- inspector += "</tr>";
-
- inspector += "</table>"
-
- var extraContainerId = sample.sampleTypeCode + "_" + sample.code+"_INSPECTOR_EXTRA";
- inspector += "<div class='inspectorExtra' id='"+ extraContainerId + "'></div>";
- mainController.profile.inspectorContentExtra(extraContainerId, sample);
-
- inspector += "</div>"
-
-
- return inspector;
- }
-}
\ No newline at end of file
--
GitLab