-
Mapping Version History
+ {% if mapping.owner_type == 'Organization' %}
+ {% url 'mapping-diff-version' org=mapping.owner source=mapping.source mapping=mapping.id as mapping_version_diff_url %}
+ {% else %}
+ {% url 'mapping-diff-version' user=mapping.owner source=mapping.source mapping=mapping.id as mapping_version_diff_url %}
+ {% endif %}
+
+ {{ mapping_version_diff_url }}
+
{% for mapping_version in mapping_versions %}
@@ -46,10 +54,71 @@
None Mapping Version History .
+
+
+
{% endblock tab-content %}
diff --git a/ocl_web/templates/mappings/mappings_diff.html b/ocl_web/templates/mappings/mappings_diff.html
new file mode 100644
index 00000000..10ac9e70
--- /dev/null
+++ b/ocl_web/templates/mappings/mappings_diff.html
@@ -0,0 +1,88 @@
+{% extends "mappings/mapping_base.html" %}
+{% load i18n %}
+{% load ocl_tags %}
+{% load bootstrap3 %}
+
+{% block resource-tabs %}
+{% endblock resource-tabs %}
+
+{% block tab-content %}
+
+
+
+
+
+
+{% endblock tab-content %}
+
+
+{% block extrajavascript %}
+
+
+{% endblock %}
+
+
+{% block resource-debug %}
+
URL kwargs {{ kwargs|pprint }}
+
URL Parameters {{ url_params|pprint }}
+
Mapping {{ mapping|pprint }}
+{% endblock resource-debug %}
+
From 84ecba68cf1e62609e0a29f2635e78a6ed028e3a Mon Sep 17 00:00:00 2001
From: hao555sky <836095186@qq.com>
Date: Fri, 18 Aug 2017 21:55:56 +0800
Subject: [PATCH 3/4] implement the function that get all mappings with any
source
---
ocl_web/apps/concepts/views.py | 89 +-
ocl_web/apps/sources/views.py | 14 -
ocl_web/config/users_urls.py | 6 +-
ocl_web/static/css/bootstrap-multiselect.css | 1 +
ocl_web/static/js/bootstrap-multiselect.js | 1716 +++++++++++++++++
ocl_web/static/js/project.js | 7 +
ocl_web/static/js/springy.js | 731 +++++++
ocl_web/static/js/springyui.js | 394 ++++
ocl_web/templates/base.html | 4 +
ocl_web/templates/concepts/concept_base.html | 4 +
.../concepts/concept_relationship.html | 186 ++
11 files changed, 3134 insertions(+), 18 deletions(-)
create mode 100644 ocl_web/static/css/bootstrap-multiselect.css
create mode 100644 ocl_web/static/js/bootstrap-multiselect.js
create mode 100644 ocl_web/static/js/springy.js
create mode 100755 ocl_web/static/js/springyui.js
create mode 100644 ocl_web/templates/concepts/concept_relationship.html
diff --git a/ocl_web/apps/concepts/views.py b/ocl_web/apps/concepts/views.py
index fc9f8f4d..4a16917f 100644
--- a/ocl_web/apps/concepts/views.py
+++ b/ocl_web/apps/concepts/views.py
@@ -39,6 +39,9 @@ def get_concept_details(self, owner_type, owner_id, source_id, concept_id,
""" Get the concept details. """
# TODO(paynejd@gmail.com): Validate input parameters
+ print('source_version_id: \n', source_version_id)
+ print('concept_version_id: \n', concept_version_id)
+
# Setup request parameters
params = {}
if include_mappings:
@@ -54,18 +57,21 @@ def get_concept_details(self, owner_type, owner_id, source_id, concept_id,
raise ValueError(
'Must specify only a source version or a concept version. Both were specified.')
elif source_version_id:
+ print('11111')
search_response = api.get(
owner_type, owner_id,
'sources', source_id, source_version_id,
'concepts', concept_id,
params=params)
elif concept_version_id:
+ print('22222')
search_response = api.get(
owner_type, owner_id,
'sources', source_id,
'concepts', concept_id, concept_version_id,
params=params)
else:
+ print('33333')
search_response = api.get(
owner_type, owner_id,
'sources', source_id,
@@ -76,8 +82,8 @@ def get_concept_details(self, owner_type, owner_id, source_id, concept_id,
elif search_response.status_code != 200:
search_response.raise_for_status()
- # print('search_response: ', search_response.json())
- # print('search_response type: ', type(search_response))
+ # print('search_response:\n ', search_response.json())
+ # print('search_response type: ', type(search_response))
# print('search_response json type: ', type(search_response.json()))
return search_response.json()
@@ -133,7 +139,9 @@ def get_context_data(self, *args, **kwargs):
source_version_id=self.source_version_id, concept_version_id=self.concept_version_id,
include_mappings=True, include_inverse_mappings=True)
- print('concept type: ', type(concept));
+ print('concept type: ', type(concept))
+ print('source_version_id: \n', self.source_version_id)
+ print('concept_version_id: \n', self.concept_version_id)
concept['has_direct_mappings'] = False
concept['has_inverse_mappings'] = False
@@ -386,6 +394,81 @@ def form_valid(self, form, *args, **kwargs):
return super(ConceptMappingsView, self).form_invalid(form)
+class ConceptRelationshipView(UserOrOrgMixin, ConceptReadBaseView):
+ template_name = "concepts/concept_relationship.html"
+
+ def get_context_data(self, *args, **kwargs):
+ """
+ Loads the concept details.
+ """
+ # Setup the context and args
+ context = super(ConceptRelationshipView, self).get_context_data(*args, **kwargs)
+ self.get_args()
+
+ api = OclApi(self.request, debug=True, facets=True)
+
+ selected_sources = self.request.GET.getlist('selected_source')
+ print('selected_sources: ', selected_sources)
+
+ print(len(selected_sources))
+
+ mappings = []
+
+ # Load the concept details
+ concept = self.get_concept_details(
+ self.owner_type, self.owner_id, self.source_id, self.concept_id,
+ source_version_id=self.source_version_id, concept_version_id=self.concept_version_id,
+ include_mappings=True, include_inverse_mappings=True)
+
+ mappings.extend(concept['mappings'])
+
+ if len(selected_sources) != 0:
+ for source_id in selected_sources:
+ search_response = api.get(self.owner_type, self.owner_id, 'sources', source_id, 'mappings')
+ for mapping in search_response.json()['results']:
+ if (self.proper_owner_type == mapping['to_source_owner_type'] and
+ self.owner_id == mapping['to_source_owner'] and
+ self.source_id == mapping['to_source_name'] and
+ self.concept_id == mapping['to_concept_code']):
+ mapping['is_inverse_mapping'] = True
+ concept['has_inverse_mappings'] = True
+ mapping['is_direct_mapping'] = False
+ else:
+ mapping['is_direct_mapping'] = True
+ mapping['is_inverse_mapping'] = False
+ concept['has_direct_mappings'] = True
+ if mapping['to_concept_url']:
+ mapping['is_internal_mapping'] = True
+ mapping['is_external_mapping'] = False
+ else:
+ mapping['is_internal_mapping'] = False
+ mapping['is_external_mapping'] = True
+
+ print('search_response : ', mapping)
+ mappings.extend(search_response.json()['results'])
+ print('\n\n')
+
+ if self.request.user.is_authenticated():
+ context['all_collections'] = api.get_all_collections_for_user(self.request.user.username)
+
+ all_sources = _get_org_or_user_sources_list2(self.request, str(self.request.user))
+
+ print('mappings: ', mappings)
+ print('\n\n')
+
+ # Set the context
+ context['kwargs'] = self.kwargs
+ context['url_params'] = self.request.GET
+ context['selected_tab'] = 'Relationship'
+ context['concept'] = concept
+ context['mappings'] = json.dumps(mappings)
+ context['all_sources'] = all_sources
+
+ print('\n ConceptRelationshipView concept: ', concept)
+
+ return context
+
+
# CLEAN
class ConceptHistoryView(UserOrOrgMixin, ConceptReadBaseView):
"""
diff --git a/ocl_web/apps/sources/views.py b/ocl_web/apps/sources/views.py
index 9ea68b98..5e8c4ee8 100644
--- a/ocl_web/apps/sources/views.py
+++ b/ocl_web/apps/sources/views.py
@@ -27,7 +27,6 @@
logger = logging.getLogger('oclweb')
-
class SourceReadBaseView(TemplateView):
""" Base class for Source Read views. """
@@ -181,7 +180,6 @@ def get_source_extrefs(self, owner_type, owner_id, source_id,
return searcher
-
class SourceDetailsView(UserOrOrgMixin, SourceReadBaseView):
""" Source Details view. """
template_name = "sources/source_details.html"
@@ -205,7 +203,6 @@ def get_context_data(self, *args, **kwargs):
return context
-
class SourceAboutView(UserOrOrgMixin, SourceReadBaseView):
""" Source About view. """
template_name = "sources/source_about.html"
@@ -238,7 +235,6 @@ def get_context_data(self, *args, **kwargs):
return context
-
class SourceConceptsView(UserOrOrgMixin, SourceReadBaseView):
""" Source Concepts view. """
template_name = "sources/source_concepts.html"
@@ -338,7 +334,6 @@ def get(self, request, *args, **kwargs):
return super(SourceConceptsView, self).get(self, *args, **kwargs)
-
class SourceMappingsView(UserOrOrgMixin, SourceReadBaseView):
""" Source Mappings view. """
template_name = "sources/source_mappings.html"
@@ -434,7 +429,6 @@ def get(self, request, *args, **kwargs):
return super(SourceMappingsView, self).get(self, *args, **kwargs)
-
class SourceExternalReferencesView(UserOrOrgMixin, SourceReadBaseView):
""" Source External References view. """
template_name = "sources/source_extrefs.html"
@@ -497,7 +491,6 @@ def get_context_data(self, *args, **kwargs):
return context
-
class SourceVersionsView(UserOrOrgMixin, SourceReadBaseView):
""" Source Versions view. """
template_name = "sources/source_versions.html"
@@ -552,7 +545,6 @@ def get(self, request, *args, **kwargs):
return super(SourceVersionsView, self).get(self, *args, **kwargs)
-
class SourceVersionsNewView(LoginRequiredMixin, UserOrOrgMixin, FormView):
""" View to Create new source version """
form_class = SourceVersionsNewForm
@@ -638,7 +630,6 @@ def form_valid(self, form):
return HttpResponseRedirect(self.request.path)
-
class SourceVersionsEditView(LoginRequiredMixin, UserOrOrgMixin, FormView):
""" View to edit source version """
form_class = SourceVersionsEditForm
@@ -702,7 +693,6 @@ def form_valid(self, form):
return HttpResponseRedirect(self.request.path)
-
class SourceVersionsRetireView(LoginRequiredMixin, UserOrOrgMixin, FormView):
""" View to retire source version """
form_class = SourceVersionsRetireForm
@@ -713,7 +703,6 @@ def get_initial(self):
pass
-
class SourceNewView(LoginRequiredMixin, UserOrOrgMixin, FormView):
""" View to create new source """
form_class = SourceNewForm
@@ -797,7 +786,6 @@ def form_valid(self, form):
return HttpResponseRedirect(self.request.path)
-
class SourceEditView(UserOrOrgMixin, FormView):
""" Edit source, either for an org or a user. """
template_name = "sources/source_edit.html"
@@ -937,7 +925,6 @@ def form_valid(self, form, *args, **kwargs):
return HttpResponseRedirect(self.get_success_url())
-
class SourceVersionEditJsonView(UserOrOrgMixin, TemplateView):
def put(self, request, *args, **kwargs):
api = OclApi(self.request, debug=True)
@@ -959,7 +946,6 @@ def put(self, request, *args, **kwargs):
return HttpResponse(res.content, status=res.status_code)
-
class SourceVersionDeleteView(UserOrOrgMixin, TemplateView):
""" source version delete view"""
diff --git a/ocl_web/config/users_urls.py b/ocl_web/config/users_urls.py
index 83dab14b..80f8bec3 100644
--- a/ocl_web/config/users_urls.py
+++ b/ocl_web/config/users_urls.py
@@ -21,7 +21,7 @@
SourceNewView, SourceEditView, SourceVersionsView, SourceExternalReferencesView,
SourceVersionsNewView, SourceVersionsEditView, SourceVersionsRetireView, SourceDeleteView, SourceVersionDeleteView, SourceVersionEditJsonView)
from apps.concepts.views import (
- ConceptDetailsView, ConceptMappingsView, ConceptHistoryView, ConceptEditView, ConceptDiffView,
+ ConceptDetailsView, ConceptMappingsView, ConceptHistoryView, ConceptRelationshipView, ConceptEditView, ConceptDiffView,
ConceptRetireView, ConceptNewView, ConceptForkView, ConceptDescView, ConceptNameView)
from apps.mappings.views import (
MappingDetailsView, MappingNewView, MappingForkView, MappingEditView, MappingRetireView, MappingVersionsView,
@@ -166,6 +166,10 @@
url(r'^(?P
[a-zA-Z0-9\-\.]+)/sources/(?P[a-zA-Z0-9\-\.]+)/concepts/(?P[a-zA-Z0-9\-\.]+)/history/$', # pylint: disable=C0301
ConceptHistoryView.as_view(), name='concept-history'),
+ # /users/:user/sources/:source/concepts/:concept/relationship/
+ url(r'^(?P[a-zA-Z0-9\-\.]+)/sources/(?P[a-zA-Z0-9\-\.]+)/concepts/(?P[a-zA-Z0-9\-\.]+)/relationship/$', # pylint: disable=C0301
+ ConceptRelationshipView.as_view(), name='concept-relationship'),
+
# /users/:user/sources/:source/concepts/:concept/diff/
url(r'^(?P[a-zA-Z0-9\-\.]+)/sources/(?P[a-zA-Z0-9\-\.]+)/concepts/(?P[a-zA-Z0-9\-\.]+)/diff/$', # pylint: disable=C0301
ConceptDiffView.as_view(), name='concept-version-diff'),
diff --git a/ocl_web/static/css/bootstrap-multiselect.css b/ocl_web/static/css/bootstrap-multiselect.css
new file mode 100644
index 00000000..5acaf9f7
--- /dev/null
+++ b/ocl_web/static/css/bootstrap-multiselect.css
@@ -0,0 +1 @@
+span.multiselect-native-select{position:relative}span.multiselect-native-select select{border:0!important;clip:rect(0 0 0 0)!important;height:1px!important;margin:-1px -1px -1px -3px!important;overflow:hidden!important;padding:0!important;position:absolute!important;width:1px!important;left:50%;top:30px}.multiselect-container{position:absolute;list-style-type:none;margin:0;padding:0}.multiselect-container .input-group{margin:5px}.multiselect-container>li{padding:0}.multiselect-container>li>a.multiselect-all label{font-weight:700}.multiselect-container>li.multiselect-group label{margin:0;padding:3px 20px 3px 20px;height:100%;font-weight:700}.multiselect-container>li.multiselect-group-clickable label{cursor:pointer}.multiselect-container>li>a{padding:0}.multiselect-container>li>a>label{margin:0;height:100%;cursor:pointer;font-weight:400;padding:3px 20px 3px 40px}.multiselect-container>li>a>label.radio,.multiselect-container>li>a>label.checkbox{margin:0}.multiselect-container>li>a>label>input[type=checkbox]{margin-bottom:5px}.btn-group>.btn-group:nth-child(2)>.multiselect.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.form-inline .multiselect-container label.checkbox,.form-inline .multiselect-container label.radio{padding:3px 20px 3px 40px}.form-inline .multiselect-container li a label.checkbox input[type=checkbox],.form-inline .multiselect-container li a label.radio input[type=radio]{margin-left:-20px;margin-right:0}
diff --git a/ocl_web/static/js/bootstrap-multiselect.js b/ocl_web/static/js/bootstrap-multiselect.js
new file mode 100644
index 00000000..9a50a18a
--- /dev/null
+++ b/ocl_web/static/js/bootstrap-multiselect.js
@@ -0,0 +1,1716 @@
+/**
+ * Bootstrap Multiselect (https://github.com/davidstutz/bootstrap-multiselect)
+ *
+ * Apache License, Version 2.0:
+ * Copyright (c) 2012 - 2015 David Stutz
+ *
+ * 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.
+ *
+ * BSD 3-Clause License:
+ * Copyright (c) 2012 - 2015 David Stutz
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * - Neither the name of David Stutz nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+!function ($) {
+ "use strict";// jshint ;_;
+
+ if (typeof ko !== 'undefined' && ko.bindingHandlers && !ko.bindingHandlers.multiselect) {
+ ko.bindingHandlers.multiselect = {
+ after: ['options', 'value', 'selectedOptions', 'enable', 'disable'],
+
+ init: function(element, valueAccessor, allBindings, viewModel, bindingContext) {
+ var $element = $(element);
+ var config = ko.toJS(valueAccessor());
+
+ $element.multiselect(config);
+
+ if (allBindings.has('options')) {
+ var options = allBindings.get('options');
+ if (ko.isObservable(options)) {
+ ko.computed({
+ read: function() {
+ options();
+ setTimeout(function() {
+ var ms = $element.data('multiselect');
+ if (ms)
+ ms.updateOriginalOptions();//Not sure how beneficial this is.
+ $element.multiselect('rebuild');
+ }, 1);
+ },
+ disposeWhenNodeIsRemoved: element
+ });
+ }
+ }
+
+ //value and selectedOptions are two-way, so these will be triggered even by our own actions.
+ //It needs some way to tell if they are triggered because of us or because of outside change.
+ //It doesn't loop but it's a waste of processing.
+ if (allBindings.has('value')) {
+ var value = allBindings.get('value');
+ if (ko.isObservable(value)) {
+ ko.computed({
+ read: function() {
+ value();
+ setTimeout(function() {
+ $element.multiselect('refresh');
+ }, 1);
+ },
+ disposeWhenNodeIsRemoved: element
+ }).extend({ rateLimit: 100, notifyWhenChangesStop: true });
+ }
+ }
+
+ //Switched from arrayChange subscription to general subscription using 'refresh'.
+ //Not sure performance is any better using 'select' and 'deselect'.
+ if (allBindings.has('selectedOptions')) {
+ var selectedOptions = allBindings.get('selectedOptions');
+ if (ko.isObservable(selectedOptions)) {
+ ko.computed({
+ read: function() {
+ selectedOptions();
+ setTimeout(function() {
+ $element.multiselect('refresh');
+ }, 1);
+ },
+ disposeWhenNodeIsRemoved: element
+ }).extend({ rateLimit: 100, notifyWhenChangesStop: true });
+ }
+ }
+
+ var setEnabled = function (enable) {
+ setTimeout(function () {
+ if (enable)
+ $element.multiselect('enable');
+ else
+ $element.multiselect('disable');
+ });
+ };
+
+ if (allBindings.has('enable')) {
+ var enable = allBindings.get('enable');
+ if (ko.isObservable(enable)) {
+ ko.computed({
+ read: function () {
+ setEnabled(enable());
+ },
+ disposeWhenNodeIsRemoved: element
+ }).extend({ rateLimit: 100, notifyWhenChangesStop: true });
+ } else {
+ setEnabled(enable);
+ }
+ }
+
+ if (allBindings.has('disable')) {
+ var disable = allBindings.get('disable');
+ if (ko.isObservable(disable)) {
+ ko.computed({
+ read: function () {
+ setEnabled(!disable());
+ },
+ disposeWhenNodeIsRemoved: element
+ }).extend({ rateLimit: 100, notifyWhenChangesStop: true });
+ } else {
+ setEnabled(!disable);
+ }
+ }
+
+ ko.utils.domNodeDisposal.addDisposeCallback(element, function() {
+ $element.multiselect('destroy');
+ });
+ },
+
+ update: function(element, valueAccessor, allBindings, viewModel, bindingContext) {
+ var $element = $(element);
+ var config = ko.toJS(valueAccessor());
+
+ $element.multiselect('setOptions', config);
+ $element.multiselect('rebuild');
+ }
+ };
+ }
+
+ function forEach(array, callback) {
+ for (var index = 0; index < array.length; ++index) {
+ callback(array[index], index);
+ }
+ }
+
+ /**
+ * Constructor to create a new multiselect using the given select.
+ *
+ * @param {jQuery} select
+ * @param {Object} options
+ * @returns {Multiselect}
+ */
+ function Multiselect(select, options) {
+
+ this.$select = $(select);
+ this.options = this.mergeOptions($.extend({}, options, this.$select.data()));
+
+ // Placeholder via data attributes
+ if (this.$select.attr("data-placeholder")) {
+ this.options.nonSelectedText = this.$select.data("placeholder");
+ }
+
+ // Initialization.
+ // We have to clone to create a new reference.
+ this.originalOptions = this.$select.clone()[0].options;
+ this.query = '';
+ this.searchTimeout = null;
+ this.lastToggledInput = null;
+
+ this.options.multiple = this.$select.attr('multiple') === "multiple";
+ this.options.onChange = $.proxy(this.options.onChange, this);
+ this.options.onSelectAll = $.proxy(this.options.onSelectAll, this);
+ this.options.onDeselectAll = $.proxy(this.options.onDeselectAll, this);
+ this.options.onDropdownShow = $.proxy(this.options.onDropdownShow, this);
+ this.options.onDropdownHide = $.proxy(this.options.onDropdownHide, this);
+ this.options.onDropdownShown = $.proxy(this.options.onDropdownShown, this);
+ this.options.onDropdownHidden = $.proxy(this.options.onDropdownHidden, this);
+ this.options.onInitialized = $.proxy(this.options.onInitialized, this);
+ this.options.onFiltering = $.proxy(this.options.onFiltering, this);
+
+ // Build select all if enabled.
+ this.buildContainer();
+ this.buildButton();
+ this.buildDropdown();
+ this.buildSelectAll();
+ this.buildDropdownOptions();
+ this.buildFilter();
+
+ this.updateButtonText();
+ this.updateSelectAll(true);
+
+ if (this.options.enableClickableOptGroups && this.options.multiple) {
+ this.updateOptGroups();
+ }
+
+ this.options.wasDisabled = this.$select.prop('disabled');
+ if (this.options.disableIfEmpty && $('option', this.$select).length <= 0) {
+ this.disable();
+ }
+
+ this.$select.wrap('
',
+ dropRight: false,
+ dropUp: false,
+ selectedClass: 'active',
+ // Maximum height of the dropdown menu.
+ // If maximum height is exceeded a scrollbar will be displayed.
+ maxHeight: false,
+ includeSelectAllOption: false,
+ includeSelectAllIfMoreThan: 0,
+ selectAllText: ' Select all',
+ selectAllValue: 'multiselect-all',
+ selectAllName: false,
+ selectAllNumber: true,
+ selectAllJustVisible: true,
+ enableFiltering: false,
+ enableCaseInsensitiveFiltering: false,
+ enableFullValueFiltering: false,
+ enableClickableOptGroups: false,
+ enableCollapsibleOptGroups: false,
+ filterPlaceholder: 'Search',
+ // possible options: 'text', 'value', 'both'
+ filterBehavior: 'text',
+ includeFilterClearBtn: true,
+ preventInputChangeEvent: false,
+ nonSelectedText: 'None selected',
+ nSelectedText: 'selected',
+ allSelectedText: 'All selected',
+ numberDisplayed: 3,
+ disableIfEmpty: false,
+ disabledText: '',
+ delimiterText: ', ',
+ templates: {
+ button: '
done callback is never executed.
+ * At least the built-in ForceDirected layout behaves in this way.
+ *
+ * @param done An optional callback function that gets executed when the springy algorithm stops,
+ * either because it ended or because stop() was called.
+ */
+ Renderer.prototype.start = function(done) {
+ var t = this;
+ this.layout.start(function render() {
+ t.clear();
+
+ t.layout.eachEdge(function(edge, spring) {
+ t.drawEdge(edge, spring.point1.p, spring.point2.p);
+ });
+
+ t.layout.eachNode(function(node, point) {
+ t.drawNode(node, point.p);
+ });
+ }, this.onRenderStop, this.onRenderStart);
+ };
+
+ Renderer.prototype.stop = function() {
+ this.layout.stop();
+ };
+
+ // Array.forEach implementation for IE support..
+ //https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/forEach
+ if ( !Array.prototype.forEach ) {
+ Array.prototype.forEach = function( callback, thisArg ) {
+ var T, k;
+ if ( this == null ) {
+ throw new TypeError( " this is null or not defined" );
+ }
+ var O = Object(this);
+ var len = O.length >>> 0; // Hack to convert O.length to a UInt32
+ if ( {}.toString.call(callback) != "[object Function]" ) {
+ throw new TypeError( callback + " is not a function" );
+ }
+ if ( thisArg ) {
+ T = thisArg;
+ }
+ k = 0;
+ while( k < len ) {
+ var kValue;
+ if ( k in O ) {
+ kValue = O[ k ];
+ callback.call( T, kValue, k, O );
+ }
+ k++;
+ }
+ };
+ }
+
+ var isEmpty = function(obj) {
+ for (var k in obj) {
+ if (obj.hasOwnProperty(k)) {
+ return false;
+ }
+ }
+ return true;
+ };
+
+ return Springy;
+}));
diff --git a/ocl_web/static/js/springyui.js b/ocl_web/static/js/springyui.js
new file mode 100755
index 00000000..acc35eb7
--- /dev/null
+++ b/ocl_web/static/js/springyui.js
@@ -0,0 +1,394 @@
+/**
+Copyright (c) 2010 Dennis Hotson
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+(function() {
+
+jQuery.fn.springy = function(params) {
+ var graph = this.graph = params.graph || new Springy.Graph();
+ var nodeFont = "16px Verdana, sans-serif";
+ var edgeFont = "8px Verdana, sans-serif";
+ var stiffness = params.stiffness || 400.0;
+ var repulsion = params.repulsion || 400.0;
+ var damping = params.damping || 0.5;
+ var minEnergyThreshold = params.minEnergyThreshold || 0.00001;
+ var nodeSelected = params.nodeSelected || null;
+ var nodeImages = {};
+ var edgeLabelsUpright = true;
+
+ var canvas = this[0];
+ var ctx = canvas.getContext("2d");
+
+ var layout = this.layout = new Springy.Layout.ForceDirected(graph, stiffness, repulsion, damping, minEnergyThreshold);
+
+ // calculate bounding box of graph layout.. with ease-in
+ var currentBB = layout.getBoundingBox();
+ var targetBB = {bottomleft: new Springy.Vector(-2, -2), topright: new Springy.Vector(2, 2)};
+
+ // auto adjusting bounding box
+ Springy.requestAnimationFrame(function adjust() {
+ targetBB = layout.getBoundingBox();
+ // current gets 20% closer to target every iteration
+ currentBB = {
+ bottomleft: currentBB.bottomleft.add( targetBB.bottomleft.subtract(currentBB.bottomleft)
+ .divide(10)),
+ topright: currentBB.topright.add( targetBB.topright.subtract(currentBB.topright)
+ .divide(10))
+ };
+
+ Springy.requestAnimationFrame(adjust);
+ });
+
+ // convert to/from screen coordinates
+ var toScreen = function(p) {
+ var size = currentBB.topright.subtract(currentBB.bottomleft);
+ var sx = p.subtract(currentBB.bottomleft).divide(size.x).x * canvas.width;
+ var sy = p.subtract(currentBB.bottomleft).divide(size.y).y * canvas.height;
+ return new Springy.Vector(sx, sy);
+ };
+
+ var fromScreen = function(s) {
+ var size = currentBB.topright.subtract(currentBB.bottomleft);
+ var px = (s.x / canvas.width) * size.x + currentBB.bottomleft.x;
+ var py = (s.y / canvas.height) * size.y + currentBB.bottomleft.y;
+ return new Springy.Vector(px, py);
+ };
+
+ // half-assed drag and drop
+ var selected = null;
+ var nearest = null;
+ var dragged = null;
+
+ jQuery(canvas).mousedown(function(e) {
+ var pos = jQuery(this).offset();
+ var p = fromScreen({x: e.pageX - pos.left, y: e.pageY - pos.top});
+ selected = nearest = dragged = layout.nearest(p);
+
+ if (selected.node !== null) {
+ dragged.point.m = 10000.0;
+
+ if (nodeSelected) {
+ nodeSelected(selected.node);
+ }
+ }
+
+ renderer.start();
+ });
+
+ // Basic double click handler
+ jQuery(canvas).dblclick(function(e) {
+ var pos = jQuery(this).offset();
+ var p = fromScreen({x: e.pageX - pos.left, y: e.pageY - pos.top});
+ selected = layout.nearest(p);
+ node = selected.node;
+ if (node && node.data && node.data.ondoubleclick) {
+ node.data.ondoubleclick();
+ }
+ });
+
+ jQuery(canvas).mousemove(function(e) {
+ var pos = jQuery(this).offset();
+ var p = fromScreen({x: e.pageX - pos.left, y: e.pageY - pos.top});
+ nearest = layout.nearest(p);
+
+ if (dragged !== null && dragged.node !== null) {
+ dragged.point.p.x = p.x;
+ dragged.point.p.y = p.y;
+ }
+
+ renderer.start();
+ });
+
+ jQuery(window).bind('mouseup',function(e) {
+ dragged = null;
+ });
+
+ var getTextWidth = function(node) {
+ var text = (node.data.label !== undefined) ? node.data.label : node.id;
+ if (node._width && node._width[text])
+ return node._width[text];
+
+ ctx.save();
+ ctx.font = (node.data.font !== undefined) ? node.data.font : nodeFont;
+ var width = ctx.measureText(text).width;
+ ctx.restore();
+
+ node._width || (node._width = {});
+ node._width[text] = width;
+
+ return width;
+ };
+
+ var getTextHeight = function(node) {
+ return 16;
+ // In a more modular world, this would actually read the font size, but I think leaving it a constant is sufficient for now.
+ // If you change the font size, I'd adjust this too.
+ };
+
+ var getImageWidth = function(node) {
+ var width = (node.data.image.width !== undefined) ? node.data.image.width : nodeImages[node.data.image.src].object.width;
+ return width;
+ }
+
+ var getImageHeight = function(node) {
+ var height = (node.data.image.height !== undefined) ? node.data.image.height : nodeImages[node.data.image.src].object.height;
+ return height;
+ }
+
+ Springy.Node.prototype.getHeight = function() {
+ var height;
+ if (this.data.image == undefined) {
+ height = getTextHeight(this);
+ } else {
+ if (this.data.image.src in nodeImages && nodeImages[this.data.image.src].loaded) {
+ height = getImageHeight(this);
+ } else {height = 10;}
+ }
+ return height;
+ }
+
+ Springy.Node.prototype.getWidth = function() {
+ var width;
+ if (this.data.image == undefined) {
+ width = getTextWidth(this);
+ } else {
+ if (this.data.image.src in nodeImages && nodeImages[this.data.image.src].loaded) {
+ width = getImageWidth(this);
+ } else {width = 10;}
+ }
+ return width;
+ }
+
+ var renderer = this.renderer = new Springy.Renderer(layout,
+ function clear() {
+ ctx.clearRect(0,0,canvas.width,canvas.height);
+ },
+ function drawEdge(edge, p1, p2) {
+ var x1 = toScreen(p1).x;
+ var y1 = toScreen(p1).y;
+ var x2 = toScreen(p2).x;
+ var y2 = toScreen(p2).y;
+
+ var direction = new Springy.Vector(x2-x1, y2-y1);
+ var normal = direction.normal().normalise();
+
+ var from = graph.getEdges(edge.source, edge.target);
+ var to = graph.getEdges(edge.target, edge.source);
+
+ var total = from.length + to.length;
+
+ // Figure out edge's position in relation to other edges between the same nodes
+ var n = 0;
+ for (var i=0; i Math.PI/2 || angle < -Math.PI/2)) {
+ displacement = 8;
+ angle += Math.PI;
+ }
+ var textPos = s1.add(s2).divide(2).add(normal.multiply(displacement));
+ ctx.translate(textPos.x, textPos.y);
+ ctx.rotate(angle);
+ ctx.fillText(text, 0,-2);
+ ctx.restore();
+ }
+
+ },
+ function drawNode(node, p) {
+ var s = toScreen(p);
+
+ ctx.save();
+
+ // Pulled out the padding aspect sso that the size functions could be used in multiple places
+ // These should probably be settable by the user (and scoped higher) but this suffices for now
+ var paddingX = 6;
+ var paddingY = 6;
+
+ var contentWidth = node.getWidth();
+ var contentHeight = node.getHeight();
+ var boxWidth = contentWidth + paddingX;
+ var boxHeight = contentHeight + paddingY;
+
+ // clear background
+ ctx.clearRect(s.x - boxWidth/2, s.y - boxHeight/2, boxWidth, boxHeight);
+
+ // fill background
+ if (selected !== null && selected.node !== null && selected.node.id === node.id) {
+ ctx.fillStyle = "#FFFFE0";
+ } else if (nearest !== null && nearest.node !== null && nearest.node.id === node.id) {
+ ctx.fillStyle = "#EEEEEE";
+ } else {
+ ctx.fillStyle = "#FFFFFF";
+ }
+ ctx.fillRect(s.x - boxWidth/2, s.y - boxHeight/2, boxWidth, boxHeight);
+
+ if (node.data.image == undefined) {
+ ctx.textAlign = "left";
+ ctx.textBaseline = "top";
+ ctx.font = (node.data.font !== undefined) ? node.data.font : nodeFont;
+ ctx.fillStyle = (node.data.color !== undefined) ? node.data.color : "#000000";
+ var text = (node.data.label !== undefined) ? node.data.label : node.id;
+ ctx.fillText(text, s.x - contentWidth/2, s.y - contentHeight/2);
+ } else {
+ // Currently we just ignore any labels if the image object is set. One might want to extend this logic to allow for both, or other composite nodes.
+ var src = node.data.image.src; // There should probably be a sanity check here too, but un-src-ed images aren't exaclty a disaster.
+ if (src in nodeImages) {
+ if (nodeImages[src].loaded) {
+ // Our image is loaded, so it's safe to draw
+ ctx.drawImage(nodeImages[src].object, s.x - contentWidth/2, s.y - contentHeight/2, contentWidth, contentHeight);
+ }
+ }else{
+ // First time seeing an image with this src address, so add it to our set of image objects
+ // Note: we index images by their src to avoid making too many duplicates
+ nodeImages[src] = {};
+ var img = new Image();
+ nodeImages[src].object = img;
+ img.addEventListener("load", function () {
+ // HTMLImageElement objects are very finicky about being used before they are loaded, so we set a flag when it is done
+ nodeImages[src].loaded = true;
+ });
+ img.src = src;
+ }
+ }
+ ctx.restore();
+ }
+ );
+
+ renderer.start();
+
+ // helpers for figuring out where to draw arrows
+ function intersect_line_line(p1, p2, p3, p4) {
+ var denom = ((p4.y - p3.y)*(p2.x - p1.x) - (p4.x - p3.x)*(p2.y - p1.y));
+
+ // lines are parallel
+ if (denom === 0) {
+ return false;
+ }
+
+ var ua = ((p4.x - p3.x)*(p1.y - p3.y) - (p4.y - p3.y)*(p1.x - p3.x)) / denom;
+ var ub = ((p2.x - p1.x)*(p1.y - p3.y) - (p2.y - p1.y)*(p1.x - p3.x)) / denom;
+
+ if (ua < 0 || ua > 1 || ub < 0 || ub > 1) {
+ return false;
+ }
+
+ return new Springy.Vector(p1.x + ua * (p2.x - p1.x), p1.y + ua * (p2.y - p1.y));
+ }
+
+ function intersect_line_box(p1, p2, p3, w, h) {
+ var tl = {x: p3.x, y: p3.y};
+ var tr = {x: p3.x + w, y: p3.y};
+ var bl = {x: p3.x, y: p3.y + h};
+ var br = {x: p3.x + w, y: p3.y + h};
+
+ var result;
+ if (result = intersect_line_line(p1, p2, tl, tr)) { return result; } // top
+ if (result = intersect_line_line(p1, p2, tr, br)) { return result; } // right
+ if (result = intersect_line_line(p1, p2, br, bl)) { return result; } // bottom
+ if (result = intersect_line_line(p1, p2, bl, tl)) { return result; } // left
+
+ return false;
+ }
+
+ return this;
+}
+
+})();
diff --git a/ocl_web/templates/base.html b/ocl_web/templates/base.html
index 680da5ca..fad549bb 100644
--- a/ocl_web/templates/base.html
+++ b/ocl_web/templates/base.html
@@ -25,6 +25,7 @@
- selected - selected Mappings
History Relationship
Added the latest versions of concepts/mappings to the collection. Future updates will not be added automatically.
diff --git a/ocl_web/templates/concepts/concept_relationship.html b/ocl_web/templates/concepts/concept_relationship.html
new file mode 100644
index 00000000..80976058
--- /dev/null
+++ b/ocl_web/templates/concepts/concept_relationship.html
@@ -0,0 +1,186 @@
+{% extends "concepts/concept_base.html" %}
+{% load i18n %}
+{% load ocl_tags %}
+{% load bootstrap3 %}
+
+
+{% block tab-content %}
+
+
+
+
+ {% if concept.owner_type == 'Organization' %}
+ {% url 'concept-relationship' org=concept.owner source=concept.source concept=concept.id as concept_relationship_url %}
+ {% else %}
+ {% url 'concept-relationship' user=concept.owner source=concept.source concept=concept.id as concept_relationship_url %}
+ {% endif %}
+
+
+
+
+
+
+ {% for mapping in mappings %}
+ {{ mapping.id }}
+
+
+
+
+
+
+
+
Mappings
+
+ {% if concept.has_direct_mappings %}
+
+
+
+
+ Relationship
+ Source
+ Code
+ Name
+
+
+
+ {% for mapping in mappings|dictsort:"map_type" %}
+ {% if mapping.is_direct_mapping %}
+ {% if mapping.to_source_owner_type == 'Organization' %}
+ {% url 'org-home' org=mapping.to_source_owner as to_concept_owner_url %}
+ {% url 'source-home' org=mapping.to_source_owner source=mapping.to_source_name as to_concept_source_url %}
+ {% if mapping.is_internal_mapping %}
+ {% url 'concept-home' org=mapping.to_source_owner source=mapping.to_source_name concept=mapping.to_concept_code as to_concept_url %}
+ {% endif %}
+ {% else %}
+ {% url 'users:detail' mapping.to_source_owner as to_concept_owner_url %}
+ {% url 'source-home' user=mapping.to_source_owner source=mapping.to_source_name as to_concept_source_url %}
+ {% if mapping.is_internal_mapping %}
+ {% url 'concept-home' user=mapping.to_source_owner source=mapping.to_source_name concept=mapping.to_concept_code as to_concept_url %}
+ {% endif %}
+ {% endif %}
+
+
+ {% if mapping.is_external_mapping %}
+ {{ mapping.map_type }}
+ {{ mapping.to_source_owner }} / {{ mapping.to_source_name }} {% if mapping.is_internal_mapping %}{{ mapping.to_concept_code }} {% else %}{{ mapping.to_concept_code }}{% endif %}
+ {{ mapping.to_concept_name|default:"-" }}
+
+ {% endif %}
+ {% endfor %}
+
+
+ {% else %}
+
No direct mappings
+ {% endif %}
+
+
+
+
Inverse Mappings
+
+ {% if concept.has_inverse_mappings %}
+
+
+
+
+ Relationship
+ Source
+ Code
+ Name
+
+
+
+ {% for mapping in mappings|dictsort:"map_type" %}
+ {% if mapping.is_inverse_mapping %}
+ {% if mapping.to_source_owner_type == 'Organization' %}
+ {% url 'org-home' org=mapping.from_source_owner as from_concept_owner_url %}
+ {% url 'source-home' org=mapping.from_source_owner source=mapping.from_source_name as from_concept_source_url %}
+ {% url 'concept-home' org=mapping.from_source_owner source=mapping.from_source_name concept=mapping.from_concept_code as from_concept_url %}
+ {% else %}
+ {% url 'users:detail' mapping.from_source_owner as from_concept_owner_url %}
+ {% url 'source-home' user=mapping.from_source_owner source=mapping.from_source_name as from_concept_source_url %}
+ {% url 'concept-home' user=mapping.from_source_owner source=mapping.from_source_name concept=mapping.from_concept_code as from_concept_url %}
+ {% endif %}
+
+
+ {% if mapping.is_external_mapping %}
+ {{ mapping.map_type }}
+ {{ mapping.from_source_owner }} / {{ mapping.from_source_name }} {{ mapping.from_concept_code }} {{ mapping.from_concept_name|default:"-" }}
+
+ {% endif %}
+ {% endfor %}
+
+
+ {% else %}
+
No inverse mappings
+ {% endif %}
+
+
+
+
+
+
+
+
+
+{% endblock tab-content %}
+
+
+{% block resource-debug %}
+
URL kwargs {{ kwargs|pprint }}
+
URL Parameters {{ url_params|pprint }}
+
Concept {{ concept|pprint }}
+
Mappings {{ mappings|pprint }}
+{% endblock resource-debug %}
+
+
+{% block extrajavascript %}
+
+{% endblock extrajavascript %}
From 3f5e3f81843f4681703ec8d8a1ae9726c11d3977 Mon Sep 17 00:00:00 2001
From: hao555sky <836095186@qq.com>
Date: Tue, 22 Aug 2017 20:27:54 +0800
Subject: [PATCH 4/4] finish the final objective
---
ocl_web/apps/concepts/views.py | 36 +--
ocl_web/apps/mappings/views.py | 1 +
ocl_web/config/orgs_urls.py | 6 +-
ocl_web/static/js/project.js | 9 +-
ocl_web/templates/base.html | 1 +
.../concepts/concept_relationship.html | 255 ++++++++----------
6 files changed, 125 insertions(+), 183 deletions(-)
diff --git a/ocl_web/apps/concepts/views.py b/ocl_web/apps/concepts/views.py
index 4a16917f..5daee22f 100644
--- a/ocl_web/apps/concepts/views.py
+++ b/ocl_web/apps/concepts/views.py
@@ -57,21 +57,18 @@ def get_concept_details(self, owner_type, owner_id, source_id, concept_id,
raise ValueError(
'Must specify only a source version or a concept version. Both were specified.')
elif source_version_id:
- print('11111')
search_response = api.get(
owner_type, owner_id,
'sources', source_id, source_version_id,
'concepts', concept_id,
params=params)
elif concept_version_id:
- print('22222')
search_response = api.get(
owner_type, owner_id,
'sources', source_id,
'concepts', concept_id, concept_version_id,
params=params)
else:
- print('33333')
search_response = api.get(
owner_type, owner_id,
'sources', source_id,
@@ -408,7 +405,7 @@ def get_context_data(self, *args, **kwargs):
api = OclApi(self.request, debug=True, facets=True)
selected_sources = self.request.GET.getlist('selected_source')
- print('selected_sources: ', selected_sources)
+ print('selected_sources: ', selected_sources)
print(len(selected_sources))
@@ -420,32 +417,16 @@ def get_context_data(self, *args, **kwargs):
source_version_id=self.source_version_id, concept_version_id=self.concept_version_id,
include_mappings=True, include_inverse_mappings=True)
- mappings.extend(concept['mappings'])
+ if concept.get('mappings', None):
+ mappings.extend(concept.get('mappings'))
if len(selected_sources) != 0:
for source_id in selected_sources:
search_response = api.get(self.owner_type, self.owner_id, 'sources', source_id, 'mappings')
for mapping in search_response.json()['results']:
- if (self.proper_owner_type == mapping['to_source_owner_type'] and
- self.owner_id == mapping['to_source_owner'] and
- self.source_id == mapping['to_source_name'] and
- self.concept_id == mapping['to_concept_code']):
- mapping['is_inverse_mapping'] = True
- concept['has_inverse_mappings'] = True
- mapping['is_direct_mapping'] = False
- else:
- mapping['is_direct_mapping'] = True
- mapping['is_inverse_mapping'] = False
- concept['has_direct_mappings'] = True
- if mapping['to_concept_url']:
- mapping['is_internal_mapping'] = True
- mapping['is_external_mapping'] = False
- else:
- mapping['is_internal_mapping'] = False
- mapping['is_external_mapping'] = True
-
- print('search_response : ', mapping)
- mappings.extend(search_response.json()['results'])
+ if mapping['from_concept_url'] == concept['url'] or mapping['to_concept_url'] == concept['url']:
+ mappings.append(mapping)
+ print('search_response : ', mapping)
print('\n\n')
if self.request.user.is_authenticated():
@@ -453,7 +434,9 @@ def get_context_data(self, *args, **kwargs):
all_sources = _get_org_or_user_sources_list2(self.request, str(self.request.user))
- print('mappings: ', mappings)
+ for mapping in mappings:
+ print('mapping: ', mapping)
+ print('\n\n')
print('\n\n')
# Set the context
@@ -461,6 +444,7 @@ def get_context_data(self, *args, **kwargs):
context['url_params'] = self.request.GET
context['selected_tab'] = 'Relationship'
context['concept'] = concept
+ context['concept1'] = json.dumps(concept)
context['mappings'] = json.dumps(mappings)
context['all_sources'] = all_sources
diff --git a/ocl_web/apps/mappings/views.py b/ocl_web/apps/mappings/views.py
index ff925398..2db9146b 100644
--- a/ocl_web/apps/mappings/views.py
+++ b/ocl_web/apps/mappings/views.py
@@ -161,6 +161,7 @@ def get_context_data(self, *args, **kwargs):
return context
+
class MappingVersionsView(UserOrOrgMixin, MappingReadBaseView):
"""`
Mapping Details view.
diff --git a/ocl_web/config/orgs_urls.py b/ocl_web/config/orgs_urls.py
index 82c1391b..7ac1a2e7 100644
--- a/ocl_web/config/orgs_urls.py
+++ b/ocl_web/config/orgs_urls.py
@@ -30,7 +30,7 @@
SourceVersionsNewView, SourceVersionsEditView, SourceVersionsRetireView, SourceDeleteView, SourceVersionEditJsonView, SourceVersionDeleteView)
from apps.concepts.views import (
ConceptDetailsView, ConceptMappingsView, ConceptHistoryView, ConceptEditView, ConceptDiffView,
- ConceptRetireView, ConceptNewView, ConceptForkView, ConceptDescView, ConceptNameView)
+ ConceptRetireView, ConceptNewView, ConceptForkView, ConceptDescView, ConceptNameView, ConceptRelationshipView)
from apps.mappings.views import (
MappingDetailsView, MappingNewView, MappingForkView, MappingEditView, MappingRetireView, MappingVersionsView)
from apps.collections.views import CollectionDetailView, CollectionCreateView, CollectionEditView, CollectionAboutView, \
@@ -213,6 +213,10 @@
url(r'^(?P
[a-zA-Z0-9\-\.]+)/sources/(?P[a-zA-Z0-9\-\.]+)/concepts/(?P[a-zA-Z0-9\-\.]+)/history/$', # pylint: disable=C0301
ConceptHistoryView.as_view(), name='concept-history'),
+ # /orgs/:org/sources/:source/concepts/:concept/relationship/
+ url(r'^(?P[a-zA-Z0-9\-\.]+)/sources/(?P[a-zA-Z0-9\-\.]+)/concepts/(?P[a-zA-Z0-9\-\.]+)/relationship/$',# pylint: disable=C0301
+ ConceptRelationshipView.as_view(), name='concept-relationship'),
+
# /orgs/:org/sources/:source/concepts/:concept/diff/
url(r'^(?P[a-zA-Z0-9\-\.]+)/sources/(?P[a-zA-Z0-9\-\.]+)/concepts/(?P[a-zA-Z0-9\-\.]+)/diff/$', # pylint: disable=C0301
ConceptDiffView.as_view(), name='concept-version-diff'),
diff --git a/ocl_web/static/js/project.js b/ocl_web/static/js/project.js
index a0d270bc..075a1e68 100644
--- a/ocl_web/static/js/project.js
+++ b/ocl_web/static/js/project.js
@@ -723,12 +723,9 @@ app.controller("MappingVersionsController", function ($scope, $http) {
}
});
-// app.controller("ConceptRelationshipController", function ($scope, $http) {
-// $scope.submitRelationshipForm = function (relationshipForm, concept_relationship_url) {
-// url = concept_relationship_url + "?selected_source=1&selected_source=2";
-// window.location.href = url;
-// }
-// });
+app.controller("ConceptRelationshipController", function ($scope, $http) {
+ pass;
+});
// Simple function to handle removing member from org
function removeMember(orgId, memId) {
diff --git a/ocl_web/templates/base.html b/ocl_web/templates/base.html
index fad549bb..1cf2c1c9 100644
--- a/ocl_web/templates/base.html
+++ b/ocl_web/templates/base.html
@@ -40,6 +40,7 @@
+
diff --git a/ocl_web/templates/concepts/concept_relationship.html b/ocl_web/templates/concepts/concept_relationship.html
index 80976058..644776d8 100644
--- a/ocl_web/templates/concepts/concept_relationship.html
+++ b/ocl_web/templates/concepts/concept_relationship.html
@@ -5,141 +5,62 @@
{% block tab-content %}
-
-
+
{% if concept.owner_type == 'Organization' %}
{% url 'concept-relationship' org=concept.owner source=concept.source concept=concept.id as concept_relationship_url %}
{% else %}
{% url 'concept-relationship' user=concept.owner source=concept.source concept=concept.id as concept_relationship_url %}
{% endif %}
-
-
-
-
-
- {% for mapping in mappings %}
- {{ mapping.id }}
-
-
-
-
-
-
-
-
Mappings
-
- {% if concept.has_direct_mappings %}
-
-
-
-
- Relationship
- Source
- Code
- Name
-
-
-
- {% for mapping in mappings|dictsort:"map_type" %}
- {% if mapping.is_direct_mapping %}
- {% if mapping.to_source_owner_type == 'Organization' %}
- {% url 'org-home' org=mapping.to_source_owner as to_concept_owner_url %}
- {% url 'source-home' org=mapping.to_source_owner source=mapping.to_source_name as to_concept_source_url %}
- {% if mapping.is_internal_mapping %}
- {% url 'concept-home' org=mapping.to_source_owner source=mapping.to_source_name concept=mapping.to_concept_code as to_concept_url %}
- {% endif %}
- {% else %}
- {% url 'users:detail' mapping.to_source_owner as to_concept_owner_url %}
- {% url 'source-home' user=mapping.to_source_owner source=mapping.to_source_name as to_concept_source_url %}
- {% if mapping.is_internal_mapping %}
- {% url 'concept-home' user=mapping.to_source_owner source=mapping.to_source_name concept=mapping.to_concept_code as to_concept_url %}
- {% endif %}
- {% endif %}
-
-
- {% if mapping.is_external_mapping %}
- {{ mapping.map_type }}
- {{ mapping.to_source_owner }} / {{ mapping.to_source_name }} {% if mapping.is_internal_mapping %}{{ mapping.to_concept_code }} {% else %}{{ mapping.to_concept_code }}{% endif %}
- {{ mapping.to_concept_name|default:"-" }}
-
- {% endif %}
- {% endfor %}
-
-
- {% else %}
-
No direct mappings
- {% endif %}
-
-
-
-
Inverse Mappings
-
- {% if concept.has_inverse_mappings %}
-
-
-
-
- Relationship
- Source
- Code
- Name
-
-
-
- {% for mapping in mappings|dictsort:"map_type" %}
- {% if mapping.is_inverse_mapping %}
- {% if mapping.to_source_owner_type == 'Organization' %}
- {% url 'org-home' org=mapping.from_source_owner as from_concept_owner_url %}
- {% url 'source-home' org=mapping.from_source_owner source=mapping.from_source_name as from_concept_source_url %}
- {% url 'concept-home' org=mapping.from_source_owner source=mapping.from_source_name concept=mapping.from_concept_code as from_concept_url %}
- {% else %}
- {% url 'users:detail' mapping.from_source_owner as from_concept_owner_url %}
- {% url 'source-home' user=mapping.from_source_owner source=mapping.from_source_name as from_concept_source_url %}
- {% url 'concept-home' user=mapping.from_source_owner source=mapping.from_source_name concept=mapping.from_concept_code as from_concept_url %}
- {% endif %}
-
-
- {% if mapping.is_external_mapping %}
- {{ mapping.map_type }}
- {{ mapping.from_source_owner }} / {{ mapping.from_source_name }} {{ mapping.from_concept_code }} {{ mapping.from_concept_name|default:"-" }}
-
- {% endif %}
- {% endfor %}
-
-
- {% else %}
-
No inverse mappings
- {% endif %}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Tip
+
+
The Concept Relations tab displays all direct and inverse mappings stored in this default source and sources the user selected.
+
+
+
+
+
+
+
{% endblock tab-content %}
@@ -157,29 +78,63 @@ Mappings {{ mappings|pprint }}
$(document).ready(function() {
$('#selected_source').multiselect();
-// var mappings = {{ mappings | safe }};
-
-// var graph = new Springy.Graph();
-//
-// for(var i=0; i