From 4edcb7693fee221f4a30f58ea78d1b7c5cfca184 Mon Sep 17 00:00:00 2001
From: Himadri <himadri.naina@gmail.com>
Date: Sat, 22 Jun 2019 17:10:06 +0200
Subject: [PATCH 01/66] create and rdf ontology graph component and display it
 in app component.

---
 ida-chatbot/src/app/app.component.html        |  5 +++-
 ida-chatbot/src/app/app.module.ts             |  4 ++-
 .../rdf-ontology-view.component.css           |  0
 .../rdf-ontology-view.component.html          |  4 +++
 .../rdf-ontology-view.component.spec.ts       | 25 +++++++++++++++++++
 .../rdf-ontology-view.component.ts            | 23 +++++++++++++++++
 6 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
 create mode 100644 ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
 create mode 100644 ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.spec.ts
 create mode 100644 ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts

diff --git a/ida-chatbot/src/app/app.component.html b/ida-chatbot/src/app/app.component.html
index 63172031f..3d37e6305 100644
--- a/ida-chatbot/src/app/app.component.html
+++ b/ida-chatbot/src/app/app.component.html
@@ -4,9 +4,12 @@
                [activeItem]="getActiveItem()"></app-sidebar>
   <!-- </div>-->
   <div fxFlex="100%" id="mainView">
+     
+     
     <app-intro [ngClass]="{'hidden-cls': activeItem!==0 }"></app-intro>
     <ng-container *ngFor="let mvw of getMainviewItems()" >
-    <app-data-view-container [item]="mvw" [ngClass]="{'hidden-cls': activeItem!==mvw.id }"></app-data-view-container>
+      <app-data-view-container [item]="mvw" [ngClass]="{'hidden-cls': activeItem!==mvw.id }"></app-data-view-container>
+      <app-rdf-ontology-view [item]="mvw" [ngClass]="{'hidden-cls': activeItem!==mvw.id }"></app-rdf-ontology-view>
     </ng-container>
   </div>
   <app-chatbox id="chatBox" fxFlexAlign="end" fxFlex="auto" (actnEmitter)="addNewUserMessage($event)"></app-chatbox>
diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index bea7e9f59..b4c9ea014 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -60,6 +60,7 @@ import {DatatableDetailComponent} from './components/datatable-detail/datatable-
 import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
+import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
@@ -80,7 +81,8 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     DatatableDetailComponent,
     SsbViewComponent,
     VennViewComponent,
-    DeckglHexViewComponent
+    DeckglHexViewComponent,
+    RdfOntologyViewComponent
   ],
   imports: [
     BrowserModule,
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
new file mode 100644
index 000000000..729820374
--- /dev/null
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -0,0 +1,4 @@
+<div align='center' [attr.id]="fdgId">
+  <h1>RDF Ontology Class Hierarchy</h1>
+  <svg [attr.id]="svgId"> RDF-ontology-class-hierarchy img </svg>
+</div>
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.spec.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.spec.ts
new file mode 100644
index 000000000..eba53ee4c
--- /dev/null
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RdfOntologyViewComponent } from './rdf-ontology-view.component';
+
+describe('RdfOntologyViewComponent', () => {
+  let component: RdfOntologyViewComponent;
+  let fixture: ComponentFixture<RdfOntologyViewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ RdfOntologyViewComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RdfOntologyViewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
new file mode 100644
index 000000000..c3094d29f
--- /dev/null
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -0,0 +1,23 @@
+import { Component, OnInit} from '@angular/core';
+import {UniqueIdProviderService} from '../../service/misc/unique-id-provider.service';
+
+@Component({
+  selector: 'app-rdf-ontology-view',
+  templateUrl: './rdf-ontology-view.component.html',
+  styleUrls: ['./rdf-ontology-view.component.css']
+})
+export class RdfOntologyViewComponent implements OnInit {
+
+  public figId: string;
+  public svgId: string;
+  public fileName: string;
+
+  constructor(public uip: UniqueIdProviderService) {
+    this.figId = 'fig' + this.uip.getUniqueId();
+    this.svgId = 'svg' + this.uip.getUniqueId();
+  }
+
+  ngOnInit() {
+  }
+  
+}

From 88c8af5d0d7169177e276550d82d63f04e7400a4 Mon Sep 17 00:00:00 2001
From: Himadri <himadri.naina@gmail.com>
Date: Sat, 22 Jun 2019 17:40:37 +0200
Subject: [PATCH 02/66] read new data from RDF ontology json file and creation
 of nodes and links for class hierarchy

---
 ida-chatbot/src/app/app.component.html        |    2 +-
 .../rdf-ontology-view.component.html          |    2 +-
 .../rdf-ontology-view.component.ts            |   14 +-
 .../d3v4-rdf-ontology-graph-view.js           |  227 ++++
 .../rdfontology/historian-onlogoly.json       | 1172 +++++++++++++++++
 ida-chatbot/src/index.html                    |    1 +
 6 files changed, 1414 insertions(+), 4 deletions(-)
 create mode 100644 ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
 create mode 100644 ida-chatbot/src/assets/rdfontology/historian-onlogoly.json

diff --git a/ida-chatbot/src/app/app.component.html b/ida-chatbot/src/app/app.component.html
index 3d37e6305..8663a155c 100644
--- a/ida-chatbot/src/app/app.component.html
+++ b/ida-chatbot/src/app/app.component.html
@@ -9,7 +9,7 @@
     <app-intro [ngClass]="{'hidden-cls': activeItem!==0 }"></app-intro>
     <ng-container *ngFor="let mvw of getMainviewItems()" >
       <app-data-view-container [item]="mvw" [ngClass]="{'hidden-cls': activeItem!==mvw.id }"></app-data-view-container>
-      <app-rdf-ontology-view [item]="mvw" [ngClass]="{'hidden-cls': activeItem!==mvw.id }"></app-rdf-ontology-view>
+      <app-rdf-ontology-view ></app-rdf-ontology-view>
     </ng-container>
   </div>
   <app-chatbox id="chatBox" fxFlexAlign="end" fxFlex="auto" (actnEmitter)="addNewUserMessage($event)"></app-chatbox>
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 729820374..d83608137 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,4 +1,4 @@
 <div align='center' [attr.id]="fdgId">
   <h1>RDF Ontology Class Hierarchy</h1>
-  <svg [attr.id]="svgId"> RDF-ontology-class-hierarchy img </svg>
+  <div [attr.id]="svgId"> RDF-ontology-class-hierarchy img </div>
 </div>
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index c3094d29f..c9fd118a4 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -1,6 +1,7 @@
-import { Component, OnInit} from '@angular/core';
+import { Component, OnInit,AfterViewInit,} from '@angular/core';
 import {UniqueIdProviderService} from '../../service/misc/unique-id-provider.service';
 
+declare function createV4RDFOntologyGraph(a, b,c);
 @Component({
   selector: 'app-rdf-ontology-view',
   templateUrl: './rdf-ontology-view.component.html',
@@ -19,5 +20,14 @@ export class RdfOntologyViewComponent implements OnInit {
 
   ngOnInit() {
   }
-  
+  ngAfterViewInit() {
+
+    //const svg = d3.select('#' + this.fdgid);
+    this.fileName = "";
+    console.log("before calling ");
+    //createV4RDFOntologyClasshierarchy(this.figId, this.svgId,this.fileName);
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName);
+    console.log("After calling ");
+    //createV4RDFOntologyGraphtest(this.figId2, this.svgId2,this.fileName);
+  }
 }
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
new file mode 100644
index 000000000..369164549
--- /dev/null
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -0,0 +1,227 @@
+function createV4RDFOntologyGraph(figId, svgId, fileName,) {
+  var linksArray = [];
+  var nodesArray = [];
+
+  var width = 1060,height = 900;
+
+
+  var svg = d3.select("#"+svgId)
+    .append("svg")
+    .attr("width", width)
+    .attr("height", height);
+ 
+  svg.append("svg:defs").selectAll("marker")
+  .data(["end"])
+  .enter().append("svg:marker")
+  .attr("id", String)
+  .attr("viewBox", "0 -5 15 15")
+  .attr("refX", 30) 
+  .attr("refY", -0.5)
+  .attr("markerWidth", 26)
+  .attr("markerHeight", 6)
+  .attr("orient", "auto")
+  .append("svg:polyline")
+  .attr("points", "0,-5 10,0 0,5")
+  ;
+  
+
+  var color = d3.scaleOrdinal(d3.schemeCategory20);
+
+  var simulation = d3.forceSimulation()
+    .force("link", d3.forceLink().id(function(d) { return d.id; }).distance(50))
+    .force("charge", d3.forceManyBody().strength(-1000)) //Charge strength is here
+    .force("center", d3.forceCenter((width / 2), (height / 2)));
+  
+  d3.json("assets/rdfontology/historian-onlogoly.json", function(error, data) 
+  {
+    var literalIndex = 0;
+    var circleIdIndex = 0;
+    data["@graph"].forEach(function(element) 
+    {
+        var tempSub ="";
+        var tempPred ="";
+        var tempObj ="";
+        var pred="---subClassOf---";
+        var tempDomainArray = [];
+        //START :: Nodes and Links creation for subClassOf
+        if(element["rdfs:subClassOf"] != undefined)
+        {
+          
+          var tempLabelArray = element["@id"].split('/');
+          tempSub = tempLabelArray[tempLabelArray.length -1 ];
+          
+          if(Object.prototype.toString.call(element["rdfs:subClassOf"]) === '[object Array]')
+          {
+            element["rdfs:subClassOf"].forEach(function(eachIds)
+            {  
+              var tempLabelArray = eachIds["@id"].split('/');
+              tempObj = tempLabelArray[tempLabelArray.length -1 ];
+
+              var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
+              linksArray.push(tripleValue);
+              createNewNode(tempSub,pred,tempObj);
+            });
+          }
+          else
+          {
+            var tempLabelArray = element["rdfs:subClassOf"]["@id"].split('/');
+            tempObj = tempLabelArray[tempLabelArray.length -1 ];
+            var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
+            linksArray.push(tripleValue);
+
+            createNewNode(tempSub,pred,tempObj);
+          }
+            
+        }
+        //END :: Nodes and Links creation for subClassOf
+        
+      });
+      
+      if (error) {
+          return console.warn('Error in createV3RDFOntologyGraphView() method :'+error);
+      }
+      
+      var g = svg.append("g")
+          .attr("class", "everything");         
+        
+    var link = g.append("g")
+          .attr("class", "links")
+          .selectAll("line")
+          .data(linksArray)
+          .enter().append("line")
+          .attr("class", "link")
+          .attr("stroke-width",1)
+          .style("fill","#999")
+          .attr("marker-end", "url(#end)")
+          .style("stroke-dasharray",function (d) {return  ("0, 0");})
+          ;
+
+          // ==================== Add Link Names =====================
+    var linkTexts = g.selectAll(".link-text")
+            .data(linksArray)
+            .enter()
+            .append("text")
+              .attr("class", "link-text")
+              .text( function (d) { 
+                //console.log(d);
+                return d.predicate; }) 
+                .style("fill",function(d){return "#28B463";})
+                .style("font-size", "80%")
+                .style("font-style", "italic")
+                .attr('x', 12)
+                .attr('y', 3)
+    ;           
+    // ==================== Add Link Names =====================
+
+    var node = g.append("g")
+          .attr("class", "nodes")
+        .selectAll("g")
+        .data(nodesArray)
+        .enter().append("g")
+    ;    
+    var circles = node.append("circle")
+          .attr("id",function(d){return d.nodeId ;})
+          .attr("r","8")
+          .style("fill",function(d){ return "#311B92";})
+          .call(d3.drag()
+              .on("start", dragstarted)
+              .on("drag", dragged)
+             .on("end", dragended)
+    );
+
+    var lables = node.append("text")
+              .attr("class", "node-text")
+              .text(function (d) { return d.id;  })
+              .style("font-size","100%")
+              .style("fill","#311B92")
+              .attr('x', 12)
+              .attr('y', 3)
+    ;
+
+    simulation
+          .nodes(nodesArray)
+          .on("tick", ticked)
+    ;
+
+    simulation.force("link")
+          .links(linksArray)
+    ;
+
+    function ticked()
+    {
+      lables
+          .attr("x2", function(d){ return d.x-width; })
+          .attr("y2", function (d) {return d.y -height; })
+      ;
+      link
+          .attr("x1", function(d) { return d.source.x; })
+          .attr("y1", function(d) { return d.source.y; })
+          .attr("x2", function(d) { return d.target.x; })
+          .attr("y2", function(d) { return d.target.y; })
+      ;
+      linkTexts
+          .attr("x", function(d) { //return  Math.max(5, Math.min(width - 10, (d.source.x + d.target.x)/2 ));
+            return 4 + (d.source.x + d.target.x)/2  ; })
+          .attr("y", function(d) { 
+            return 4 + (d.source.y + d.target.y)/2 ; })
+      ;
+      node
+        .attr("transform", function(d) {
+            return "translate(" + d.x + "," + d.y + ")";
+          })
+      ;
+    }
+
+    function createNewNode(tempSub,tempPred,tempObj)
+    {
+      //START :: Node creation
+      var subNodeAdded = false;  
+      var objNodeAdded = false;
+        
+      if(nodesArray != undefined)
+      {
+        nodesArray.forEach(function(elem) 
+        {
+          if(elem["id"] === tempSub)
+          {
+            subNodeAdded = true;
+          } 
+          if(elem["id"] === tempObj)
+          {
+            objNodeAdded = true;
+          } 
+        });
+      }
+      
+      if(subNodeAdded === false)
+      {
+        var nodeValue = {id:tempSub ,predicate:tempPred, group: 1};
+        nodesArray.push(nodeValue);
+      }
+      if(objNodeAdded === false)
+      {
+        var nodeValue = {id:tempObj ,predicate:tempPred, group: 1};
+        nodesArray.push(nodeValue);
+      }
+      //END :: Node creation
+      //console.log("nodeValue len =>"+nodesArray.length);
+    }
+  });
+
+  function dragstarted(d) {
+    if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+    d.fx = d.x;
+    d.fy = d.y;
+  }
+
+  function dragged(d) {
+    d.fx = d3.event.x;
+    d.fy = d3.event.y;
+  }
+
+  function dragended(d) {
+    if (!d3.event.active) simulation.alphaTarget(0);
+    d.fx = null;
+    d.fy = null;
+  }
+};
diff --git a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
new file mode 100644
index 000000000..dcc8f7ad7
--- /dev/null
+++ b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
@@ -0,0 +1,1172 @@
+{
+  "@context": {
+    "data": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/data/",
+    "dbo": "http://dbpedia.org/ontology/",
+    "dc": "http://purl.org/dc/elements/1.1/",
+    "foaf": "http://xmlns.com/foaf/0.1/",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "time": "http://www.w3.org/2006/time#",
+    "xsd": "http://www.w3.org/2001/XMLSchema#"
+  },
+  "@graph": [
+    {
+      "@id": "dbo:deathPlace",
+      "@type": "owl:DatatypeProperty"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "SoldierLiteratureInfo"
+        },
+        {
+          "@language": "de",
+          "@value": "SoldatenLiteratur Info"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        }
+      ]
+    },
+    {
+      "@id": "time:hasBeginning",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Describes the beginning time of a temporal entity",
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "startsAt"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "Orden"
+        },
+        {
+          "@language": "en",
+          "@value": "Decoration"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timeframable"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunctionInfo",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo"
+      },
+	  "rdfs:label": {
+        "@language": "en",
+        "@value": "NSDAPFunctionInfo"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/listPageNumber",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "listPageNumber"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo",
+      "@type": "owl:Class",
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "SoldierNSDAPFunctionInfo"
+      },
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/author",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "author"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRegiment",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "hasRegiment"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasSSRank",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierSSRankInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "hasSSRank"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSRank"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSRank",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "SSRang"
+        },
+        {
+          "@language": "en",
+          "@value": "SSRank"
+        }
+      ],
+      "rdfs:subClassOf": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable",
+      "@type": "owl:Class",
+      "dc:description": {
+        "@language": "en",
+        "@value": "Describes the entity which can be discharged with a reason i.e. Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Dischargable"
+      },
+      "rdfs:subClassOf": {
+        "@id": "owl:Thing"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/applicableFrom",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:comment": "Date on which a Soldier was given a Medal/Decoration.",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "applicableFrom"
+      },
+      "rdfs:range": {
+        "@id": "xsd:dateTime"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/internalInformation",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "internalInformation"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/name",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "name"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dataDifference",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Difference from DAL"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrolledOn",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "enrolledOn"
+      },
+      "rdfs:range": {
+        "@id": "xsd:dateTime"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/citaviId",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Citavi Database Id"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/origin",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Origin of the Literature",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Origin"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargeReason",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "dischargeReason"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "time:TemporalEntity",
+      "@type": "owl:Class"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/verifiedData",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Data verified on DAL?"
+      },
+      "rdfs:range": {
+        "@id": "xsd:boolean"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "Soldatenregierungsfunktion Info"
+        },
+        {
+          "@language": "en",
+          "@value": "SoldierGovernmentFunctionInfo"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargedOn",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "dischargedOn"
+      },
+      "rdfs:range": {
+        "@id": "xsd:dateTime"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "dbo:lastName",
+      "@type": "owl:DatatypeProperty"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/literatureInfo",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasLiterature",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "hasLiterature"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass",
+      "@type": "owl:Class",
+      "dc:description": {
+        "@language": "en",
+        "@value": "Top level resource of SS Ontology"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "SSClass"
+      },
+      "rdfs:subClassOf": {
+        "@id": "owl:Thing"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrollmentReason",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "enrollmentReason"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction",
+      "@type": "owl:Class",
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "NSDAPFunction"
+      },
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "Soldatenentlassung Info"
+        },
+        {
+          "@language": "en",
+          "@value": "SoldierDischargeInfo"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "Literatur"
+        },
+        {
+          "@language": "en",
+          "@value": "Literature"
+        }
+      ],
+      "rdfs:subClassOf": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/information",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "information"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/signature",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "signature"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "dbo:birthPlace",
+      "@type": "owl:DatatypeProperty"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/publicationYear",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "publicationYear"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/governmentFunctionInfo",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/deathDate",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "deathDate"
+      },
+      "rdfs:range": {
+        "@id": "xsd:dateTime"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSRankInfo",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierSSRankInfo"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "GovernmentFunction"
+        },
+        {
+          "@language": "de",
+          "@value": "Regierungsfunktion"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/regimentInfo",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/sortation",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSRank"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "sortation"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipNumber",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "membershipNumber"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasNSDAPFunction",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "hasNSDAPFunction"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/birthDate",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "birthDate"
+      },
+      "rdfs:range": {
+        "@id": "xsd:dateTime"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "Soldat"
+        },
+        {
+          "@language": "en",
+          "@value": "Soldier"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
+        },
+        {
+          "@id": "dbo:Person"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/id",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "id"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasTitle",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "hasTitle"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/title",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "title"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "Soldatendienststellung Info"
+        },
+        {
+          "@language": "en",
+          "@value": "SoldierRegimentInfo"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalSoldierId",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "originalSoldierId"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDischargeInfo",
+      "@type": [
+        "owl:ObjectProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/abbreviation",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "abbreviation"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/",
+      "@type": "owl:Ontology",
+      "dc:description": {
+        "@language": "en",
+        "@value": "Vocabulary describing Concepts and Relationships of Schutzstaffel"
+      },
+      "dc:title": {
+        "@language": "en",
+        "@value": "SS Vocabulary"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipType",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:comment": "XML has no occurence of this column.",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "membershipType"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/status",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "processing status"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "dbo:Person",
+      "@type": "owl:Class"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDecoration",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "hasDecoration"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPNumber",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "NSDAP Number"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable",
+      "@type": "owl:Class",
+      "dc:description": {
+        "@language": "en",
+        "@value": "Describes a specific point in time"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Timestampable"
+      },
+      "rdfs:subClassOf": {
+        "@id": "owl:Thing"
+      }
+    },
+    {
+      "@id": "time:hasEnd",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Describes the ending time of a temporal entity",
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "endsAt"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/decorationInfo",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasGovernmentFunction",
+      "@type": "owl:ObjectProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "hasGovernmentFunction"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timeframable",
+      "@type": "owl:Class",
+      "dc:description": {
+        "@language": "en",
+        "@value": "Describes temporal entities, i.e with a beginning and end in time"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Timeframable"
+      },
+      "rdfs:subClassOf": {
+        "@id": "time:TemporalEntity"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable",
+      "@type": "owl:Class",
+      "dc:description": {
+        "@language": "en",
+        "@value": "Describes entities which have an abbreviated name"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Abbreviable"
+      },
+      "rdfs:subClassOf": {
+        "@id": "owl:Thing"
+      }
+    },
+    {
+      "@id": "dc:description",
+      "@type": "owl:AnnotationProperty"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "DecorationEvent"
+        },
+        {
+          "@language": "de",
+          "@value": "Soldatendekoration Info"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "Dienststellung"
+        },
+        {
+          "@language": "en",
+          "@value": "Regiment"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+        }
+      ]
+    },
+    {
+      "@id": "dc:title",
+      "@type": "owl:AnnotationProperty"
+    },
+    {
+      "@id": "dbo:firstName",
+      "@type": "owl:DatatypeProperty"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierSSRankInfo",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "de",
+          "@value": "Soldat SS Rang Info"
+        },
+        {
+          "@language": "en",
+          "@value": "Soldier SS Rank Info"
+        }
+      ],
+      "rdfs:subClassOf": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ida-chatbot/src/index.html b/ida-chatbot/src/index.html
index b0fd08625..e202a8799 100644
--- a/ida-chatbot/src/index.html
+++ b/ida-chatbot/src/index.html
@@ -15,6 +15,7 @@
   <script src="/assets/ssb/sequences.js"></script>
   <script src="/assets/venn/venn.js"></script>
   <script src="/assets/venn/vennloader.js"></script>
+  <script src="/assets/rdfontology/d3v4-rdf-ontology-graph-view.js"></script>
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>

From aada811cf90b7d9ef532124254585e8a7386effe Mon Sep 17 00:00:00 2001
From: Himadri <himadri.naina@gmail.com>
Date: Sat, 22 Jun 2019 17:44:49 +0200
Subject: [PATCH 03/66] read new data from RDF ontology json file and creation
 of nodes and links for class hierarchy

---
 .../rdf-ontology-view/rdf-ontology-view.component.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index d83608137..f478ed099 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,4 +1,4 @@
 <div align='center' [attr.id]="fdgId">
-  <h1>RDF Ontology Class Hierarchy</h1>
+  <h2>RDF Ontology Class Hierarchy</h2>
   <div [attr.id]="svgId"> RDF-ontology-class-hierarchy img </div>
 </div>

From 9301d63e32f62edaa5068b78af15b839a295e2e3 Mon Sep 17 00:00:00 2001
From: Himadri <himadri.naina@gmail.com>
Date: Sat, 22 Jun 2019 18:41:39 +0200
Subject: [PATCH 04/66] checking logs..ignore commit

---
 ida-chatbot/src/app/app.module.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index b4c9ea014..2319bd029 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -61,7 +61,7 @@ import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
-import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [
@@ -123,8 +123,8 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule,
-    NgbModule
+    FlexLayoutModule//,
+   // NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,

From 09441fa7b33d6d0761b2e98503cabfbb7b2fcea2 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Mon, 24 Jun 2019 12:52:32 +0200
Subject: [PATCH 05/66] test commit

---
 ida-chatbot/src/app/components/rdf-ontology-view/test.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ida-chatbot/src/app/components/rdf-ontology-view/test.txt

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/test.txt b/ida-chatbot/src/app/components/rdf-ontology-view/test.txt
new file mode 100644
index 000000000..8baef1b4a
--- /dev/null
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/test.txt
@@ -0,0 +1 @@
+abc

From adc98d8fe4da6b3ca8227525c93d5c2b40d5fa0e Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Mon, 24 Jun 2019 13:05:32 +0200
Subject: [PATCH 06/66] test commit

---
 ida-chatbot/src/app/components/rdf-ontology-view/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/test.txt b/ida-chatbot/src/app/components/rdf-ontology-view/test.txt
index 8baef1b4a..6fede0913 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/test.txt
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/test.txt
@@ -1 +1 @@
-abc
+abc1

From f1f752372b99f0dbd8a30ba2e6cf1b84a4d439c8 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 25 Jun 2019 16:05:51 +0200
Subject: [PATCH 07/66] 1. creation of nodes and links for all properties. 2.
 implement on hover 3. diffterent colors for diferent types of nodes, edges
 label. 4. implement filter tab. 5. implement duestch conversion. 6. implement
 add class hierarch and all properties into filter tab.

---
 .../rdf-ontology-view.component.css           |  17 +
 .../rdf-ontology-view.component.html          |  22 ++
 .../rdf-ontology-view.component.ts            |  19 +-
 .../app/components/rdf-ontology-view/test.txt |   1 -
 .../d3v4-rdf-ontology-graph-view.js           | 326 +++++++++++++++---
 5 files changed, 331 insertions(+), 54 deletions(-)
 delete mode 100644 ida-chatbot/src/app/components/rdf-ontology-view/test.txt

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
index e69de29bb..51892118d 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
@@ -0,0 +1,17 @@
+.labelClass {
+    
+    padding-left: 20px;
+    text-indent: -15px;
+    padding-top: 7px;
+    font-size: 19px;
+  }
+.checkboxClass {
+    width: 20px; 
+    height: 20px;
+    padding-top: 10px;
+    margin:0;
+    vertical-align: bottom;
+    position: relative;
+    top: -8px;
+    *overflow: hidden;
+  }
\ No newline at end of file
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index f478ed099..b716ff230 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,3 +1,25 @@
+<div id="filtersId" 
+  style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">  
+    <!--<button  (click)="closeSideBar()">Close &times;</button> 
+    ng-style="{ 'display' : displayLeftSideBar ? 'block' : 'none' }"  -->
+    <label class="labelClass">
+      Filters: 
+       
+    </label>
+    <label class="labelClass">
+      Display in deustch  
+      <input class="checkboxClass" type="checkbox" [(ngModel)]="languageCheked" (change)="checkboxValuesChanged(isChecked)" /> 
+    </label>
+    <label class="labelClass"> 
+      Include class heirarchy 
+      <input class="checkboxClass" type="checkbox" [(ngModel)]="classHeirarchyChecked" value="1" (change)="checkboxValuesChanged(isChecked)" /> 
+    </label>
+    <label class="labelClass">
+      Include all properties 
+      <input class="checkboxClass" type="checkbox" [(ngModel)]="allPropChecked" (change)="checkboxValuesChanged(isChecked)" /> 
+    </label>
+  </div>
+
 <div align='center' [attr.id]="fdgId">
   <h2>RDF Ontology Class Hierarchy</h2>
   <div [attr.id]="svgId"> RDF-ontology-class-hierarchy img </div>
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index c9fd118a4..a2c73c6c3 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit,AfterViewInit,} from '@angular/core';
 import {UniqueIdProviderService} from '../../service/misc/unique-id-provider.service';
 
-declare function createV4RDFOntologyGraph(a, b,c);
+declare function createV4RDFOntologyGraph(a, b,c,d,e,f);
 @Component({
   selector: 'app-rdf-ontology-view',
   templateUrl: './rdf-ontology-view.component.html',
@@ -12,7 +12,10 @@ export class RdfOntologyViewComponent implements OnInit {
   public figId: string;
   public svgId: string;
   public fileName: string;
-
+  languageCheked = false;
+  classHeirarchyChecked = true;
+  allPropChecked = false;
+  
   constructor(public uip: UniqueIdProviderService) {
     this.figId = 'fig' + this.uip.getUniqueId();
     this.svgId = 'svg' + this.uip.getUniqueId();
@@ -21,13 +24,11 @@ export class RdfOntologyViewComponent implements OnInit {
   ngOnInit() {
   }
   ngAfterViewInit() {
-
-    //const svg = d3.select('#' + this.fdgid);
     this.fileName = "";
-    console.log("before calling ");
-    //createV4RDFOntologyClasshierarchy(this.figId, this.svgId,this.fileName);
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName);
-    console.log("After calling ");
-    //createV4RDFOntologyGraphtest(this.figId2, this.svgId2,this.fileName);
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked);  
+  }
+
+  checkboxValuesChanged(event: any){
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked);  
   }
 }
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/test.txt b/ida-chatbot/src/app/components/rdf-ontology-view/test.txt
deleted file mode 100644
index 6fede0913..000000000
--- a/ida-chatbot/src/app/components/rdf-ontology-view/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-abc1
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 369164549..adb4fa19e 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -1,10 +1,14 @@
-function createV4RDFOntologyGraph(figId, svgId, fileName,) {
+function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displaySubclasses,dispalyAllprop,) {
   var linksArray = [];
   var nodesArray = [];
+  var enLabelArray = [];
+  var deLabelArray = [];
 
-  var width = 1060,height = 900;
-
+  var width = 1000,height = 900;
 
+  var svgClear = d3.select("#"+svgId);
+  svgClear.selectAll("*").remove(); 
+  
   var svg = d3.select("#"+svgId)
     .append("svg")
     .attr("width", width)
@@ -12,7 +16,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,) {
  
   svg.append("svg:defs").selectAll("marker")
   .data(["end"])
-  .enter().append("svg:marker")
+  .enter().append("svg:marker") 
   .attr("id", String)
   .attr("viewBox", "0 -5 15 15")
   .attr("refX", 30) 
@@ -34,49 +38,214 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,) {
   
   d3.json("assets/rdfontology/historian-onlogoly.json", function(error, data) 
   {
+    //START :: get english and deutsch labels values into arrays
+    data["@graph"].forEach(function(elem) 
+    {
+      if(elem["rdfs:label"] != undefined)
+      {
+        if(Object.prototype.toString.call(elem["rdfs:label"]) === '[object Array]')
+        {
+          elem["rdfs:label"].forEach(function(eachIds)
+          {  
+            if(eachIds["@language"] == "de")
+            {
+              var tempLabel = {"id":elem["@id"],"language":"de","value":eachIds["@value"]}
+              deLabelArray.push(tempLabel);
+            }
+            if(eachIds["@language"] == "en")
+            {
+              var tempLabel = {"id":elem["@id"],"language":"en","value":eachIds["@value"]}
+              enLabelArray.push(tempLabel);
+            }
+
+          });
+        }
+        else
+        {
+          if(elem["rdfs:label"]["@language"] == "de")
+          {
+            var tempLabel = {"id":elem["@id"],"language":"de","value":elem["rdfs:label"]["@value"]}
+            deLabelArray.push(tempLabel);
+          }
+          if(elem["rdfs:label"]["@language"] == "en")
+          {
+            var tempLabel = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]}
+            enLabelArray.push(tempLabel);
+          }
+        }
+      }
+        
+    });
+    //END :: get english and deutch labels values into arrays
+
+    //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
     var literalIndex = 0;
     var circleIdIndex = 0;
     data["@graph"].forEach(function(element) 
     {
-        var tempSub ="";
-        var tempPred ="";
-        var tempObj ="";
+        var tempSub ="?";
+        var tempPred ="?";
+        var tempObj ="?";
         var pred="---subClassOf---";
         var tempDomainArray = [];
         //START :: Nodes and Links creation for subClassOf
-        if(element["rdfs:subClassOf"] != undefined)
+        if(displaySubclasses)
         {
-          
-          var tempLabelArray = element["@id"].split('/');
-          tempSub = tempLabelArray[tempLabelArray.length -1 ];
-          
-          if(Object.prototype.toString.call(element["rdfs:subClassOf"]) === '[object Array]')
-          {
-            element["rdfs:subClassOf"].forEach(function(eachIds)
-            {  
-              var tempLabelArray = eachIds["@id"].split('/');
-              tempObj = tempLabelArray[tempLabelArray.length -1 ];
-
-              var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
-              linksArray.push(tripleValue);
-              createNewNode(tempSub,pred,tempObj);
-            });
-          }
-          else
-          {
-            var tempLabelArray = element["rdfs:subClassOf"]["@id"].split('/');
-            tempObj = tempLabelArray[tempLabelArray.length -1 ];
-            var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
-            linksArray.push(tripleValue);
+            if(element["rdfs:subClassOf"] != undefined)
+            {
+              tempSub = getLabel(displayDeustch,element["@id"]);
+              if(tempSub == "noLabel")
+              {
+                var tempLabelArray = element["@id"].split('/');
+                tempSub = tempLabelArray[tempLabelArray.length -1 ]+'?';
+              }
 
-            createNewNode(tempSub,pred,tempObj);
-          }
-            
+              if(Object.prototype.toString.call(element["rdfs:subClassOf"]) === '[object Array]')
+              {
+                element["rdfs:subClassOf"].forEach(function(eachIds)
+                {  
+                  tempObj = getLabel(displayDeustch,eachIds["@id"]);
+                  if(tempObj == "noLabel")
+                  {
+                    var tempLabelArray = eachIds["@id"].split('/');
+                    tempObj = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                  }
+
+                  var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
+                  linksArray.push(tripleValue);
+                  createNewNode(tempSub,pred,tempObj);
+                });
+              }
+              else
+              {
+                tempObj = getLabel(displayDeustch,element["rdfs:subClassOf"]["@id"]);
+                if(tempObj == "noLabel")
+                {
+                  var tempLabelArray = element["rdfs:subClassOf"]["@id"].split('/');
+                  tempObj = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                }
+                //var tripleValue = {source:tempSub, 	predicate:'---subClassOf---', 	target:tempObj,value: 1};
+                var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
+                linksArray.push(tripleValue);
+
+                //createNewNode(tempSub,'---subClassOf---',tempObj);
+                createNewNode(tempSub,pred,tempObj);
+              }
+                
+            }
         }
         //END :: Nodes and Links creation for subClassOf
+
+        //START :: Nodes and Links creation for all Properties
+        if(dispalyAllprop)
+        {
+            //get the subject label  
+            if(element["rdfs:domain"]!=undefined)
+            {
+              if(Object.prototype.toString.call(element["rdfs:domain"]) === '[object Array]'){
+                //console.log("inside if");
+                element["rdfs:domain"].forEach(function(eachIds)
+                {
+                  var tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
+                  if(tempDomainLabel == "noLabel")
+                  {
+                    var tempLabelArray = eachIds["@id"].split('/');
+                    tempDomainLabel = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                  }
+                  tempDomainArray.push(tempDomainLabel);
+                });
+              }
+              else
+              {
+                tempSub = getLabel(displayDeustch,element["rdfs:domain"]["@id"]);
+                if(tempSub == "noLabel")
+                {
+                  var tempLabelArray = element["rdfs:domain"]["@id"].split('/');
+                  tempSub = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                }
+              }
+            }
+
+            //get the predicate
+            if(element["rdfs:domain"]!=undefined)
+            {
+              tempPred = getLabel(displayDeustch,element["@id"]);
+              if(tempPred == "noLabel")
+              {
+                var tempLabelArray = element["@id"].split('/');
+                tempPred = tempLabelArray[tempLabelArray.length -1 ]+'?';
+              }
+            }
+
+
+            //get the object  range
+            if(element["rdfs:range"]!=undefined){
+              //console.log(element.domain["@id"]);
+              if ("@id" in element["rdfs:range"])
+              {
+                tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
+                if(tempObj == "noLabel")
+                {
+                  var tempLabelArray = element["rdfs:range"]["@id"].split('/');
+                  tempObj = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                }
+              }  
+            }
+            
+            if(tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean")|| tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("date") || tempObj.toLowerCase().includes("time"))
+            {
+              tempObj = tempObj + literalIndex;
+              literalIndex = literalIndex + 1 ;
+            }
+
+            if(!tempDomainArray.length  ==0)
+            {
+              tempDomainArray.forEach(function(el)
+              {
+                if(el != "?" && tempPred != "?" && tempObj != "?")
+                {
+                  var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                  linksArray.push(tripleValue);
+                  createNewNode(el,tempPred,tempObj);
+                }
+              });
+            }
+            else
+            {
+              if(tempSub != "?" && tempPred != "?" && tempObj != "?")
+              {
+                var tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
+                linksArray.push(tripleValue);
+                createNewNode(tempSub,tempPred,tempObj);
+              }
+            }
+        }
+        //END :: Nodes and Links creation for all Properties
         
+        /*
+        if(element.subPropertyOf != undefined){
+          tempSub = element.label.value;
+          
+          tempObj = element.subPropertyOf["@id"];
+            data["@graph"].forEach(function(elem) {
+              //console.log(elem["@id"]);
+              if(elem["@id"] == element.subPropertyOf["@id"]){
+                if(elem.label != undefined){
+                  
+                tempObj = elem.label.value;
+                //console.log("elem.label.value => "+elem.label.value);
+                }
+              }
+            });
+          var tripleValue = {subject:tempSub, 	predicate:'---subPropertyOf---', 	object:tempObj};
+          triples.push(tripleValue);
+          
+        }
+          */
+        //}
       });
-      
+      //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
+
       if (error) {
           return console.warn('Error in createV3RDFOntologyGraphView() method :'+error);
       }
@@ -93,7 +262,12 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,) {
           .attr("stroke-width",1)
           .style("fill","#999")
           .attr("marker-end", "url(#end)")
-          .style("stroke-dasharray",function (d) {return  ("0, 0");})
+          .style("stroke-dasharray",function (d) { 
+            var labelStr = d.predicate; 
+            if(labelStr.includes('subClassOf')){return  ("3, 3");}
+            if(labelStr.includes('subPropertyOf')){return  ("5, 5");}
+            return  ("0, 0");})
+          
           ;
 
           // ==================== Add Link Names =====================
@@ -103,14 +277,24 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,) {
             .append("text")
               .attr("class", "link-text")
               .text( function (d) { 
-                //console.log(d);
                 return d.predicate; }) 
-                .style("fill",function(d){return "#28B463";})
+                .style("fill",function(d){var labelStr = d.predicate; 
+                  if(labelStr.includes('subClassOf'))
+                  {return "#3498DB";}
+                  if(labelStr.includes('subPropertyOf'))
+                  {return "#85929E";}
+                  return "#28B463";})
                 .style("font-size", "80%")
                 .style("font-style", "italic")
                 .attr('x', 12)
                 .attr('y', 3)
-    ;           
+    ;        
+
+    linkTexts.append("title")
+              .text(function(d) { var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
+                return returnValue;
+              });
+    ;        
     // ==================== Add Link Names =====================
 
     var node = g.append("g")
@@ -121,8 +305,14 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,) {
     ;    
     var circles = node.append("circle")
           .attr("id",function(d){return d.nodeId ;})
-          .attr("r","8")
-          .style("fill",function(d){ return "#311B92";})
+          .attr("r",function(d){var labelStr = d.id; 
+            if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+            {return 6;}
+            return 10;})
+          .style("fill",function(d){var labelStr = d.id; 
+            if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+                {return "#FF9800";} 
+            return "#311B92";})
           .call(d3.drag()
               .on("start", dragstarted)
               .on("drag", dragged)
@@ -131,13 +321,36 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,) {
 
     var lables = node.append("text")
               .attr("class", "node-text")
-              .text(function (d) { return d.id;  })
-              .style("font-size","100%")
-              .style("fill","#311B92")
+              .text(function (d) {
+                var labelStr = d.id; 
+                if(labelStr.toLowerCase().includes('string')){return "String";}
+                if(labelStr.toLowerCase().includes('datetime')){return "DateTime";}
+                if(labelStr.toLowerCase().includes('integer')){return "Integer";}
+                if(labelStr.toLowerCase().includes('boolean')){return "Boolean";}
+                return d.id; 
+              })
+              .style("font-size", function(d){var labelStr = d.id; 
+                if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+                {return "80%";}
+                return "100%";})
+              .style("font-style", function(d){var labelStr = d.id; 
+                if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+                {return "italic";}
+                return "bold";})
+              .style("fill",function(d){var labelStr = d.id; 
+                if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+                    {return "#FF9800";}
+                return "#311B92";})
               .attr('x', 12)
               .attr('y', 3)
     ;
 
+    node.append("title")
+          .text(function(d) { 
+            var returnValue = 'Node : '+d.id;
+            return returnValue; })
+    ;
+
     simulation
           .nodes(nodesArray)
           .on("tick", ticked)
@@ -160,7 +373,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,) {
           .attr("y2", function(d) { return d.target.y; })
       ;
       linkTexts
-          .attr("x", function(d) { //return  Math.max(5, Math.min(width - 10, (d.source.x + d.target.x)/2 ));
+          .attr("x", function(d) { 
             return 4 + (d.source.x + d.target.x)/2  ; })
           .attr("y", function(d) { 
             return 4 + (d.source.y + d.target.y)/2 ; })
@@ -171,6 +384,31 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,) {
           })
       ;
     }
+    function getLabel(displayDeustch,id)
+    {
+      var returnVaule = "noLabel"
+      if(!displayDeustch)
+      {
+        enLabelArray.forEach(function(elem) 
+        {
+          if(elem["id"] === id)
+          {
+            returnVaule = elem["value"];
+          } 
+        });
+      }
+      else if(displayDeustch)
+      {
+        deLabelArray.forEach(function(elem) 
+        {
+          if(elem["id"] === id)
+          {
+            returnVaule = elem["value"];
+          } 
+        });
+      }
+      return returnVaule;
+    }
 
     function createNewNode(tempSub,tempPred,tempObj)
     {

From 1b8ff64a68ed0036af637b1b0564f0ee7238cd39 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 25 Jun 2019 16:06:34 +0200
Subject: [PATCH 08/66] docker thing

---
 ida-chatbot/src/app/app.module.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 2319bd029..8256ba15e 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -61,7 +61,7 @@ import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
-//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [
@@ -123,8 +123,8 @@ import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ont
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule//,
-   // NgbModule
+    FlexLayoutModule,
+   NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,

From 6b074230b4ff8793672ea4ab1edea668e7f1520f Mon Sep 17 00:00:00 2001
From: himadri-kumari <himadri.naina@gmail.com>
Date: Tue, 25 Jun 2019 16:26:13 +0200
Subject: [PATCH 09/66] implemented graph bounded and Zoom functionality.
 implemented diable Zoom functionality and included it into filter tab.

---
 .../rdf-ontology-view.component.html          | 12 ++++++++---
 .../rdf-ontology-view.component.ts            |  9 +++++---
 .../d3v4-rdf-ontology-graph-view.js           | 21 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index b716ff230..9cec49219 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,7 +1,5 @@
 <div id="filtersId" 
   style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">  
-    <!--<button  (click)="closeSideBar()">Close &times;</button> 
-    ng-style="{ 'display' : displayLeftSideBar ? 'block' : 'none' }"  -->
     <label class="labelClass">
       Filters: 
        
@@ -18,9 +16,17 @@
       Include all properties 
       <input class="checkboxClass" type="checkbox" [(ngModel)]="allPropChecked" (change)="checkboxValuesChanged(isChecked)" /> 
     </label>
+    <label class="labelClass">
+      Bounded graph
+      <input class="checkboxClass" type="checkbox" [(ngModel)]="allNodesInBoundClicked" (change)="checkboxValuesChanged(isChecked)" /> 
+    </label>
+    <label class="labelClass">
+      Disable zoom
+      <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked" (change)="checkboxValuesChanged(isChecked)" /> 
+    </label>
   </div>
 
 <div align='center' [attr.id]="fdgId">
   <h2>RDF Ontology Class Hierarchy</h2>
-  <div [attr.id]="svgId"> RDF-ontology-class-hierarchy img </div>
+  <div [attr.id]="svgId"> </div>
 </div>
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index a2c73c6c3..b50fe0ca1 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit,AfterViewInit,} from '@angular/core';
 import {UniqueIdProviderService} from '../../service/misc/unique-id-provider.service';
 
-declare function createV4RDFOntologyGraph(a, b,c,d,e,f);
+declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h);
 @Component({
   selector: 'app-rdf-ontology-view',
   templateUrl: './rdf-ontology-view.component.html',
@@ -15,6 +15,8 @@ export class RdfOntologyViewComponent implements OnInit {
   languageCheked = false;
   classHeirarchyChecked = true;
   allPropChecked = false;
+  allNodesInBoundClicked = false;
+  disableZoomClicked = false;
   
   constructor(public uip: UniqueIdProviderService) {
     this.figId = 'fig' + this.uip.getUniqueId();
@@ -25,10 +27,11 @@ export class RdfOntologyViewComponent implements OnInit {
   }
   ngAfterViewInit() {
     this.fileName = "";
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked);  
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
   }
 
   checkboxValuesChanged(event: any){
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked);  
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
+    
   }
 }
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index adb4fa19e..039b24467 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -1,4 +1,4 @@
-function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displaySubclasses,dispalyAllprop,) {
+function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displaySubclasses,dispalyAllprop,applyNodesBoundary,disableZoom) {
   var linksArray = [];
   var nodesArray = [];
   var enLabelArray = [];
@@ -383,7 +383,26 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             return "translate(" + d.x + "," + d.y + ")";
           })
       ;
+      if(applyNodesBoundary)
+      {
+        node
+        .attr("cx", function(d) { return d.x = Math.max(Math.max(resourceRadius,literalRadius), Math.min(width - Math.max(resourceRadius,literalRadius), d.x)); })
+        .attr("cy", function(d) { return d.y = Math.max(Math.max(resourceRadius,literalRadius), Math.min(height - Math.max(resourceRadius,literalRadius), d.y)); });
+      }
+    }
+
+    if(!disableZoom)
+    {
+      var zoom_handler = d3.zoom()
+        .on("zoom", zoom_actions);
+      zoom_handler(svg);
+      //Zoom functions 
+      function zoom_actions(){
+        g.attr("transform", d3.event.transform)
+        
+      }
     }
+    
     function getLabel(displayDeustch,id)
     {
       var returnVaule = "noLabel"

From 296b39f8090c66316d8c588353c2fe5a0011c5e3 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 25 Jun 2019 16:38:12 +0200
Subject: [PATCH 10/66] 1. implement reset graph functionality and include it
 into filter tab. 2. implement right side card into rdf ontology graph
 component.

---
 .../rdf-ontology-view.component.html          | 19 +++++++++++++++----
 .../rdf-ontology-view.component.ts            | 12 ++++++++++++
 .../d3v4-rdf-ontology-graph-view.js           |  4 ++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 9cec49219..c850b7db5 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,4 +1,10 @@
-<div id="filtersId" 
+
+<div  [attr.id]="fdgId1" fxFlexstyle="height: 150vh; margin: 20px;border-color: #eaeaea;border-style: solid">
+  
+  <div style="width: 100%; height: 20%;">
+    <h1 align='center'>RDF Ontology Graph</h1>
+  </div>
+  <div id="filtersId" 
   style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">  
     <label class="labelClass">
       Filters: 
@@ -24,9 +30,14 @@
       Disable zoom
       <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked" (change)="checkboxValuesChanged(isChecked)" /> 
     </label>
+    <label class="labelClass"> 
+      <button #graphReset (click)="graphResetChanged($event)" 
+        style="width: 8%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:whitesmoke;">
+        Reset garph
+      </button> 
+    </label>
   </div>
 
-<div align='center' [attr.id]="fdgId">
-  <h2>RDF Ontology Class Hierarchy</h2>
-  <div [attr.id]="svgId"> </div>
+  <div  [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;"></div>
+
 </div>
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index b50fe0ca1..eb4a08cde 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -34,4 +34,16 @@ export class RdfOntologyViewComponent implements OnInit {
     createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
     
   }
+  graphResetChanged(event){
+    this.languageCheked = false;
+    this.classHeirarchyChecked = true;
+    this.allPropChecked = false;
+    //this.graphResetClicked = false;
+    this.allNodesInBoundClicked = false;
+    this.disableZoomClicked = false;
+    
+    console.log('inside reset');
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
+    //this.graphResetClicked = false;
+  }
 }
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 039b24467..7d4ec0cdc 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -386,8 +386,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       if(applyNodesBoundary)
       {
         node
-        .attr("cx", function(d) { return d.x = Math.max(Math.max(resourceRadius,literalRadius), Math.min(width - Math.max(resourceRadius,literalRadius), d.x)); })
-        .attr("cy", function(d) { return d.y = Math.max(Math.max(resourceRadius,literalRadius), Math.min(height - Math.max(resourceRadius,literalRadius), d.y)); });
+        .attr("cx", function(d) { return d.x = Math.max(Math.max(10,6), Math.min(width - Math.max(10,6), d.x)); })
+        .attr("cy", function(d) { return d.y = Math.max(Math.max(10,6), Math.min(height - Math.max(10,6), d.y)); });
       }
     }
 

From d755083e1be2c9fffb37c4e8b1f1375f5a993b3a Mon Sep 17 00:00:00 2001
From: himadri-kumari <himadri.naina@gmail.com>
Date: Tue, 25 Jun 2019 16:45:53 +0200
Subject: [PATCH 11/66] implement the node information section structure in
 right side card.

---
 .../rdf-ontology-view.component.html          | 37 +++++++++++++++++--
 .../d3v4-rdf-ontology-graph-view.js           |  2 +-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index c850b7db5..7a1bb5243 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,4 +1,3 @@
-
 <div  [attr.id]="fdgId1" fxFlexstyle="height: 150vh; margin: 20px;border-color: #eaeaea;border-style: solid">
   
   <div style="width: 100%; height: 20%;">
@@ -37,7 +36,39 @@ <h1 align='center'>RDF Ontology Graph</h1>
       </button> 
     </label>
   </div>
+<br/>
+    <div  id="filtersId" 
+          style="display: block;float: right;width:24.5%; height: 1053px;background-color:#F2F3F4;border-radius: 8px;">
+          
+          <div  id="nodeInformationId" 
+              style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
+            <label class="inputLabelClass">
+              Node information: 
+            </label>
+            <br/>
+          </div>
+          
+          <div  id="nodeInfoTagesId" 
+              style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
+                padding-top: 10px;">
+            <label class="inputLabelClass" id="nodeNameId" >
+              Node name: 
+            </label>
+            <br/><br/>
+            <label class="inputLabelClass">
+              Node ID: - -
+            </label>
+            <br/><br/>
+            <label class="inputLabelClass">
+              Description: - -
+            </label>
+            <br/><br/>
+            <label class="inputLabelClass">
+              Type: - -
+            </label>
+            <br/><br/>
+          </div>
 
-  <div  [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;"></div>
-
+    </div>
+    <div  [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;"></div>
 </div>
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 7d4ec0cdc..8c4ed24ca 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -4,7 +4,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
   var enLabelArray = [];
   var deLabelArray = [];
 
-  var width = 1000,height = 900;
+  var width = 1060,height = 900;
 
   var svgClear = d3.select("#"+svgId);
   svgClear.selectAll("*").remove(); 

From 3480643c1a4801e439d6f3f7d045bc4e5e2a7b42 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 25 Jun 2019 16:51:55 +0200
Subject: [PATCH 12/66] 1. implement the customization graph section structure
 in right side card.

---
 ida-chatbot/src/app/app.module.ts             |  6 +-
 .../rdf-ontology-view.component.css           | 11 ++++
 .../rdf-ontology-view.component.html          | 56 +++++++++++++++++++
 .../rdf-ontology-view.component.ts            | 17 +++++-
 4 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 8256ba15e..6ac16bf1b 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -61,7 +61,7 @@ import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
-import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [
@@ -123,8 +123,8 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule,
-   NgbModule
+    FlexLayoutModule//,
+    //NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
index 51892118d..97fa6237f 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
@@ -14,4 +14,15 @@
     position: relative;
     top: -8px;
     *overflow: hidden;
+  }
+  .inputLabelClass {
+    padding-left: 10px;
+    font-size: 19px;
+    float: left;
+  }
+  
+  .inputTextClass {
+    border-radius: 8px;
+    width: 33%;
+    padding-left: 3px;
   }
\ No newline at end of file
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 7a1bb5243..28bcdbdc8 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -69,6 +69,62 @@ <h1 align='center'>RDF Ontology Graph</h1>
             <br/><br/>
           </div>
 
+          <div  id="graphConfigId" 
+              style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
+            <label class="inputLabelClass">
+              Customize graph: 
+            </label>
+            <br/>
+          </div>
+          
+          <div  id="graphConfigInputsId" 
+              style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
+                padding-top: 10px;">
+            <label class="inputLabelClass">
+              Edge size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 100">
+            </label><br/>
+            <label class="inputLabelClass">
+              Graph charge/depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge" placeholder=" 1000">
+            </label><br/>
+            <label class="inputLabelClass">
+              Resource node radius: <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius" placeholder=" 10">
+            </label><br/>
+            <label class="inputLabelClass">
+              Literal node radius: <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
+            </label><br/>
+            <label class="inputLabelClass">
+              Resource node color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor" placeholder=" #311B92">
+            </label><br/>
+            <label class="inputLabelClass">
+              Resource node text color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor" placeholder=" #311B92" >
+            </label><br/>
+            <label class="inputLabelClass">
+              Literal node color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor" placeholder=" #FF9800">
+            </label><br/>
+            <label class="inputLabelClass">
+              Literal node text color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor" placeholder=" #FF9800" >
+            </label><br/>
+            <label class="inputLabelClass">
+              Sub class label: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel" placeholder=" --subClassOf--" >
+            </label><br/>
+            <label class="inputLabelClass">
+              Sub class label color: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor" placeholder=" #3498DB" >
+            </label><br/>
+            <label class="inputLabelClass">
+              Property text color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor" placeholder=" #28B463">
+            </label><br/>
+            <label class="inputLabelClass">
+              On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
+            </label><br/>
+            <label class="inputLabelClass">
+              On double click node color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor" placeholder=" pink" >
+            </label><br/> <br/><br/> 
+ 
+            <button #applyConfigBtn (click)="applyConfigClicked($event)" 
+              style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
+              Apply changes
+            </button>
+          </div>
     </div>
     <div  [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;"></div>
 </div>
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index eb4a08cde..649d62f40 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -17,6 +17,11 @@ export class RdfOntologyViewComponent implements OnInit {
   allPropChecked = false;
   allNodesInBoundClicked = false;
   disableZoomClicked = false;
+  edgeSize = 100;
+  graphCharge = 1000;
+  resourceRadius = 10;
+  literalRadius = 6;
+  resourceNodeColor ="#311B92";
   
   constructor(public uip: UniqueIdProviderService) {
     this.figId = 'fig' + this.uip.getUniqueId();
@@ -38,12 +43,18 @@ export class RdfOntologyViewComponent implements OnInit {
     this.languageCheked = false;
     this.classHeirarchyChecked = true;
     this.allPropChecked = false;
-    //this.graphResetClicked = false;
+    this.allNodesInBoundClicked = false;
+    this.disableZoomClicked = false;
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
+  }
+
+  applyConfigClicked(event){
+    this.languageCheked = false;
+    this.classHeirarchyChecked = true;
+    this.allPropChecked = false;
     this.allNodesInBoundClicked = false;
     this.disableZoomClicked = false;
     
-    console.log('inside reset');
     createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
-    //this.graphResetClicked = false;
   }
 }

From 2d863da8978eecf5b242994645cde7589db583df Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 25 Jun 2019 16:52:53 +0200
Subject: [PATCH 13/66] docker thing

---
 ida-chatbot/src/app/app.module.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 6ac16bf1b..b4c9ea014 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -61,7 +61,7 @@ import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
-//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [
@@ -123,8 +123,8 @@ import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ont
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule//,
-    //NgbModule
+    FlexLayoutModule,
+    NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,

From 58fdd4146a8a8bfc485fa2578c977526ef7b261f Mon Sep 17 00:00:00 2001
From: himadri-kumari <himadri.naina@gmail.com>
Date: Tue, 25 Jun 2019 17:09:30 +0200
Subject: [PATCH 14/66] - removed the edge label and replace the literal node
 label with edge label in literals nodes. - for subclass edges change the
 marker color to gray. - display the marker in correct position in graph. -
 started implementing the double click function to display the node
 ifnormation in right side card.

---
 .../rdf-ontology-view.component.html          |  38 +++-
 .../rdf-ontology-view.component.ts            |  65 +++++-
 .../d3v4-rdf-ontology-graph-view.js           | 198 +++++++++++++-----
 3 files changed, 235 insertions(+), 66 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 28bcdbdc8..bedc17ddc 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -10,7 +10,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
        
     </label>
     <label class="labelClass">
-      Display in deustch  
+      Display in deustch 
       <input class="checkboxClass" type="checkbox" [(ngModel)]="languageCheked" (change)="checkboxValuesChanged(isChecked)" /> 
     </label>
     <label class="labelClass"> 
@@ -51,20 +51,40 @@ <h1 align='center'>RDF Ontology Graph</h1>
           <div  id="nodeInfoTagesId" 
               style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
                 padding-top: 10px;">
-            <label class="inputLabelClass" id="nodeNameId" >
-              Node name: 
+            <label class="inputLabelClass" [attr.id]="nodeId" > 
+                Node: 
             </label>
             <br/><br/>
-            <label class="inputLabelClass">
-              Node ID: - -
+            <label class="inputLabelClass" [attr.id]="nodeLabelId" > 
+              Label:
             </label>
             <br/><br/>
-            <label class="inputLabelClass">
-              Description: - -
+            <label class="inputLabelClass" [attr.id]="nodeIdsId">
+                Id:
             </label>
             <br/><br/>
-            <label class="inputLabelClass">
-              Type: - -
+            <label class="inputLabelClass" [attr.id]="nodeTypeId">
+                Type:
+            </label>
+            <br/><br/>
+            <label class="inputLabelClass" [attr.id]="nodeDescripId">
+                Description: 
+            </label>
+            <br/><br/>
+            <label class="inputLabelClass" [attr.id]="nodeSubClassId">
+                Sub class of :
+            </label>
+            <br/><br/>
+            <label class="inputLabelClass" [attr.id]="nodeDomainId">
+                Domain:
+            </label>
+            <br/><br/>
+            <label class="inputLabelClass" [attr.id]="nodeRangeId">
+                Range:
+            </label>
+            <br/><br/>
+            <label class="inputLabelClass" [attr.id]="nodeCommentId">
+                Comment:
             </label>
             <br/><br/>
           </div>
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index 649d62f40..0f5a140b0 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -1,7 +1,7 @@
-import { Component, OnInit,AfterViewInit,} from '@angular/core';
+import { Component, OnInit, AfterViewInit} from '@angular/core';
 import {UniqueIdProviderService} from '../../service/misc/unique-id-provider.service';
 
-declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h);
+declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h,j);
 @Component({
   selector: 'app-rdf-ontology-view',
   templateUrl: './rdf-ontology-view.component.html',
@@ -12,6 +12,16 @@ export class RdfOntologyViewComponent implements OnInit {
   public figId: string;
   public svgId: string;
   public fileName: string;
+  public nodeId: string;
+  public nodeLabelId: string;
+  public nodeIdsId: string;
+  public nodeTypeId: string;
+  public nodeDescripId: string;
+  public nodeSubClassId: string;
+  public nodeDomainId: string;
+  public nodeRangeId: string;
+  public nodeCommentId: string;
+
   languageCheked = false;
   classHeirarchyChecked = true;
   allPropChecked = false;
@@ -26,18 +36,47 @@ export class RdfOntologyViewComponent implements OnInit {
   constructor(public uip: UniqueIdProviderService) {
     this.figId = 'fig' + this.uip.getUniqueId();
     this.svgId = 'svg' + this.uip.getUniqueId();
+    this.nodeId = 'nodeLabelId' + this.uip.getUniqueId();
+    this.nodeLabelId = 'nodeLabelId' + this.uip.getUniqueId();
+    this.nodeIdsId = 'nodeIdsId' + this.uip.getUniqueId();
+    this.nodeTypeId = 'nodeTypeId' + this.uip.getUniqueId();
+    this.nodeDescripId = 'nodeDescripId' + this.uip.getUniqueId();
+    this.nodeSubClassId = 'nodeSubClassId' + this.uip.getUniqueId();
+    this.nodeDomainId = 'nodeDomainId' + this.uip.getUniqueId();
+    this.nodeRangeId = 'nodeRangeId' + this.uip.getUniqueId();
+    this.nodeCommentId = 'nodeCommentId' + this.uip.getUniqueId();
   }
 
   ngOnInit() {
   }
-  ngAfterViewInit() {
+
+  ngAfterViewInit() 
+  {
     this.fileName = "";
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
+    var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
+                nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
+                nodeCommentId:this.nodeCommentId
+               }
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
+      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal);
   }
 
   checkboxValuesChanged(event: any){
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
+    var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
+                nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
+                nodeCommentId:this.nodeCommentId
+               }
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
+      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal);
     
+    /*if(event === "yes")
+    {
+      createV4RDFOntologyGraph(this.figId1, this.svgId1,this.fileName,"de",true,true);
+    }
+    else if(event === "no")
+    {
+      createV4RDFOntologyGraph(this.figId1, this.svgId1,this.fileName,"en",true,false);
+    }*/
   }
   graphResetChanged(event){
     this.languageCheked = false;
@@ -45,7 +84,13 @@ export class RdfOntologyViewComponent implements OnInit {
     this.allPropChecked = false;
     this.allNodesInBoundClicked = false;
     this.disableZoomClicked = false;
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
+
+    var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
+                nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
+                nodeCommentId:this.nodeCommentId
+               }
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
+      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal);
   }
 
   applyConfigClicked(event){
@@ -55,6 +100,12 @@ export class RdfOntologyViewComponent implements OnInit {
     this.allNodesInBoundClicked = false;
     this.disableZoomClicked = false;
     
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked);
+    var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
+                nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
+                nodeCommentId:this.nodeCommentId
+               }
+    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
+      this.allPropChecked,this.allNodesInBoundClicked,
+      this.disableZoomClicked,idVal);
   }
 }
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 8c4ed24ca..1093df886 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -1,14 +1,17 @@
-function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displaySubclasses,dispalyAllprop,applyNodesBoundary,disableZoom) {
+function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displaySubclasses,
+                                  dispalyAllprop,applyNodesBoundary,disableZoom,idsArray) {
   var linksArray = [];
   var nodesArray = [];
   var enLabelArray = [];
   var deLabelArray = [];
+  var expandedNodesArray = [];
 
-  var width = 1060,height = 900;
+  var width = 1060,height = 900,resourceRadius = 8,literalRadius = 5;
 
+  
   var svgClear = d3.select("#"+svgId);
   svgClear.selectAll("*").remove(); 
-  
+
   var svg = d3.select("#"+svgId)
     .append("svg")
     .attr("width", width)
@@ -16,7 +19,21 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
  
   svg.append("svg:defs").selectAll("marker")
   .data(["end"])
-  .enter().append("svg:marker") 
+  .enter().append("svg:marker")
+  .attr("id", String)
+  .attr("viewBox", "0 -5 15 15")
+  .attr("refX", 30) 
+  .attr("refY", -0.5)
+  .attr("markerWidth", 26)
+  .attr("markerHeight", 6)
+  .attr("orient", "auto")
+  .append("svg:polyline")
+  .style("fill","black")
+  .attr("points", "0,-5 18,0 0,5")
+  ;
+  svg.append("svg:defs").selectAll("marker")
+  .data(["end1"])
+  .enter().append("svg:marker")
   .attr("id", String)
   .attr("viewBox", "0 -5 15 15")
   .attr("refX", 30) 
@@ -25,6 +42,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
   .attr("markerHeight", 6)
   .attr("orient", "auto")
   .append("svg:polyline")
+  .style("fill", "grey")
   .attr("points", "0,-5 10,0 0,5")
   ;
   
@@ -72,7 +90,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             var tempLabel = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]}
             enLabelArray.push(tempLabel);
           }
-        }
+         }
       }
         
     });
@@ -97,7 +115,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               if(tempSub == "noLabel")
               {
                 var tempLabelArray = element["@id"].split('/');
-                tempSub = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                tempSub = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
               }
 
               if(Object.prototype.toString.call(element["rdfs:subClassOf"]) === '[object Array]')
@@ -108,12 +127,15 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   if(tempObj == "noLabel")
                   {
                     var tempLabelArray = eachIds["@id"].split('/');
-                    tempObj = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                    var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                    tempObj = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
                   }
 
                   var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
                   linksArray.push(tripleValue);
-                  createNewNode(tempSub,pred,tempObj);
+                  
+                  //createNewNode(tempSub,'---subClassOf---',tempObj);
+                  createNewNode(tempSub,pred,tempObj,false,'',element);
                 });
               }
               else
@@ -122,16 +144,16 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 if(tempObj == "noLabel")
                 {
                   var tempLabelArray = element["rdfs:subClassOf"]["@id"].split('/');
-                  tempObj = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
                 }
                 //var tripleValue = {source:tempSub, 	predicate:'---subClassOf---', 	target:tempObj,value: 1};
                 var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
                 linksArray.push(tripleValue);
 
                 //createNewNode(tempSub,'---subClassOf---',tempObj);
-                createNewNode(tempSub,pred,tempObj);
+                createNewNode(tempSub,pred,tempObj,false,'',element);
               }
-                
             }
         }
         //END :: Nodes and Links creation for subClassOf
@@ -150,7 +172,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   if(tempDomainLabel == "noLabel")
                   {
                     var tempLabelArray = eachIds["@id"].split('/');
-                    tempDomainLabel = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                    var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                    tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
                   }
                   tempDomainArray.push(tempDomainLabel);
                 });
@@ -161,7 +184,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 if(tempSub == "noLabel")
                 {
                   var tempLabelArray = element["rdfs:domain"]["@id"].split('/');
-                  tempSub = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempSub = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
                 }
               }
             }
@@ -173,7 +197,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               if(tempPred == "noLabel")
               {
                 var tempLabelArray = element["@id"].split('/');
-                tempPred = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                tempPred = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
               }
             }
 
@@ -187,15 +212,21 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 if(tempObj == "noLabel")
                 {
                   var tempLabelArray = element["rdfs:range"]["@id"].split('/');
-                  tempObj = tempLabelArray[tempLabelArray.length -1 ]+'?';
+                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
                 }
               }  
             }
             
-            if(tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean")|| tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("date") || tempObj.toLowerCase().includes("time"))
+            var isLitteral = false;
+            var literalDataType = tempObj;
+
+            if(tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean")|| tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime"))
             {
               tempObj = tempObj + literalIndex;
               literalIndex = literalIndex + 1 ;
+              isLitteral = true;
+              console.log('tempObj 0 '+tempObj);
             }
 
             if(!tempDomainArray.length  ==0)
@@ -204,9 +235,18 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 if(el != "?" && tempPred != "?" && tempObj != "?")
                 {
-                  var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
-                  linksArray.push(tripleValue);
-                  createNewNode(el,tempPred,tempObj);
+                  if(isLitteral)
+                  {
+                    var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                    linksArray.push(tripleValue);
+                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element);
+                  }
+                  else
+                  {
+                    var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                    linksArray.push(tripleValue);
+                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element);
+                  }
                 }
               });
             }
@@ -214,9 +254,18 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             {
               if(tempSub != "?" && tempPred != "?" && tempObj != "?")
               {
-                var tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
-                linksArray.push(tripleValue);
-                createNewNode(tempSub,tempPred,tempObj);
+                if(isLitteral)
+                {
+                  var tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
+                  linksArray.push(tripleValue);
+                  createNewNode(tempSub,'',tempPred,isLitteral,literalDataType,element);
+                }
+                else
+                {
+                  var tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
+                  linksArray.push(tripleValue);
+                  createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType,element);
+                }
               }
             }
         }
@@ -251,8 +300,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       }
       
       var g = svg.append("g")
-          .attr("class", "everything");         
+          .attr("class", "everything");
+          
         
+
     var link = g.append("g")
           .attr("class", "links")
           .selectAll("line")
@@ -261,7 +312,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           .attr("class", "link")
           .attr("stroke-width",1)
           .style("fill","#999")
-          .attr("marker-end", "url(#end)")
+          //.attr("marker-end", "url(#end)")
+          .attr("marker-end",function (d) { 
+            var labelStr = d.predicate; 
+            if(labelStr.includes('subClassOf')){return  "url(#end1)";}
+            return  "url(#end)"})
           .style("stroke-dasharray",function (d) { 
             var labelStr = d.predicate; 
             if(labelStr.includes('subClassOf')){return  ("3, 3");}
@@ -277,6 +332,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             .append("text")
               .attr("class", "link-text")
               .text( function (d) { 
+                //console.log(d);
                 return d.predicate; }) 
                 .style("fill",function(d){var labelStr = d.predicate; 
                   if(labelStr.includes('subClassOf'))
@@ -288,7 +344,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 .style("font-style", "italic")
                 .attr('x', 12)
                 .attr('y', 3)
-    ;        
+    ;    
+    
+    link.append("title")
+              .text(function(d) { var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
+                return returnValue;
+              });
+    ; 
 
     linkTexts.append("title")
               .text(function(d) { var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
@@ -305,12 +367,12 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
     ;    
     var circles = node.append("circle")
           .attr("id",function(d){return d.nodeId ;})
-          .attr("r",function(d){var labelStr = d.id; 
-            if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
-            {return 6;}
-            return 10;})
+          .attr("r",function(d){var labelStr = d.id;
+            if(d.isLitteral)
+            {return literalRadius;}
+            return resourceRadius;})
           .style("fill",function(d){var labelStr = d.id; 
-            if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+            if(d.isLitteral)
                 {return "#FF9800";} 
             return "#311B92";})
           .call(d3.drag()
@@ -321,35 +383,65 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
 
     var lables = node.append("text")
               .attr("class", "node-text")
-              .text(function (d) {
-                var labelStr = d.id; 
-                if(labelStr.toLowerCase().includes('string')){return "String";}
-                if(labelStr.toLowerCase().includes('datetime')){return "DateTime";}
-                if(labelStr.toLowerCase().includes('integer')){return "Integer";}
-                if(labelStr.toLowerCase().includes('boolean')){return "Boolean";}
-                return d.id; 
-              })
+              .text(function (d) {return d.id; })
               .style("font-size", function(d){var labelStr = d.id; 
-                if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+                if(d.isLitteral)
                 {return "80%";}
                 return "100%";})
               .style("font-style", function(d){var labelStr = d.id; 
-                if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+                if(d.isLitteral)
                 {return "italic";}
                 return "bold";})
               .style("fill",function(d){var labelStr = d.id; 
-                if(labelStr.toLowerCase().includes('string')|| labelStr.toLowerCase().includes('integer')|| labelStr.toLowerCase().includes('datetime')|| labelStr.toLowerCase().includes('boolean'))
+                if(d.isLitteral)
                     {return "#FF9800";}
                 return "#311B92";})
-              .attr('x', 12)
-              .attr('y', 3)
+              .attr('x', function(d){
+                if(d.isLitteral)
+                    {return 8;}
+                return 12;})
+              .attr('y', 3) 
     ;
 
     node.append("title")
           .text(function(d) { 
             var returnValue = 'Node : '+d.id;
+            if(d.isLitteral){returnValue = 'Node : '+d.id +'\nData type : '+d.literalDataType;}
+            else{returnValue = 'Node : '+d.id;}
             return returnValue; })
     ;
+    
+    node.on("dblclick",function(d){   
+      var idVal =  "#"+d.nodeId;
+
+      var tempNode = d3.select("#"+idsArray.nodeId)
+      tempNode.selectAll("*").remove(); 
+
+      tempNode.append("text")
+             .text(d.id) ; 
+
+      
+      var nodeLabel = d3.select("#"+idsArray.nodeLabelId)
+      nodeLabel.selectAll("*").remove(); 
+
+      console.log('d.nodeContains => '+d.nodeContains);
+      console.log('d.nodeContains["rdfs:label"] => '+d.nodeContains["rdfs:label"]);
+      
+      console.log('d.nodeContains["rdfs:label"]["@value"]  => '+d.nodeContains["rdfs:label"]["@value"]);
+      if(d.nodeContains["rdfs:label"] != undefined && d.nodeContains["rdfs:label"]["@value"] != undefined )
+      {
+        nodeLabel.append("text")
+            .text(d.nodeContains["rdfs:label"]["@value"]) ; 
+      }
+         
+      var nodeDescription = d3.select("#"+idsArray.nodeDescripId)
+      nodeDescription.selectAll("*").remove(); 
+      if(d.nodeContains["dc:description"] != undefined && d.nodeContains["dc:description"]["@value"] != undefined )
+      {
+        nodeDescription.append("text")
+            .text(d.nodeContains["dc:description"]["@value"]) ; 
+      }
+    });
 
     simulation
           .nodes(nodesArray)
@@ -373,21 +465,24 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           .attr("y2", function(d) { return d.target.y; })
       ;
       linkTexts
-          .attr("x", function(d) { 
+          .attr("x", function(d) { //return  Math.max(5, Math.min(width - 10, (d.source.x + d.target.x)/2 ));
             return 4 + (d.source.x + d.target.x)/2  ; })
           .attr("y", function(d) { 
+            // return  Math.max(5, Math.min(height - 10, (d.source.y + d.target.y)/2));
             return 4 + (d.source.y + d.target.y)/2 ; })
       ;
       node
         .attr("transform", function(d) {
             return "translate(" + d.x + "," + d.y + ")";
+            //return "translate(" + Math.max(10, Math.min(width - 10, d.x)) + "," + Math.max(5, Math.min(height - 10, d.y)) + ")";
+            //return "translate(" + (d.x < 1000 ? d.x = 100 : d.x > 1000 ? d.x = 900 : d.x) + "," + (d.y < 1000 ? d.y = 100 : d.y > 900 ? d.y = 900 : d.y) + ")";
           })
       ;
       if(applyNodesBoundary)
       {
         node
-        .attr("cx", function(d) { return d.x = Math.max(Math.max(10,6), Math.min(width - Math.max(10,6), d.x)); })
-        .attr("cy", function(d) { return d.y = Math.max(Math.max(10,6), Math.min(height - Math.max(10,6), d.y)); });
+        .attr("cx", function(d) { return d.x = Math.max(Math.max(resourceRadius,literalRadius), Math.min(width - Math.max(resourceRadius,literalRadius), d.x)); })
+        .attr("cy", function(d) { return d.y = Math.max(Math.max(resourceRadius,literalRadius), Math.min(height - Math.max(resourceRadius,literalRadius), d.y)); });
       }
     }
 
@@ -429,7 +524,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       return returnVaule;
     }
 
-    function createNewNode(tempSub,tempPred,tempObj)
+    function createNewNode(tempSub,tempPred,tempObj,isLitteralVal,literalDataTypeVal,element)
     {
       //START :: Node creation
       var subNodeAdded = false;  
@@ -452,19 +547,21 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       
       if(subNodeAdded === false)
       {
-        var nodeValue = {id:tempSub ,predicate:tempPred, group: 1};
+        circleIdIndex =circleIdIndex+1; 
+        var nodeValue = {nodeContains:element,id:tempSub ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:false,literalDataType:literalDataTypeVal, group: 1};
         nodesArray.push(nodeValue);
       }
       if(objNodeAdded === false)
       {
-        var nodeValue = {id:tempObj ,predicate:tempPred, group: 1};
+        circleIdIndex =circleIdIndex+1;
+        var nodeValue = {nodeContains:element,id:tempObj ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:isLitteralVal,literalDataType:literalDataTypeVal, group: 1};
         nodesArray.push(nodeValue);
       }
       //END :: Node creation
       //console.log("nodeValue len =>"+nodesArray.length);
     }
   });
-
+  
   function dragstarted(d) {
     if (!d3.event.active) simulation.alphaTarget(0.3).restart();
     d.fx = d.x;
@@ -481,4 +578,5 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
     d.fx = null;
     d.fy = null;
   }
+  
 };

From bb76c6a356f8fc4338b9a476fe3fadb53cbed2ea Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 25 Jun 2019 17:55:23 +0200
Subject: [PATCH 15/66] 1.implementing the customization graph section
 structure of right side card functionality.

---
 .../rdf-ontology-view.component.html          |  5 +-
 .../rdf-ontology-view.component.ts            | 91 ++++++++++++++++---
 .../d3v4-rdf-ontology-graph-view.js           | 60 +++++-------
 3 files changed, 105 insertions(+), 51 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index bedc17ddc..17be2c75f 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -101,7 +101,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
               style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
                 padding-top: 10px;">
             <label class="inputLabelClass">
-              Edge size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 100">
+              Edge size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
             </label><br/>
             <label class="inputLabelClass">
               Graph charge/depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge" placeholder=" 1000">
@@ -135,9 +135,6 @@ <h1 align='center'>RDF Ontology Graph</h1>
             </label><br/>
             <label class="inputLabelClass">
               On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
-            </label><br/>
-            <label class="inputLabelClass">
-              On double click node color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor" placeholder=" pink" >
             </label><br/> <br/><br/> 
  
             <button #applyConfigBtn (click)="applyConfigClicked($event)" 
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index 0f5a140b0..16103d3fd 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, AfterViewInit} from '@angular/core';
 import {UniqueIdProviderService} from '../../service/misc/unique-id-provider.service';
 
-declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h,j);
+declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h,j,i);
 @Component({
   selector: 'app-rdf-ontology-view',
   templateUrl: './rdf-ontology-view.component.html',
@@ -27,11 +27,18 @@ export class RdfOntologyViewComponent implements OnInit {
   allPropChecked = false;
   allNodesInBoundClicked = false;
   disableZoomClicked = false;
-  edgeSize = 100;
+  edgeSize = 50;
   graphCharge = 1000;
   resourceRadius = 10;
   literalRadius = 6;
   resourceNodeColor ="#311B92";
+  resourceNodeTextColor = "#311B92";
+  literalNodeColor ="#FF9800";
+  literalNodeTextColor ="#FF9800";
+  subClassLabel ="--subClassOf--";
+  subClassLabelColor ="#3498DB";
+  propertyTextColor ="#28B463";
+  onClickNodeColor ="red";
   
   constructor(public uip: UniqueIdProviderService) {
     this.figId = 'fig' + this.uip.getUniqueId();
@@ -57,8 +64,21 @@ export class RdfOntologyViewComponent implements OnInit {
                 nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
                 nodeCommentId:this.nodeCommentId
                }
+    var customizeGraphVals = {edgeSize:this.edgeSize,
+                graphCharge:this.graphCharge,
+                resourceRadius:this.resourceRadius,
+                literalRadius:this.literalRadius,
+                resourceNodeColor:this.resourceNodeColor,
+                resourceNodeTextColor:this.resourceNodeTextColor,
+                literalNodeColor:this.literalNodeColor,
+                literalNodeTextColor:this.literalNodeTextColor,
+                subClassLabel:this.subClassLabel,
+                subClassLabelColor:this.subClassLabelColor,
+                propertyTextColor:this.propertyTextColor,
+                onClickNodeColor:this.onClickNodeColor
+                }
     createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
-      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal);
+      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
   }
 
   checkboxValuesChanged(event: any){
@@ -66,8 +86,21 @@ export class RdfOntologyViewComponent implements OnInit {
                 nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
                 nodeCommentId:this.nodeCommentId
                }
+    var customizeGraphVals = {edgeSize:this.edgeSize,
+                graphCharge:this.graphCharge,
+                resourceRadius:this.resourceRadius,
+                literalRadius:this.literalRadius,
+                resourceNodeColor:this.resourceNodeColor,
+                resourceNodeTextColor:this.resourceNodeTextColor,
+                literalNodeColor:this.literalNodeColor,
+                literalNodeTextColor:this.literalNodeTextColor,
+                subClassLabel:this.subClassLabel,
+                subClassLabelColor:this.subClassLabelColor,
+                propertyTextColor:this.propertyTextColor,
+                onClickNodeColor:this.onClickNodeColor
+                }
     createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
-      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal);
+      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
     
     /*if(event === "yes")
     {
@@ -89,23 +122,59 @@ export class RdfOntologyViewComponent implements OnInit {
                 nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
                 nodeCommentId:this.nodeCommentId
                }
+
+    this.edgeSize = 50;
+    this.graphCharge = 1000;
+    this.resourceRadius = 10;
+    this.literalRadius = 6;
+    this.resourceNodeColor ="#311B92";
+    this.resourceNodeTextColor = "#311B92";
+    this.literalNodeColor ="#FF9800";
+    this.literalNodeTextColor ="#FF9800";
+    this.subClassLabel ="--subClassOf--";
+    this.subClassLabelColor ="#3498DB";
+    this.propertyTextColor ="#28B463";
+    this.onClickNodeColor ="red";
+
+    var customizeGraphVals = {edgeSize:this.edgeSize,
+                              graphCharge:this.graphCharge,
+                              resourceRadius:this.resourceRadius,
+                              literalRadius:this.literalRadius,
+                              resourceNodeColor:this.resourceNodeColor,
+                              resourceNodeTextColor:this.resourceNodeTextColor,
+                              literalNodeColor:this.literalNodeColor,
+                              literalNodeTextColor:this.literalNodeTextColor,
+                              subClassLabel:this.subClassLabel,
+                              subClassLabelColor:this.subClassLabelColor,
+                              propertyTextColor:this.propertyTextColor,
+                              onClickNodeColor:this.onClickNodeColor
+                              }
+
     createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
-      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal);
+      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
   }
 
   applyConfigClicked(event){
-    this.languageCheked = false;
-    this.classHeirarchyChecked = true;
-    this.allPropChecked = false;
-    this.allNodesInBoundClicked = false;
-    this.disableZoomClicked = false;
     
     var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
                 nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
                 nodeCommentId:this.nodeCommentId
                }
+    var customizeGraphVals = {edgeSize:this.edgeSize,
+                graphCharge:this.graphCharge,
+                resourceRadius:this.resourceRadius,
+                literalRadius:this.literalRadius,
+                resourceNodeColor:this.resourceNodeColor,
+                resourceNodeTextColor:this.resourceNodeTextColor,
+                literalNodeColor:this.literalNodeColor,
+                literalNodeTextColor:this.literalNodeTextColor,
+                subClassLabel:this.subClassLabel,
+                subClassLabelColor:this.subClassLabelColor,
+                propertyTextColor:this.propertyTextColor,
+                onClickNodeColor:this.onClickNodeColor
+                }
     createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
       this.allPropChecked,this.allNodesInBoundClicked,
-      this.disableZoomClicked,idVal);
+      this.disableZoomClicked,idVal,customizeGraphVals);
   }
 }
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 1093df886..b434c43f5 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -1,12 +1,12 @@
 function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displaySubclasses,
-                                  dispalyAllprop,applyNodesBoundary,disableZoom,idsArray) {
+                                  dispalyAllprop,applyNodesBoundary,disableZoom,idsArray,customizeGraphArray) {
   var linksArray = [];
   var nodesArray = [];
   var enLabelArray = [];
   var deLabelArray = [];
   var expandedNodesArray = [];
 
-  var width = 1060,height = 900,resourceRadius = 8,literalRadius = 5;
+  var width = 1060,height = 900,resourceRadius = customizeGraphArray.resourceRadius,literalRadius = customizeGraphArray.literalRadius;
 
   
   var svgClear = d3.select("#"+svgId);
@@ -50,8 +50,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
   var color = d3.scaleOrdinal(d3.schemeCategory20);
 
   var simulation = d3.forceSimulation()
-    .force("link", d3.forceLink().id(function(d) { return d.id; }).distance(50))
-    .force("charge", d3.forceManyBody().strength(-1000)) //Charge strength is here
+    .force("link", d3.forceLink().id(function(d) { return d.id; }).distance(customizeGraphArray.edgeSize))
+    .force("charge", d3.forceManyBody().strength(-customizeGraphArray.graphCharge)) //Charge strength is here
     .force("center", d3.forceCenter((width / 2), (height / 2)));
   
   d3.json("assets/rdfontology/historian-onlogoly.json", function(error, data) 
@@ -270,28 +270,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             }
         }
         //END :: Nodes and Links creation for all Properties
-        
-        /*
-        if(element.subPropertyOf != undefined){
-          tempSub = element.label.value;
-          
-          tempObj = element.subPropertyOf["@id"];
-            data["@graph"].forEach(function(elem) {
-              //console.log(elem["@id"]);
-              if(elem["@id"] == element.subPropertyOf["@id"]){
-                if(elem.label != undefined){
-                  
-                tempObj = elem.label.value;
-                //console.log("elem.label.value => "+elem.label.value);
-                }
-              }
-            });
-          var tripleValue = {subject:tempSub, 	predicate:'---subPropertyOf---', 	object:tempObj};
-          triples.push(tripleValue);
-          
-        }
-          */
-        //}
       });
       //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
@@ -332,14 +310,14 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             .append("text")
               .attr("class", "link-text")
               .text( function (d) { 
-                //console.log(d);
+                var labelStr = d.predicate; 
+                if(labelStr.includes('subClassOf'))
+                  {return customizeGraphArray.subClassLabel;}
                 return d.predicate; }) 
                 .style("fill",function(d){var labelStr = d.predicate; 
                   if(labelStr.includes('subClassOf'))
-                  {return "#3498DB";}
-                  if(labelStr.includes('subPropertyOf'))
-                  {return "#85929E";}
-                  return "#28B463";})
+                  {return customizeGraphArray.subClassLabelColor;}
+                  return customizeGraphArray.propertyTextColor;})
                 .style("font-size", "80%")
                 .style("font-style", "italic")
                 .attr('x', 12)
@@ -353,7 +331,17 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
     ; 
 
     linkTexts.append("title")
-              .text(function(d) { var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
+              .text(function(d) { 
+                var labelStr = d.predicate; 
+                if(labelStr.includes('subClassOf'))
+                {
+                    var returnValue = 'Source : '+d.source +'\nProperty : '+customizeGraphArray.subClassLabel+'\nObject : '+d.target;
+                }
+                else
+                {
+                  var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
+                }
+                
                 return returnValue;
               });
     ;        
@@ -373,8 +361,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             return resourceRadius;})
           .style("fill",function(d){var labelStr = d.id; 
             if(d.isLitteral)
-                {return "#FF9800";} 
-            return "#311B92";})
+                {return customizeGraphArray.literalNodeColor;} 
+            return customizeGraphArray.resourceNodeColor;})
           .call(d3.drag()
               .on("start", dragstarted)
               .on("drag", dragged)
@@ -394,8 +382,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 return "bold";})
               .style("fill",function(d){var labelStr = d.id; 
                 if(d.isLitteral)
-                    {return "#FF9800";}
-                return "#311B92";})
+                    {return customizeGraphArray.literalNodeTextColor;}
+                return customizeGraphArray.resourceNodeTextColor;})
               .attr('x', function(d){
                 if(d.isLitteral)
                     {return 8;}

From b3ff6df1673515bd21e57a1588a9f1ace579d1de Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 25 Jun 2019 18:14:48 +0200
Subject: [PATCH 16/66] margin end changes

---
 .../rdfontology/d3v4-rdf-ontology-graph-view.js  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index b434c43f5..d6954e7da 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -18,10 +18,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
     .attr("height", height);
  
   svg.append("svg:defs").selectAll("marker")
-  .data(["end"])
+  .data(["normal"])
   .enter().append("svg:marker")
   .attr("id", String)
-  .attr("viewBox", "0 -5 15 15")
+  .attr("viewBox", "0 -4 10 10")
   .attr("refX", 30) 
   .attr("refY", -0.5)
   .attr("markerWidth", 26)
@@ -29,13 +29,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
   .attr("orient", "auto")
   .append("svg:polyline")
   .style("fill","black")
-  .attr("points", "0,-5 18,0 0,5")
+  .attr("points", "0,-4 20,0 0,5")
   ;
   svg.append("svg:defs").selectAll("marker")
-  .data(["end1"])
+  .data(["subclass"])
   .enter().append("svg:marker")
   .attr("id", String)
-  .attr("viewBox", "0 -5 15 15")
+  .attr("viewBox", "0 -4 10 10")
   .attr("refX", 30) 
   .attr("refY", -0.5)
   .attr("markerWidth", 26)
@@ -43,7 +43,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
   .attr("orient", "auto")
   .append("svg:polyline")
   .style("fill", "grey")
-  .attr("points", "0,-5 10,0 0,5")
+  .attr("points", "0,-4 20,0 0,5")
   ;
   
 
@@ -293,8 +293,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           //.attr("marker-end", "url(#end)")
           .attr("marker-end",function (d) { 
             var labelStr = d.predicate; 
-            if(labelStr.includes('subClassOf')){return  "url(#end1)";}
-            return  "url(#end)"})
+            if(labelStr.includes('subClassOf')){return  "url(#subclass)";}
+            return  "url(#normal)"})
           .style("stroke-dasharray",function (d) { 
             var labelStr = d.predicate; 
             if(labelStr.includes('subClassOf')){return  ("3, 3");}

From 63adfc29eebd982eb86c0cf42b62919579ab1db7 Mon Sep 17 00:00:00 2001
From: himadri-kumari <himadri.naina@gmail.com>
Date: Wed, 26 Jun 2019 20:48:29 +0200
Subject: [PATCH 17/66] disbling zoom on double click

---
 .../rdfontology/d3v4-rdf-ontology-graph-view.js     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index d6954e7da..90c1b85c4 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -428,7 +428,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       {
         nodeDescription.append("text")
             .text(d.nodeContains["dc:description"]["@value"]) ; 
-      }
+      }/*
+      var node = d3.select("#"+idsArray.nodeDescripId)
+      if(d.nodeContains["rdfs:subClassOf"] != undefined && d.nodeContains["rdfs:subClassOf"]["@id"] != undefined )
+      {
+        nodeDescription.append("text")
+            .text(d.nodeContains["dc:description"]["@value"]) ; 
+      }*/
     });
 
     simulation
@@ -474,12 +480,15 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       }
     }
 
+    
+
     if(!disableZoom)
     {
       var zoom_handler = d3.zoom()
         .on("zoom", zoom_actions);
-      zoom_handler(svg);
+      //zoom_handler(svg);
       //Zoom functions 
+      svg.call(zoom_handler).on("dblclick.zoom", null);
       function zoom_actions(){
         g.attr("transform", d3.event.transform)
         

From 0049cdeff75649d3444cb199635b506cd986287a Mon Sep 17 00:00:00 2001
From: himadri-kumari <himadri.naina@gmail.com>
Date: Thu, 27 Jun 2019 20:07:56 +0200
Subject: [PATCH 18/66] On double click functionality

---
 ida-chatbot/src/app/app.module.ts             |   6 +-
 .../rdf-ontology-view.component.css           |   6 +
 .../rdf-ontology-view.component.html          |  35 +-
 .../d3v4-rdf-ontology-graph-view.js           | 321 +++++++++++++++---
 .../rdfontology/historian-onlogoly.json       |   2 +-
 5 files changed, 314 insertions(+), 56 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index b4c9ea014..6ac16bf1b 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -61,7 +61,7 @@ import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
-import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [
@@ -123,8 +123,8 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule,
-    NgbModule
+    FlexLayoutModule//,
+    //NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
index 97fa6237f..7ccf233f0 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
@@ -25,4 +25,10 @@
     border-radius: 8px;
     width: 33%;
     padding-left: 3px;
+  }
+
+  .nodeInfoDiv {
+    padding-left: 35px;
+    font-size: 20px;
+    width:275px;
   }
\ No newline at end of file
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 17be2c75f..a2a77fd1c 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -49,43 +49,52 @@ <h1 align='center'>RDF Ontology Graph</h1>
           </div>
           
           <div  id="nodeInfoTagesId" 
-              style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
+              style=" text-align: justify;overflow: auto;display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
                 padding-top: 10px;">
-            <label class="inputLabelClass" [attr.id]="nodeId" > 
+            <label class="inputLabelClass"> 
                 Node: 
             </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
             <br/><br/>
-            <label class="inputLabelClass" [attr.id]="nodeLabelId" > 
+            <label class="inputLabelClass" > 
               Label:
             </label>
+            <div class="nodeInfoDiv"  [attr.id]="nodeLabelId" ></div>
             <br/><br/>
-            <label class="inputLabelClass" [attr.id]="nodeIdsId">
+            <label class="inputLabelClass" >
                 Id:
             </label>
+            <div class="nodeInfoDiv"  [attr.id]="nodeIdsId"></div>
             <br/><br/>
-            <label class="inputLabelClass" [attr.id]="nodeTypeId">
-                Type:
+            <label class="inputLabelClass" >
+                Type: 
             </label>
+            <div class="nodeInfoDiv"  [attr.id]="nodeTypeId"> </div>
             <br/><br/>
-            <label class="inputLabelClass" [attr.id]="nodeDescripId">
+            <label class="inputLabelClass">
                 Description: 
             </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
             <br/><br/>
-            <label class="inputLabelClass" [attr.id]="nodeSubClassId">
-                Sub class of :
+            <label class="inputLabelClass">
+                Sub class of:
             </label>
+            <div class="nodeInfoDiv"  [attr.id]="nodeSubClassId"> </div>
             <br/><br/>
-            <label class="inputLabelClass" [attr.id]="nodeDomainId">
+            <label class="inputLabelClass">
                 Domain:
             </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
             <br/><br/>
-            <label class="inputLabelClass" [attr.id]="nodeRangeId">
+            <label class="inputLabelClass" >
                 Range:
             </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
             <br/><br/>
-            <label class="inputLabelClass" [attr.id]="nodeCommentId">
+            <label class="inputLabelClass">
                 Comment:
-            </label>
+            </label> 
+            <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
             <br/><br/>
           </div>
 
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 90c1b85c4..5cec87311 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -5,6 +5,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
   var enLabelArray = [];
   var deLabelArray = [];
   var expandedNodesArray = [];
+  var nodeContents = [];
 
   var width = 1060,height = 900,resourceRadius = customizeGraphArray.resourceRadius,literalRadius = customizeGraphArray.literalRadius;
 
@@ -69,12 +70,26 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             {
               var tempLabel = {"id":elem["@id"],"language":"de","value":eachIds["@value"]}
               deLabelArray.push(tempLabel);
+
+              var tepmNodeContent = {label:eachIds["@value"], contents:elem};
+              nodeContents.push(tepmNodeContent);
             }
             if(eachIds["@language"] == "en")
             {
               var tempLabel = {"id":elem["@id"],"language":"en","value":eachIds["@value"]}
               enLabelArray.push(tempLabel);
+
+              var tepmNodeContent = {label:eachIds["@value"], contents:elem};
+              nodeContents.push(tepmNodeContent);
             }
+           
+            var tempLabelArray = elem["@id"].split('/');
+            var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+            var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+
+            var tepmNodeContent = {label:tempLabel, contents:elem};
+            nodeContents.push(tepmNodeContent);
+            
 
           });
         }
@@ -84,15 +99,37 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           {
             var tempLabel = {"id":elem["@id"],"language":"de","value":elem["rdfs:label"]["@value"]}
             deLabelArray.push(tempLabel);
+
+            var tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
+            nodeContents.push(tepmNodeContent);
           }
           if(elem["rdfs:label"]["@language"] == "en")
           {
             var tempLabel = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]}
             enLabelArray.push(tempLabel);
+
+            var tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
+            nodeContents.push(tepmNodeContent);
           }
+          
+          var tempLabelArray = elem["@id"].split('/');
+          var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+          var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+
+          var tepmNodeContent = {label:tempLabel, contents:elem};
+          nodeContents.push(tepmNodeContent);
          }
       }
-        
+      else
+      {
+        var tempLabelArray = elem["@id"].split('/');
+        var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+        var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+
+        var tepmNodeContent = {label:tempLabel, contents:elem};
+        nodeContents.push(tepmNodeContent);
+      }
+      
     });
     //END :: get english and deutch labels values into arrays
 
@@ -135,7 +172,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   linksArray.push(tripleValue);
                   
                   //createNewNode(tempSub,'---subClassOf---',tempObj);
-                  createNewNode(tempSub,pred,tempObj,false,'',element);
+                  createNewNode(tempSub,pred,tempObj,false,'');
                 });
               }
               else
@@ -152,7 +189,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 linksArray.push(tripleValue);
 
                 //createNewNode(tempSub,'---subClassOf---',tempObj);
-                createNewNode(tempSub,pred,tempObj,false,'',element);
+                createNewNode(tempSub,pred,tempObj,false,'');
               }
             }
         }
@@ -245,7 +282,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   {
                     var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
                     linksArray.push(tripleValue);
-                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element);
+                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType);
                   }
                 }
               });
@@ -258,13 +295,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   var tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
                   linksArray.push(tripleValue);
-                  createNewNode(tempSub,'',tempPred,isLitteral,literalDataType,element);
+                  createNewNode(tempSub,'',tempPred,isLitteral,literalDataType);
                 }
                 else
                 {
                   var tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
                   linksArray.push(tripleValue);
-                  createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType,element);
+                  createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType);
                 }
               }
             }
@@ -282,9 +319,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           
         
 
-    var link = g.append("g")
-          .attr("class", "links")
-          .selectAll("line")
+    var link =//g.attr("class", "links")
+          g.selectAll("line")
           .data(linksArray)
           .enter().append("line")
           .attr("class", "link")
@@ -302,6 +338,15 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             return  ("0, 0");})
           
           ;
+          /*
+          link.append("title")
+          .text(function(d) { var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
+         
+          return returnValue;
+            
+          });*/
+;
+
 
           // ==================== Add Link Names =====================
     var linkTexts = g.selectAll(".link-text")
@@ -323,12 +368,12 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 .attr('x', 12)
                 .attr('y', 3)
     ;    
-    
+    /*
     link.append("title")
               .text(function(d) { var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
                 return returnValue;
               });
-    ; 
+    ; */
 
     linkTexts.append("title")
               .text(function(d) { 
@@ -399,42 +444,240 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             return returnValue; })
     ;
     
-    node.on("dblclick",function(d){   
-      var idVal =  "#"+d.nodeId;
+    node.on("dblclick",function(d)
+    {   
+      var nodeIdVal =  d.id;
+      var tempNodeContains = [];
+      nodeContents.forEach(function(val){
+        if(val.label == nodeIdVal)
+        {
+          tempNodeContains = val.contents
+        }
+      });
 
       var tempNode = d3.select("#"+idsArray.nodeId)
       tempNode.selectAll("*").remove(); 
-
       tempNode.append("text")
-             .text(d.id) ; 
+             .text(" " + nodeIdVal+"\n")
+              .style("font-style","italic")
+              .style("font-size", "80%");
 
-      
-      var nodeLabel = d3.select("#"+idsArray.nodeLabelId)
-      nodeLabel.selectAll("*").remove(); 
+    
+      //node label on double click
+      if(tempNodeContains != undefined)
+      {
+        var nodeLabel = d3.select("#"+idsArray.nodeLabelId)
+        nodeLabel.selectAll("*").remove();
+        if(tempNodeContains["rdfs:label"] != undefined)
+        { 
+          if(Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === '[object Array]')
+          {
+            tempNodeContains["rdfs:label"].forEach(function(eachIds)
+            {
+              if(eachIds["@language"] == "de" && displayDeustch)
+              {
+                
+                nodeLabel.append("text")
+                  .text(" " + eachIds["@value"] +"\n")
+                    .style("font-style","italic")
+                    .style("font-size", "80%");
+              }
+              else if (eachIds["@language"] == "en" && !displayDeustch)
+              {
+                nodeLabel.append("text")
+                  .text(" " + eachIds["@value"] +"\n")
+                    .style("font-style","italic")
+                    .style("font-size", "80%");
+              }
+  
+            });
+          }
+          else
+          {
+            nodeLabel.append("text")
+              .text(" " + tempNodeContains["rdfs:label"]["@value"] +"\n")
+                .style("font-style","italic")
+                .style("font-size", "80%");
+          }
+        }
+  
+        //node id on double click
+        var nodeID = d3.select("#"+idsArray.nodeIdsId)
+        nodeID.selectAll("*").remove(); 
+        if(tempNodeContains["@id"] != undefined )
+        {
+          nodeID.append("text")
+              .text(" " + tempNodeContains["@id"]+"\n") 
+                .style("font-style","italic")
+                .style("font-size", "80%");
+        }
+        //node type on double click
+        var nodeType = d3.select("#"+idsArray.nodeTypeId)
+        nodeType.selectAll("*").remove(); 
+        if(tempNodeContains["@type"] != undefined)
+        {
+          nodeType.append("text")
+              .text(" " + tempNodeContains["@type"]+"\n\n")
+                .style("font-style","italic")
+                .style("font-size", "80%"); 
+        }
+        
+        //node description on double click
+        var nodeDescription = d3.select("#"+idsArray.nodeDescripId)
+        nodeDescription.selectAll("*").remove();
+        if(tempNodeContains["dc:description"] != undefined)
+        { 
+          if(Object.prototype.toString.call(tempNodeContains["dc:description"]) === '[object Array]')
+          {
+            tempNodeContains["dc:description"].forEach(function(eachIds)
+            {
+              if(eachIds["@language"] == "de" && displayDeustch)
+              {
+                
+                nodeDescription.append("text")
+                  .text(" " + eachIds["@value"] +"\n")
+                    .style("font-style","italic")
+                    .style("font-size", "80%");
+              }
+              else if (eachIds["@language"] == "en" && !displayDeustch)
+              {
+                nodeDescription.append("text")
+                  .text(" " + eachIds["@value"] +"\n")
+                    .style("font-style","italic")
+                    .style("font-size", "80%");
+              }
 
-      console.log('d.nodeContains => '+d.nodeContains);
-      console.log('d.nodeContains["rdfs:label"] => '+d.nodeContains["rdfs:label"]);
+            });
+          }
+          else
+          {
+            nodeDescription.append("text")
+              .text(" " + tempNodeContains["dc:description"]["@value"] +"\n")
+                .style("font-style","italic")
+                .style("font-size", "80%");
+          }
+        }
+        
+        var nodeSubClass = d3.select("#"+idsArray.nodeSubClassId)
+        nodeSubClass.selectAll("*").remove(); 
+        if(tempNodeContains["rdfs:subClassOf"] != undefined)
+        {
+          if(Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === '[object Array]')
+          {
+            var tempIndexSubClassof =1;
+            tempNodeContains["rdfs:subClassOf"].forEach(function(eachIds)
+            {
+              var subClassLabel = getLabel(displayDeustch,eachIds["@id"]);
+              if(subClassLabel == "noLabel")
+              {
+                var tempLabelArray = eachIds["@id"].split('/');
+                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                subClassLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+              }
+
+              nodeSubClass.append("text")
+                  .text(" " + tempIndexSubClassof +". "+ subClassLabel +"\n")
+                    .style("font-style","italic")
+                    .style("font-size", "80%");
+              
+              tempIndexSubClassof = tempIndexSubClassof+1;
+
+            });
+          }
+          else
+          {
+            var subClassLabel = getLabel(displayDeustch,tempNodeContains["rdfs:subClassOf"]["@id"]);
+            if(subClassLabel == "noLabel")
+            {
+              var tempLabelArray = tempNodeContains["rdfs:subClassOf"]["@id"].split('/');
+              var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+              subClassLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+            }
+
+            nodeSubClass.append("text")
+              .text( " " + subClassLabel+"\n")
+                .style("font-style","italic")
+                .style("font-size", "80%");
+          }
+        }
+
+        var nodeDomain = d3.select("#"+idsArray.nodeDomainId)
+        nodeDomain.selectAll("*").remove(); 
+        if(tempNodeContains["rdfs:domain"] != undefined && tempNodeContains["rdfs:domain"]["@id"] != undefined )
+        {
+          
+          if(Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === '[object Array]')
+          {
+            var tempIndexSubClassof =1;
+            tempNodeContains["rdfs:domain"].forEach(function(eachIds)
+            {
+              var domainLabel = getLabel(displayDeustch,eachIds["@id"]);
+              if(domainLabel == "noLabel")
+              {
+                var tempLabelArray = eachIds["@id"].split('/');
+                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                domainLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+              }
+
+              nodeDomain.append("text")
+                  .text(" " +  tempIndexSubClassof +". "+ domainLabel +"\n")
+                    .style("font-style","italic")
+                    .style("font-size", "80%");
+              
+              tempIndexSubClassof = tempIndexSubClassof+1;
+
+            });
+          }
+          else
+          {
+            var domainLabel = getLabel(displayDeustch,tempNodeContains["rdfs:domain"]["@id"]);
+            if(domainLabel == "noLabel")
+            {
+              var tempLabelArray = tempNodeContains["rdfs:domain"]["@id"].split('/');
+              var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+              domainLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+            }
+
+            nodeDomain.append("text")
+              .text(" " + domainLabel+"\n")
+                .style("font-style","italic")
+                .style("font-size", "80%");
+          }  
+        }
+
+
+
+
+
+
+      }
       
-      console.log('d.nodeContains["rdfs:label"]["@value"]  => '+d.nodeContains["rdfs:label"]["@value"]);
-      if(d.nodeContains["rdfs:label"] != undefined && d.nodeContains["rdfs:label"]["@value"] != undefined )
+      /*
+    
+
+      var nodeDomain = d3.select("#"+idsArray.nodeDomainId)
+      nodeDomain.selectAll("*").remove(); 
+      if(d.nodeContains["rdfs:domain"] != undefined && d.nodeContains["rdfs:domain"]["@id"] != undefined )
       {
-        nodeLabel.append("text")
-            .text(d.nodeContains["rdfs:label"]["@value"]) ; 
+        nodeDomain.append("text")
+            .text(d.nodeContains["rdfs:domain"]["@id"]+"\n") ; 
       }
-         
-      var nodeDescription = d3.select("#"+idsArray.nodeDescripId)
-      nodeDescription.selectAll("*").remove(); 
-      if(d.nodeContains["dc:description"] != undefined && d.nodeContains["dc:description"]["@value"] != undefined )
+      var nodeRange = d3.select("#"+idsArray.nodeRangeId)
+      nodeRange.selectAll("*").remove(); 
+      if(d.nodeContains["rdfs:range"] != undefined && d.nodeContains["rdfs:range"]["@id"] != undefined )
       {
-        nodeDescription.append("text")
-            .text(d.nodeContains["dc:description"]["@value"]) ; 
-      }/*
-      var node = d3.select("#"+idsArray.nodeDescripId)
-      if(d.nodeContains["rdfs:subClassOf"] != undefined && d.nodeContains["rdfs:subClassOf"]["@id"] != undefined )
+        nodeRange.append("text")
+            .text(d.nodeContains["rdfs:range"]["@id"]+"\n") ; 
+      }
+
+      var nodeComment = d3.select("#"+idsArray.nodeCommentId)
+      nodeComment.selectAll("*").remove(); 
+      if(d.nodeContains["rdfs:comment"] != undefined && d.nodeContains["rdfs:comment"] != undefined )
       {
-        nodeDescription.append("text")
-            .text(d.nodeContains["dc:description"]["@value"]) ; 
-      }*/
+        nodeComment.append("text")
+            .text(d.nodeContains["rdfs:comment"]+"\n") ; 
+      }
+*/
     });
 
     simulation
@@ -521,7 +764,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       return returnVaule;
     }
 
-    function createNewNode(tempSub,tempPred,tempObj,isLitteralVal,literalDataTypeVal,element)
+    function createNewNode(tempSub,tempPred,tempObj,isLitteralVal,literalDataTypeVal)
     {
       //START :: Node creation
       var subNodeAdded = false;  
@@ -545,13 +788,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       if(subNodeAdded === false)
       {
         circleIdIndex =circleIdIndex+1; 
-        var nodeValue = {nodeContains:element,id:tempSub ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:false,literalDataType:literalDataTypeVal, group: 1};
+        var nodeValue = {id:tempSub ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:false,literalDataType:literalDataTypeVal, group: 1};
         nodesArray.push(nodeValue);
       }
       if(objNodeAdded === false)
       {
         circleIdIndex =circleIdIndex+1;
-        var nodeValue = {nodeContains:element,id:tempObj ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:isLitteralVal,literalDataType:literalDataTypeVal, group: 1};
+        var nodeValue = {id:tempObj ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:isLitteralVal,literalDataType:literalDataTypeVal, group: 1};
         nodesArray.push(nodeValue);
       }
       //END :: Node creation
diff --git a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
index dcc8f7ad7..33beea810 100644
--- a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
+++ b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
@@ -946,7 +946,7 @@
         "@language": "en",
         "@value": "membershipType"
       },
-      "rdfs:range": {
+      "rdfs:range": { 
         "@id": "xsd:string"
       },
       "rdfs:subPropertyOf": {

From db5e48b2917a2e4c9a429abbb286e9abaacf74ce Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Thu, 27 Jun 2019 20:46:59 +0200
Subject: [PATCH 19/66] On double click functionality pending things

---
 .../rdf-ontology-view.component.css           |   4 +
 .../rdf-ontology-view.component.html          | 112 ++++++++++--------
 .../d3v4-rdf-ontology-graph-view.js           |  84 ++++++++-----
 3 files changed, 123 insertions(+), 77 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
index 7ccf233f0..27ac5e8ea 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
@@ -27,6 +27,10 @@
     padding-left: 3px;
   }
 
+  .nodeInfoDivClass {
+    float: left;
+  }
+  
   .nodeInfoDiv {
     padding-left: 35px;
     font-size: 20px;
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index a2a77fd1c..921bde44e 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -49,53 +49,71 @@ <h1 align='center'>RDF Ontology Graph</h1>
           </div>
           
           <div  id="nodeInfoTagesId" 
-              style=" text-align: justify;overflow: auto;display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
+              style=" text-align: justify;overflow: auto;display: block;background-color:#AED6F1;border-radius: 8px;
                 padding-top: 10px;">
-            <label class="inputLabelClass"> 
-                Node: 
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
-            <br/><br/>
-            <label class="inputLabelClass" > 
-              Label:
-            </label>
-            <div class="nodeInfoDiv"  [attr.id]="nodeLabelId" ></div>
-            <br/><br/>
-            <label class="inputLabelClass" >
-                Id:
-            </label>
-            <div class="nodeInfoDiv"  [attr.id]="nodeIdsId"></div>
-            <br/><br/>
-            <label class="inputLabelClass" >
-                Type: 
-            </label>
-            <div class="nodeInfoDiv"  [attr.id]="nodeTypeId"> </div>
-            <br/><br/>
-            <label class="inputLabelClass">
-                Description: 
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
-            <br/><br/>
-            <label class="inputLabelClass">
-                Sub class of:
-            </label>
-            <div class="nodeInfoDiv"  [attr.id]="nodeSubClassId"> </div>
-            <br/><br/>
-            <label class="inputLabelClass">
-                Domain:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
-            <br/><br/>
-            <label class="inputLabelClass" >
-                Range:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
-            <br/><br/>
-            <label class="inputLabelClass">
-                Comment:
-            </label> 
-            <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
-            <br/><br/>
+            <div class="nodeInfoDivClass"> 
+              <label class="inputLabelClass"> 
+                  Node: 
+              </label>
+              <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
+              <br/>
+            </div>
+            <div class="nodeInfoDivClass">
+              <label class="inputLabelClass" > 
+                Label:
+              </label>
+              <div class="nodeInfoDiv"  [attr.id]="nodeLabelId" ></div>
+              <br/>
+            </div> 
+            <div class="nodeInfoDivClass">
+              <label class="inputLabelClass" >
+                  Id:
+              </label>
+              <div class="nodeInfoDiv"  [attr.id]="nodeIdsId"></div>
+              <br/>
+            </div> 
+            <div class="nodeInfoDivClass">
+              <label class="inputLabelClass" >
+                  Type: 
+              </label>
+              <div class="nodeInfoDiv"  [attr.id]="nodeTypeId"> </div>
+              <br/>
+            </div> 
+            <div class="nodeInfoDivClass">
+              <label class="inputLabelClass">
+                  Description: 
+              </label>
+              <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
+              <br/>
+            </div> 
+            <div class="nodeInfoDivClass">
+              <label class="inputLabelClass">
+                  Sub class of:
+              </label>
+              <div class="nodeInfoDiv"  [attr.id]="nodeSubClassId"> </div>
+              <br/>
+            </div> 
+            <div class="nodeInfoDivClass">
+              <label class="inputLabelClass">
+                  Domain:
+              </label>
+              <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
+              <br/>
+            </div> 
+            <div class="nodeInfoDivClass">
+              <label class="inputLabelClass" >
+                  Range:
+              </label>
+              <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
+              <br/>
+            </div> 
+            <div class="nodeInfoDivClass">
+              <label class="inputLabelClass">
+                  Comment:
+              </label> 
+              <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
+              <br/>
+            </div> 
           </div>
 
           <div  id="graphConfigId" 
@@ -144,7 +162,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
             </label><br/>
             <label class="inputLabelClass">
               On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
-            </label><br/> <br/><br/> 
+            </label><br/> <br/><br/> <br/> <br/> 
  
             <button #applyConfigBtn (click)="applyConfigClicked($event)" 
               style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 5cec87311..135cb5191 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -603,12 +603,12 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
 
         var nodeDomain = d3.select("#"+idsArray.nodeDomainId)
         nodeDomain.selectAll("*").remove(); 
-        if(tempNodeContains["rdfs:domain"] != undefined && tempNodeContains["rdfs:domain"]["@id"] != undefined )
+        if(tempNodeContains["rdfs:domain"] != undefined )
         {
           
           if(Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === '[object Array]')
           {
-            var tempIndexSubClassof =1;
+            var tempIndexdomain =1;
             tempNodeContains["rdfs:domain"].forEach(function(eachIds)
             {
               var domainLabel = getLabel(displayDeustch,eachIds["@id"]);
@@ -620,11 +620,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               }
 
               nodeDomain.append("text")
-                  .text(" " +  tempIndexSubClassof +". "+ domainLabel +"\n")
+                  .text(" " +  tempIndexdomain +". "+ domainLabel +"\n")
                     .style("font-style","italic")
                     .style("font-size", "80%");
               
-              tempIndexSubClassof = tempIndexSubClassof+1;
+              tempIndexdomain = tempIndexdomain+1;
 
             });
           }
@@ -646,38 +646,62 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
         }
 
 
+        var nodeRange = d3.select("#"+idsArray.nodeRangeId)
+        nodeRange.selectAll("*").remove(); 
+        if(tempNodeContains["rdfs:range"] != undefined )
+        {
+          
+          if(Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === '[object Array]')
+          {
+            var tempIndexRange =1;
+            tempNodeContains["rdfs:range"].forEach(function(eachIds)
+            {
+              var rangeLabel = getLabel(displayDeustch,eachIds["@id"]);
+              if(rangeLabel == "noLabel")
+              {
+                var tempLabelArray = eachIds["@id"].split('/');
+                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                rangeLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+              }
 
+              nodeRange.append("text")
+                  .text(" " +  tempIndexRange +". "+ rangeLabel +"\n")
+                    .style("font-style","italic")
+                    .style("font-size", "80%");
+              
+              tempIndexRange = tempIndexRange+1;
 
+            });
+          }
+          else
+          {
+            var rangeLabel = getLabel(displayDeustch,tempNodeContains["rdfs:range"]["@id"]);
+            if(rangeLabel == "noLabel")
+            {
+              var tempLabelArray = tempNodeContains["rdfs:range"]["@id"].split('/');
+              var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+              rangeLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+            }
 
+            nodeRange.append("text")
+              .text(" " + rangeLabel+"\n")
+                .style("font-style","italic")
+                .style("font-size", "80%");
+          }  
+        }
+        
+        var nodeComment = d3.select("#"+idsArray.nodeCommentId)
+        nodeComment.selectAll("*").remove(); 
+        if(tempNodeContains["rdfs:comment"] != undefined)
+        {
+          nodeComment.append("text")
+              .text(tempNodeContains["rdfs:comment"]+"\n") 
+                .style("font-style","italic")
+                .style("font-size", "80%");
+        }
 
       }
       
-      /*
-    
-
-      var nodeDomain = d3.select("#"+idsArray.nodeDomainId)
-      nodeDomain.selectAll("*").remove(); 
-      if(d.nodeContains["rdfs:domain"] != undefined && d.nodeContains["rdfs:domain"]["@id"] != undefined )
-      {
-        nodeDomain.append("text")
-            .text(d.nodeContains["rdfs:domain"]["@id"]+"\n") ; 
-      }
-      var nodeRange = d3.select("#"+idsArray.nodeRangeId)
-      nodeRange.selectAll("*").remove(); 
-      if(d.nodeContains["rdfs:range"] != undefined && d.nodeContains["rdfs:range"]["@id"] != undefined )
-      {
-        nodeRange.append("text")
-            .text(d.nodeContains["rdfs:range"]["@id"]+"\n") ; 
-      }
-
-      var nodeComment = d3.select("#"+idsArray.nodeCommentId)
-      nodeComment.selectAll("*").remove(); 
-      if(d.nodeContains["rdfs:comment"] != undefined && d.nodeContains["rdfs:comment"] != undefined )
-      {
-        nodeComment.append("text")
-            .text(d.nodeContains["rdfs:comment"]+"\n") ; 
-      }
-*/
     });
 
     simulation

From f1a255d19bb13746403204fce1b26787e8174f16 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Fri, 28 Jun 2019 15:27:52 +0200
Subject: [PATCH 20/66] Onclick functionality

---
 .../rdf-ontology-view.component.css           |   4 +-
 .../rdf-ontology-view.component.html          |   5 +-
 .../d3v4-rdf-ontology-graph-view.js           | 721 +++++++++++-------
 3 files changed, 471 insertions(+), 259 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
index 27ac5e8ea..b63415fd7 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
@@ -17,7 +17,7 @@
   }
   .inputLabelClass {
     padding-left: 10px;
-    font-size: 19px;
+    font-size: 15px;
     float: left;
   }
   
@@ -33,6 +33,6 @@
   
   .nodeInfoDiv {
     padding-left: 35px;
-    font-size: 20px;
+    font-size: 18px;
     width:275px;
   }
\ No newline at end of file
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 921bde44e..e3d7fcf35 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -90,7 +90,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
               <label class="inputLabelClass">
                   Sub class of:
               </label>
-              <div class="nodeInfoDiv"  [attr.id]="nodeSubClassId"> </div>
+              <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
               <br/>
             </div> 
             <div class="nodeInfoDivClass">
@@ -160,9 +160,10 @@ <h1 align='center'>RDF Ontology Graph</h1>
             <label class="inputLabelClass">
               Property text color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor" placeholder=" #28B463">
             </label><br/>
+            <!--
             <label class="inputLabelClass">
               On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
-            </label><br/> <br/><br/> <br/> <br/> 
+            </label>--><br/> <br/><br/> <br/> <br/> 
  
             <button #applyConfigBtn (click)="applyConfigClicked($event)" 
               style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 135cb5191..8f914604e 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -9,7 +9,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
 
   var width = 1060,height = 900,resourceRadius = customizeGraphArray.resourceRadius,literalRadius = customizeGraphArray.literalRadius;
 
-  
+  var g,link,linkTexts,node,circles,lables;
   var svgClear = d3.select("#"+svgId);
   svgClear.selectAll("*").remove(); 
 
@@ -314,137 +314,436 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           return console.warn('Error in createV3RDFOntologyGraphView() method :'+error);
       }
       
-      var g = svg.append("g")
-          .attr("class", "everything");
+
+    
+
+    function ticked()
+    {
+      lables
+          .attr("x2", function(d){ return d.x-width; })
+          .attr("y2", function (d) {return d.y -height; })
+      ;
+      link
+          .attr("x1", function(d) { return d.source.x; })
+          .attr("y1", function(d) { return d.source.y; })
+          .attr("x2", function(d) { return d.target.x; })
+          .attr("y2", function(d) { return d.target.y; })
+      ;
+      linkTexts
+          .attr("x", function(d) { //return  Math.max(5, Math.min(width - 10, (d.source.x + d.target.x)/2 ));
+            return 4 + (d.source.x + d.target.x)/2  ; })
+          .attr("y", function(d) { 
+            // return  Math.max(5, Math.min(height - 10, (d.source.y + d.target.y)/2));
+            return 4 + (d.source.y + d.target.y)/2 ; })
+      ;
+      node
+        .attr("transform", function(d) {
+            return "translate(" + d.x + "," + d.y + ")";
+            //return "translate(" + Math.max(10, Math.min(width - 10, d.x)) + "," + Math.max(5, Math.min(height - 10, d.y)) + ")";
+            //return "translate(" + (d.x < 1000 ? d.x = 100 : d.x > 1000 ? d.x = 900 : d.x) + "," + (d.y < 1000 ? d.y = 100 : d.y > 900 ? d.y = 900 : d.y) + ")";
+          })
+      ;
+      if(applyNodesBoundary)
+      {
+        node
+        .attr("cx", function(d) { return d.x = Math.max(Math.max(resourceRadius,literalRadius), Math.min(width - Math.max(resourceRadius,literalRadius), d.x)); })
+        .attr("cy", function(d) { return d.y = Math.max(Math.max(resourceRadius,literalRadius), Math.min(height - Math.max(resourceRadius,literalRadius), d.y)); });
+      }
+    }
+
+    update();
+
+    
+    
+    function getLabel(displayDeustch,id)
+    {
+      var returnVaule = "noLabel"
+      if(!displayDeustch)
+      {
+        enLabelArray.forEach(function(elem) 
+        {
+          if(elem["id"] === id)
+          {
+            returnVaule = elem["value"];
+          } 
+        });
+      }
+      else if(displayDeustch)
+      {
+        deLabelArray.forEach(function(elem) 
+        {
+          if(elem["id"] === id)
+          {
+            returnVaule = elem["value"];
+          } 
+        });
+      }
+      return returnVaule;
+    }
+
+    function createNewNode(tempSub,tempPred,tempObj,isLitteralVal,literalDataTypeVal)
+    {
+      //START :: Node creation
+      var subNodeAdded = false;  
+      var objNodeAdded = false;
+        
+      if(nodesArray != undefined)
+      {
+        nodesArray.forEach(function(elem) 
+        {
+          if(elem["id"] === tempSub)
+          {
+            subNodeAdded = true;
+          } 
+          if(elem["id"] === tempObj)
+          {
+            objNodeAdded = true;
+          } 
+        });
+      }
+      
+      if(subNodeAdded === false)
+      {
+        circleIdIndex =circleIdIndex+1; 
+        var nodeValue = {id:tempSub ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:false,literalDataType:literalDataTypeVal, group: 1};
+        nodesArray.push(nodeValue);
+      }
+      if(objNodeAdded === false)
+      {
+        circleIdIndex =circleIdIndex+1;
+        var nodeValue = {id:tempObj ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:isLitteralVal,literalDataType:literalDataTypeVal, group: 1};
+        nodesArray.push(nodeValue);
+      }
+      //END :: Node creation
+      //console.log("nodeValue len =>"+nodesArray.length);
+    }
+
+    function clickFunctionality(d)
+    {  
+      var idVal =  "#"+d.nodeId;
+      var clickedNodeLabel =  d.id;
+      console.log("d.id =< "+d.id);
+      if(expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal))
+      {
+        expandedNodesArray.push(idVal);
+
+
+        d3.select(idVal)
+          .attr('r',resourceRadius+4)
+          .style("fill",customizeGraphArray.onClickNodeColor)
+        
           
         
+        data["@graph"].forEach(function(element) 
+        {
+          var tempSub ="?";
+          var tempPred ="?";
+          var tempObj ="?";
+          var pred="---subClassOf---";
+          var tempDomainArray = [];
+          
+          var includeThis = false;
+          //START :: Nodes and Links creation for all Properties
+          //get the subject label  
+          if(element["rdfs:domain"]!=undefined)
+          {
+            if(Object.prototype.toString.call(element["rdfs:domain"]) === '[object Array]')
+            {
+              //console.log("inside if");
+              element["rdfs:domain"].forEach(function(eachIds)
+              {
+                var tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
+                if(tempDomainLabel == "noLabel")
+                {
+                  var tempLabelArray = eachIds["@id"].split('/');
+                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                }
+                
+                if(clickedNodeLabel === tempDomainLabel)
+                {
+                  includeThis = true;
+                  tempDomainArray.push(tempDomainLabel);
+                  console.log("include tempDomainLabel< "+tempDomainLabel);
+                }
+                
+              });
+            }
+            else
+            {
+              tempSub = getLabel(displayDeustch,element["rdfs:domain"]["@id"]);
+              if(tempSub == "noLabel")
+              {
+                var tempLabelArray = element["rdfs:domain"]["@id"].split('/');
+                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                tempSub = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+              }
 
-    var link =//g.attr("class", "links")
-          g.selectAll("line")
-          .data(linksArray)
-          .enter().append("line")
-          .attr("class", "link")
-          .attr("stroke-width",1)
-          .style("fill","#999")
-          //.attr("marker-end", "url(#end)")
-          .attr("marker-end",function (d) { 
-            var labelStr = d.predicate; 
-            if(labelStr.includes('subClassOf')){return  "url(#subclass)";}
-            return  "url(#normal)"})
-          .style("stroke-dasharray",function (d) { 
-            var labelStr = d.predicate; 
-            if(labelStr.includes('subClassOf')){return  ("3, 3");}
-            if(labelStr.includes('subPropertyOf')){return  ("5, 5");}
-            return  ("0, 0");})
+              if(clickedNodeLabel === tempSub)
+              {
+                includeThis = true;
+                console.log("include tempSub< "+element["@id"]);
+              }
+            }
+          }
           
-          ;
-          /*
-          link.append("title")
-          .text(function(d) { var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
-         
-          return returnValue;
+          if(includeThis)
+          {
+            //get the predicate
+            if(element["rdfs:domain"]!=undefined)
+            {
+              tempPred = getLabel(displayDeustch,element["@id"]);
+              if(tempPred == "noLabel")
+              {
+                var tempLabelArray = element["@id"].split('/');
+                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                tempPred = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+              }
+            }
+
+
+            //get the object  range
+            if(element["rdfs:range"]!=undefined)
+            {
+              //console.log(element.domain["@id"]);
+              if ("@id" in element["rdfs:range"])
+              {
+                tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
+                if(tempObj == "noLabel")
+                {
+                  var tempLabelArray = element["rdfs:range"]["@id"].split('/');
+                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                }
+              }  
+            }
             
-          });*/
-;
+            var isLitteral = false;
+            var literalDataType = tempObj;
 
+            if(tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean")|| tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime"))
+            {
+              tempObj = tempObj + literalIndex;
+              literalIndex = literalIndex + 1 ;
+              isLitteral = true;
+            }
 
-          // ==================== Add Link Names =====================
-    var linkTexts = g.selectAll(".link-text")
-            .data(linksArray)
-            .enter()
-            .append("text")
-              .attr("class", "link-text")
-              .text( function (d) { 
-                var labelStr = d.predicate; 
-                if(labelStr.includes('subClassOf'))
-                  {return customizeGraphArray.subClassLabel;}
-                return d.predicate; }) 
-                .style("fill",function(d){var labelStr = d.predicate; 
-                  if(labelStr.includes('subClassOf'))
-                  {return customizeGraphArray.subClassLabelColor;}
-                  return customizeGraphArray.propertyTextColor;})
-                .style("font-size", "80%")
-                .style("font-style", "italic")
-                .attr('x', 12)
-                .attr('y', 3)
-    ;    
-    /*
-    link.append("title")
-              .text(function(d) { var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
-                return returnValue;
+            if(!tempDomainArray.length  ==0)
+            {
+              tempDomainArray.forEach(function(el)
+              {
+                if(el != "?" && tempPred != "?" && tempObj != "?")
+                {
+                  if(isLitteral)
+                  {
+                    var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                    linksArray.push(tripleValue);
+                    console.log("include 1 source "+el +" predicate- "+tempPred +"  target-" +tempObj);
+                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element,this.simulation);
+                  }
+                  else
+                  {
+                    var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                    linksArray.push(tripleValue);
+                    console.log("include 2 source "+el +" predicate- "+tempPred +"  target-" +tempObj);
+                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,this.simulation);
+                  }
+                }
               });
-    ; */
-
-    linkTexts.append("title")
-              .text(function(d) { 
-                var labelStr = d.predicate; 
-                if(labelStr.includes('subClassOf'))
+            }
+            else
+            {
+              if(tempSub != "?" && tempPred != "?" && tempObj != "?")
+              {
+                if(isLitteral)
                 {
-                    var returnValue = 'Source : '+d.source +'\nProperty : '+customizeGraphArray.subClassLabel+'\nObject : '+d.target;
+                  var tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
+                  linksArray.push(tripleValue);
+                  console.log("include 3 source "+tempSub +" predicate- "+tempPred +"  target-" +tempObj);
+                  createNewNode(tempSub,'',tempPred,isLitteral,literalDataType,this.simulation);
                 }
                 else
                 {
-                  var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
+                  var tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
+                  linksArray.push(tripleValue);
+                  console.log("include 4 source "+tempSub +" predicate- "+tempPred +"  target-" +tempObj);
+                  createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType,this.simulation);
                 }
-                
-                return returnValue;
-              });
-    ;        
-    // ==================== Add Link Names =====================
-
-    var node = g.append("g")
-          .attr("class", "nodes")
-        .selectAll("g")
-        .data(nodesArray)
-        .enter().append("g")
-    ;    
-    var circles = node.append("circle")
-          .attr("id",function(d){return d.nodeId ;})
-          .attr("r",function(d){var labelStr = d.id;
-            if(d.isLitteral)
-            {return literalRadius;}
-            return resourceRadius;})
-          .style("fill",function(d){var labelStr = d.id; 
-            if(d.isLitteral)
-                {return customizeGraphArray.literalNodeColor;} 
-            return customizeGraphArray.resourceNodeColor;})
-          .call(d3.drag()
-              .on("start", dragstarted)
-              .on("drag", dragged)
-             .on("end", dragended)
-    );
-
-    var lables = node.append("text")
-              .attr("class", "node-text")
-              .text(function (d) {return d.id; })
-              .style("font-size", function(d){var labelStr = d.id; 
-                if(d.isLitteral)
-                {return "80%";}
-                return "100%";})
-              .style("font-style", function(d){var labelStr = d.id; 
-                if(d.isLitteral)
-                {return "italic";}
-                return "bold";})
-              .style("fill",function(d){var labelStr = d.id; 
-                if(d.isLitteral)
-                    {return customizeGraphArray.literalNodeTextColor;}
-                return customizeGraphArray.resourceNodeTextColor;})
-              .attr('x', function(d){
-                if(d.isLitteral)
-                    {return 8;}
-                return 12;})
-              .attr('y', 3) 
-    ;
-
-    node.append("title")
-          .text(function(d) { 
-            var returnValue = 'Node : '+d.id;
-            if(d.isLitteral){returnValue = 'Node : '+d.id +'\nData type : '+d.literalDataType;}
-            else{returnValue = 'Node : '+d.id;}
-            return returnValue; })
-    ;
+              }
+            }
+          }
+          //END :: Nodes and Links creation for all Properties
+        });
+        
+
+        var allClear = d3.selectAll(".everything");
+        allClear.selectAll("*").remove(); 
+
+        update();
+        simulation.restart(); 
+      }
+      else
+      {
+        d3.select(idVal)
+          .attr('r',resourceRadius)
+          .style("fill",'#311B92')
+
+        expandedNodesArray.pop(idVal);
+      }
+    }
+    
+    function update() {
+      simulation.restart();
+      simulation
+            .nodes(nodesArray)
+            .on("tick", ticked)
+      ;
+
+      simulation.force("link")
+            .links(linksArray)
+      ;
+
+
+      g = svg.append("g")
+          .attr("class", "everything");
+          
+      link =g.selectAll("line")
+            .attr("class", "links")
+            .data(linksArray)
+            .enter().append("line")
+            .attr("class", "link")
+            .attr("stroke-width",1)
+            .style("fill","#999")
+            .attr("marker-end",function (d) { 
+              var labelStr = d.predicate; 
+              if(labelStr.includes('subClassOf')){return  "url(#subclass)";}
+              return  "url(#normal)"})
+            .style("stroke-dasharray",function (d) { 
+              var labelStr = d.predicate; 
+              if(labelStr.includes('subClassOf')){return  ("3, 3");}
+              if(labelStr.includes('subPropertyOf')){return  ("5, 5");}
+              return  ("0, 0");});
+      ;
+
+      link.exit().remove();
+      // ==================== Add Link Names =====================
+      linkTexts = g.selectAll(".link-text")
+              .data(linksArray)
+              .enter()
+              .append("text")
+                .attr("class", "link-text")
+                .text( function (d) { 
+                  var labelStr = d.predicate; 
+                  if(labelStr.includes('subClassOf'))
+                    {return customizeGraphArray.subClassLabel;}
+                  return d.predicate; }) 
+                  .style("fill",function(d){var labelStr = d.predicate; 
+                    if(labelStr.includes('subClassOf'))
+                    {return customizeGraphArray.subClassLabelColor;}
+                    return customizeGraphArray.propertyTextColor;})
+                  .style("font-size", "80%")
+                  .style("font-style", "italic")
+                  .attr('x', 12)
+                  .attr('y', 3)
+      ;    
+
+      linkTexts.append("title")
+                .text(function(d) { 
+                  var labelStr = d.predicate; 
+                  if(labelStr.includes('subClassOf'))
+                  {
+                      var returnValue = 'Source : '+d.source +'\nProperty : '+customizeGraphArray.subClassLabel+'\nObject : '+d.target;
+                  }
+                  else
+                  {
+                    var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
+                  }
+                  
+                  return returnValue;
+                });
+      ;        
+      // ==================== Add Link Names =====================
+      
+      node = g.append("g")
+            .attr("class", "nodes")
+          .selectAll("g")
+          .data(nodesArray)
+          .enter().append("g")
+      ;    
+      node.exit().remove();
+      
+      circles = node.append("circle")
+            .attr("id",function(d){return d.nodeId ;})
+            .attr("r",function(d){var labelStr = d.id;
+              if(d.isLitteral)
+              {return literalRadius;}
+              return resourceRadius;})
+            .style("fill",function(d){var labelStr = d.id; 
+              if(d.isLitteral)
+                  {return customizeGraphArray.literalNodeColor;} 
+              return customizeGraphArray.resourceNodeColor;})
+            .call(d3.drag()
+                .on("start", dragstarted)
+                .on("drag", dragged)
+              .on("end", dragended)
+      );
+
+      lables = node.append("text")
+                .attr("class", "node-text")
+                .text(function (d) {return d.id; })
+                .style("font-size", function(d){var labelStr = d.id; 
+                  if(d.isLitteral)
+                  {return "80%";}
+                  return "100%";})
+                .style("font-style", function(d){var labelStr = d.id; 
+                  if(d.isLitteral)
+                  {return "italic";}
+                  return "bold";})
+                .style("fill",function(d){var labelStr = d.id; 
+                  if(d.isLitteral)
+                      {return customizeGraphArray.literalNodeTextColor;}
+                  return customizeGraphArray.resourceNodeTextColor;})
+                .attr('x', function(d){
+                  if(d.isLitteral)
+                      {return 8;}
+                  return 12;})
+                .attr('y', 3) 
+      ;
+
+      node.append("title")
+            .text(function(d) { 
+              var returnValue = 'Node : '+d.id;
+              if(d.isLitteral){returnValue = 'Node : '+d.id +'\nData type : '+d.literalDataType;}
+              else{returnValue = 'Node : '+d.id;}
+              return returnValue; })
+      ;
+
+      //START :: on click
+      node.on("dblclick",clickFunctionality);
+      //END :: on click    
+
+      //START :: on double click
+      node.on("click",doubleClickFuntionality);
+      //END :: on double click
     
-    node.on("dblclick",function(d)
+    
+      if(!disableZoom)
+      {
+        var zoom_handler = d3.zoom()
+          .on("zoom", zoom_actions);
+        //zoom_handler(svg);
+        //Zoom functions 
+        svg.call(zoom_handler).on("dblclick.zoom", null);
+        function zoom_actions(){
+          g.attr("transform", d3.event.transform)
+          
+        }
+      }
+    
+    }
+
+
+    function doubleClickFuntionality(d)
     {   
       var nodeIdVal =  d.id;
       var tempNodeContains = [];
@@ -460,7 +759,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       tempNode.append("text")
              .text(" " + nodeIdVal+"\n")
               .style("font-style","italic")
-              .style("font-size", "80%");
+              .style("font-size", "80%")
+              .style("position", "relative")
+              .style("bottom", "2px")
+        ;
 
     
       //node label on double click
@@ -480,14 +782,18 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 nodeLabel.append("text")
                   .text(" " + eachIds["@value"] +"\n")
                     .style("font-style","italic")
-                    .style("font-size", "80%");
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
               }
               else if (eachIds["@language"] == "en" && !displayDeustch)
               {
                 nodeLabel.append("text")
                   .text(" " + eachIds["@value"] +"\n")
                     .style("font-style","italic")
-                    .style("font-size", "80%");
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
               }
   
             });
@@ -497,7 +803,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             nodeLabel.append("text")
               .text(" " + tempNodeContains["rdfs:label"]["@value"] +"\n")
                 .style("font-style","italic")
-                .style("font-size", "80%");
+                .style("font-size", "80%")
+                .style("position", "relative")
+                .style("bottom", "2px");
           }
         }
   
@@ -509,7 +817,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           nodeID.append("text")
               .text(" " + tempNodeContains["@id"]+"\n") 
                 .style("font-style","italic")
-                .style("font-size", "80%");
+                .style("font-size", "80%")
+                .style("position", "relative")
+                .style("bottom", "2px");
         }
         //node type on double click
         var nodeType = d3.select("#"+idsArray.nodeTypeId)
@@ -519,7 +829,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           nodeType.append("text")
               .text(" " + tempNodeContains["@type"]+"\n\n")
                 .style("font-style","italic")
-                .style("font-size", "80%"); 
+                .style("font-size", "80%")
+                .style("position", "relative")
+                .style("bottom", "2px"); 
         }
         
         //node description on double click
@@ -537,14 +849,18 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 nodeDescription.append("text")
                   .text(" " + eachIds["@value"] +"\n")
                     .style("font-style","italic")
-                    .style("font-size", "80%");
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
               }
               else if (eachIds["@language"] == "en" && !displayDeustch)
               {
                 nodeDescription.append("text")
                   .text(" " + eachIds["@value"] +"\n")
                     .style("font-style","italic")
-                    .style("font-size", "80%");
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
               }
 
             });
@@ -554,7 +870,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             nodeDescription.append("text")
               .text(" " + tempNodeContains["dc:description"]["@value"] +"\n")
                 .style("font-style","italic")
-                .style("font-size", "80%");
+                .style("font-size", "80%")
+                .style("position", "relative")
+                .style("bottom", "2px");
           }
         }
         
@@ -578,7 +896,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               nodeSubClass.append("text")
                   .text(" " + tempIndexSubClassof +". "+ subClassLabel +"\n")
                     .style("font-style","italic")
-                    .style("font-size", "80%");
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
               
               tempIndexSubClassof = tempIndexSubClassof+1;
 
@@ -597,7 +917,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             nodeSubClass.append("text")
               .text( " " + subClassLabel+"\n")
                 .style("font-style","italic")
-                .style("font-size", "80%");
+                .style("font-size", "80%")
+                .style("position", "relative")
+                .style("bottom", "2px");
           }
         }
 
@@ -622,7 +944,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               nodeDomain.append("text")
                   .text(" " +  tempIndexdomain +". "+ domainLabel +"\n")
                     .style("font-style","italic")
-                    .style("font-size", "80%");
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
               
               tempIndexdomain = tempIndexdomain+1;
 
@@ -641,7 +965,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             nodeDomain.append("text")
               .text(" " + domainLabel+"\n")
                 .style("font-style","italic")
-                .style("font-size", "80%");
+                .style("font-size", "80%")
+                .style("position", "relative")
+                .style("bottom", "2px");
           }  
         }
 
@@ -667,7 +993,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               nodeRange.append("text")
                   .text(" " +  tempIndexRange +". "+ rangeLabel +"\n")
                     .style("font-style","italic")
-                    .style("font-size", "80%");
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
               
               tempIndexRange = tempIndexRange+1;
 
@@ -686,7 +1014,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             nodeRange.append("text")
               .text(" " + rangeLabel+"\n")
                 .style("font-style","italic")
-                .style("font-size", "80%");
+                .style("font-size", "80%")
+                .style("position", "relative")
+                .style("bottom", "2px");
           }  
         }
         
@@ -697,132 +1027,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           nodeComment.append("text")
               .text(tempNodeContains["rdfs:comment"]+"\n") 
                 .style("font-style","italic")
-                .style("font-size", "80%");
+                .style("font-size", "80%")
+                .style("position", "relative")
+                .style("bottom", "2px");
         }
 
       }
       
-    });
-
-    simulation
-          .nodes(nodesArray)
-          .on("tick", ticked)
-    ;
-
-    simulation.force("link")
-          .links(linksArray)
-    ;
-
-    function ticked()
-    {
-      lables
-          .attr("x2", function(d){ return d.x-width; })
-          .attr("y2", function (d) {return d.y -height; })
-      ;
-      link
-          .attr("x1", function(d) { return d.source.x; })
-          .attr("y1", function(d) { return d.source.y; })
-          .attr("x2", function(d) { return d.target.x; })
-          .attr("y2", function(d) { return d.target.y; })
-      ;
-      linkTexts
-          .attr("x", function(d) { //return  Math.max(5, Math.min(width - 10, (d.source.x + d.target.x)/2 ));
-            return 4 + (d.source.x + d.target.x)/2  ; })
-          .attr("y", function(d) { 
-            // return  Math.max(5, Math.min(height - 10, (d.source.y + d.target.y)/2));
-            return 4 + (d.source.y + d.target.y)/2 ; })
-      ;
-      node
-        .attr("transform", function(d) {
-            return "translate(" + d.x + "," + d.y + ")";
-            //return "translate(" + Math.max(10, Math.min(width - 10, d.x)) + "," + Math.max(5, Math.min(height - 10, d.y)) + ")";
-            //return "translate(" + (d.x < 1000 ? d.x = 100 : d.x > 1000 ? d.x = 900 : d.x) + "," + (d.y < 1000 ? d.y = 100 : d.y > 900 ? d.y = 900 : d.y) + ")";
-          })
-      ;
-      if(applyNodesBoundary)
-      {
-        node
-        .attr("cx", function(d) { return d.x = Math.max(Math.max(resourceRadius,literalRadius), Math.min(width - Math.max(resourceRadius,literalRadius), d.x)); })
-        .attr("cy", function(d) { return d.y = Math.max(Math.max(resourceRadius,literalRadius), Math.min(height - Math.max(resourceRadius,literalRadius), d.y)); });
-      }
-    }
-
-    
-
-    if(!disableZoom)
-    {
-      var zoom_handler = d3.zoom()
-        .on("zoom", zoom_actions);
-      //zoom_handler(svg);
-      //Zoom functions 
-      svg.call(zoom_handler).on("dblclick.zoom", null);
-      function zoom_actions(){
-        g.attr("transform", d3.event.transform)
-        
-      }
-    }
-    
-    function getLabel(displayDeustch,id)
-    {
-      var returnVaule = "noLabel"
-      if(!displayDeustch)
-      {
-        enLabelArray.forEach(function(elem) 
-        {
-          if(elem["id"] === id)
-          {
-            returnVaule = elem["value"];
-          } 
-        });
-      }
-      else if(displayDeustch)
-      {
-        deLabelArray.forEach(function(elem) 
-        {
-          if(elem["id"] === id)
-          {
-            returnVaule = elem["value"];
-          } 
-        });
-      }
-      return returnVaule;
-    }
-
-    function createNewNode(tempSub,tempPred,tempObj,isLitteralVal,literalDataTypeVal)
-    {
-      //START :: Node creation
-      var subNodeAdded = false;  
-      var objNodeAdded = false;
-        
-      if(nodesArray != undefined)
-      {
-        nodesArray.forEach(function(elem) 
-        {
-          if(elem["id"] === tempSub)
-          {
-            subNodeAdded = true;
-          } 
-          if(elem["id"] === tempObj)
-          {
-            objNodeAdded = true;
-          } 
-        });
-      }
-      
-      if(subNodeAdded === false)
-      {
-        circleIdIndex =circleIdIndex+1; 
-        var nodeValue = {id:tempSub ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:false,literalDataType:literalDataTypeVal, group: 1};
-        nodesArray.push(nodeValue);
-      }
-      if(objNodeAdded === false)
-      {
-        circleIdIndex =circleIdIndex+1;
-        var nodeValue = {id:tempObj ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:isLitteralVal,literalDataType:literalDataTypeVal, group: 1};
-        nodesArray.push(nodeValue);
-      }
-      //END :: Node creation
-      //console.log("nodeValue len =>"+nodesArray.length);
     }
   });
   

From 8a02d2fcea253b0681cb47674e6fc819fb7ef469 Mon Sep 17 00:00:00 2001
From: himadri-kumari <himadri.naina@gmail.com>
Date: Fri, 28 Jun 2019 16:01:25 +0200
Subject: [PATCH 21/66] swapped onclick and on double clicked Minor spell
 checks and docker

---
 ida-chatbot/src/app/app.module.ts             |  6 +--
 .../rdf-ontology-view.component.html          | 40 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 6ac16bf1b..b4c9ea014 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -61,7 +61,7 @@ import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
-//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [
@@ -123,8 +123,8 @@ import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ont
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule//,
-    //NgbModule
+    FlexLayoutModule,
+    NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index e3d7fcf35..3b5d9bb6b 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -10,29 +10,29 @@ <h1 align='center'>RDF Ontology Graph</h1>
        
     </label>
     <label class="labelClass">
-      Display in deustch 
+      Display in Deutsch
       <input class="checkboxClass" type="checkbox" [(ngModel)]="languageCheked" (change)="checkboxValuesChanged(isChecked)" /> 
     </label>
     <label class="labelClass"> 
-      Include class heirarchy 
+      Include Class Hierarchy
       <input class="checkboxClass" type="checkbox" [(ngModel)]="classHeirarchyChecked" value="1" (change)="checkboxValuesChanged(isChecked)" /> 
     </label>
     <label class="labelClass">
-      Include all properties 
+      Include All Properties 
       <input class="checkboxClass" type="checkbox" [(ngModel)]="allPropChecked" (change)="checkboxValuesChanged(isChecked)" /> 
     </label>
     <label class="labelClass">
-      Bounded graph
+      Bounded Graph
       <input class="checkboxClass" type="checkbox" [(ngModel)]="allNodesInBoundClicked" (change)="checkboxValuesChanged(isChecked)" /> 
     </label>
     <label class="labelClass">
-      Disable zoom
+      Disable Zoom
       <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked" (change)="checkboxValuesChanged(isChecked)" /> 
     </label>
     <label class="labelClass"> 
       <button #graphReset (click)="graphResetChanged($event)" 
         style="width: 8%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:whitesmoke;">
-        Reset garph
+        Reset Graph
       </button> 
     </label>
   </div>
@@ -43,7 +43,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
           <div  id="nodeInformationId" 
               style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
             <label class="inputLabelClass">
-              Node information: 
+              Node Information: 
             </label>
             <br/>
           </div>
@@ -88,7 +88,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
             </div> 
             <div class="nodeInfoDivClass">
               <label class="inputLabelClass">
-                  Sub class of:
+                  Sub Class Of:
               </label>
               <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
               <br/>
@@ -119,7 +119,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
           <div  id="graphConfigId" 
               style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
             <label class="inputLabelClass">
-              Customize graph: 
+              Customize Graph: 
             </label>
             <br/>
           </div>
@@ -128,37 +128,37 @@ <h1 align='center'>RDF Ontology Graph</h1>
               style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
                 padding-top: 10px;">
             <label class="inputLabelClass">
-              Edge size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
+              Edge Size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
             </label><br/>
             <label class="inputLabelClass">
-              Graph charge/depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge" placeholder=" 1000">
+              Graph Charge/Depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge" placeholder=" 1000">
             </label><br/>
             <label class="inputLabelClass">
-              Resource node radius: <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius" placeholder=" 10">
+              Resource Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius" placeholder=" 10">
             </label><br/>
             <label class="inputLabelClass">
-              Literal node radius: <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
+              Literal Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
             </label><br/>
             <label class="inputLabelClass">
-              Resource node color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor" placeholder=" #311B92">
+              Resource Node Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor" placeholder=" #311B92">
             </label><br/>
             <label class="inputLabelClass">
-              Resource node text color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor" placeholder=" #311B92" >
+              Resource Node Text Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor" placeholder=" #311B92" >
             </label><br/>
             <label class="inputLabelClass">
-              Literal node color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor" placeholder=" #FF9800">
+              Literal Node Color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor" placeholder=" #FF9800">
             </label><br/>
             <label class="inputLabelClass">
               Literal node text color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor" placeholder=" #FF9800" >
             </label><br/>
             <label class="inputLabelClass">
-              Sub class label: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel" placeholder=" --subClassOf--" >
+              Sub Class Label: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel" placeholder=" --subClassOf--" >
             </label><br/>
             <label class="inputLabelClass">
-              Sub class label color: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor" placeholder=" #3498DB" >
+              Sub Class Label Color: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor" placeholder=" #3498DB" >
             </label><br/>
             <label class="inputLabelClass">
-              Property text color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor" placeholder=" #28B463">
+              Property Text Color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor" placeholder=" #28B463">
             </label><br/>
             <!--
             <label class="inputLabelClass">
@@ -167,7 +167,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
  
             <button #applyConfigBtn (click)="applyConfigClicked($event)" 
               style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
-              Apply changes
+              Apply Changes
             </button>
           </div>
     </div>

From d5981018ccd3f4953a6e546b06ecfc9efb448221 Mon Sep 17 00:00:00 2001
From: himadri-kumari <himadri.naina@gmail.com>
Date: Mon, 1 Jul 2019 12:09:54 +0200
Subject: [PATCH 22/66] remove the question marks.

---
 ida-chatbot/src/app/app.module.ts             |  2 +-
 .../d3v4-rdf-ontology-graph-view.js           | 40 +++++++++----------
 .../rdfontology/historian-onlogoly.json       | 23 ++++++++++-
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index b4c9ea014..18c6ada06 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -124,7 +124,7 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     MatToolbarModule,
     MatTooltipModule,
     FlexLayoutModule,
-    NgbModule
+ NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 8f914604e..044eda815 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -85,7 +85,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
            
             var tempLabelArray = elem["@id"].split('/');
             var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-            var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+            var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
 
             var tepmNodeContent = {label:tempLabel, contents:elem};
             nodeContents.push(tepmNodeContent);
@@ -114,7 +114,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           
           var tempLabelArray = elem["@id"].split('/');
           var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-          var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+          var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
 
           var tepmNodeContent = {label:tempLabel, contents:elem};
           nodeContents.push(tepmNodeContent);
@@ -124,7 +124,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       {
         var tempLabelArray = elem["@id"].split('/');
         var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-        var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+        var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
 
         var tepmNodeContent = {label:tempLabel, contents:elem};
         nodeContents.push(tepmNodeContent);
@@ -153,7 +153,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 var tempLabelArray = element["@id"].split('/');
                 var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                tempSub = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
               }
 
               if(Object.prototype.toString.call(element["rdfs:subClassOf"]) === '[object Array]')
@@ -165,7 +165,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   {
                     var tempLabelArray = eachIds["@id"].split('/');
                     var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                    tempObj = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                    tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                   }
 
                   var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
@@ -182,7 +182,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   var tempLabelArray = element["rdfs:subClassOf"]["@id"].split('/');
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
                 //var tripleValue = {source:tempSub, 	predicate:'---subClassOf---', 	target:tempObj,value: 1};
                 var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
@@ -210,7 +210,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   {
                     var tempLabelArray = eachIds["@id"].split('/');
                     var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                    tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                    tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
                   }
                   tempDomainArray.push(tempDomainLabel);
                 });
@@ -222,7 +222,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   var tempLabelArray = element["rdfs:domain"]["@id"].split('/');
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempSub = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                  tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
               }
             }
@@ -235,7 +235,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 var tempLabelArray = element["@id"].split('/');
                 var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                tempPred = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                tempPred = tempLabelArray1[tempLabelArray1.length -1 ];
               }
             }
 
@@ -250,7 +250,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   var tempLabelArray = element["rdfs:range"]["@id"].split('/');
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
               }  
             }
@@ -457,7 +457,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   var tempLabelArray = eachIds["@id"].split('/');
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                  tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
                 
                 if(clickedNodeLabel === tempDomainLabel)
@@ -476,7 +476,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 var tempLabelArray = element["rdfs:domain"]["@id"].split('/');
                 var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                tempSub = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
               }
 
               if(clickedNodeLabel === tempSub)
@@ -497,7 +497,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 var tempLabelArray = element["@id"].split('/');
                 var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                tempPred = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                tempPred = tempLabelArray1[tempLabelArray1.length -1 ];
               }
             }
 
@@ -513,7 +513,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   var tempLabelArray = element["rdfs:range"]["@id"].split('/');
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
               }  
             }
@@ -890,7 +890,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 var tempLabelArray = eachIds["@id"].split('/');
                 var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                subClassLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                subClassLabel = tempLabelArray1[tempLabelArray1.length -1 ];
               }
 
               nodeSubClass.append("text")
@@ -911,7 +911,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             {
               var tempLabelArray = tempNodeContains["rdfs:subClassOf"]["@id"].split('/');
               var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-              subClassLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+              subClassLabel = tempLabelArray1[tempLabelArray1.length -1 ];
             }
 
             nodeSubClass.append("text")
@@ -938,7 +938,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 var tempLabelArray = eachIds["@id"].split('/');
                 var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                domainLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                domainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
               }
 
               nodeDomain.append("text")
@@ -959,7 +959,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             {
               var tempLabelArray = tempNodeContains["rdfs:domain"]["@id"].split('/');
               var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-              domainLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+              domainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
             }
 
             nodeDomain.append("text")
@@ -987,7 +987,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 var tempLabelArray = eachIds["@id"].split('/');
                 var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                rangeLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+                rangeLabel = tempLabelArray1[tempLabelArray1.length -1 ];
               }
 
               nodeRange.append("text")
@@ -1008,7 +1008,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             {
               var tempLabelArray = tempNodeContains["rdfs:range"]["@id"].split('/');
               var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-              rangeLabel = tempLabelArray1[tempLabelArray1.length -1 ]+'?';
+              rangeLabel = tempLabelArray1[tempLabelArray1.length -1 ];
             }
 
             nodeRange.append("text")
diff --git a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
index 33beea810..07fc2d4c9 100644
--- a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
+++ b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
@@ -359,7 +359,16 @@
     },
     {
       "@id": "time:TemporalEntity",
-      "@type": "owl:Class"
+      "@type": "owl:Class" ,"rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "TemporalEntity"
+        },
+        {
+          "@language": "de",
+          "@value": "TemporalEntity"
+        }
+      ]
     },
     {
       "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/verifiedData",
@@ -972,7 +981,17 @@
     },
     {
       "@id": "dbo:Person",
-      "@type": "owl:Class"
+      "@type": "owl:Class",
+	  "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "Person"
+        },
+        {
+          "@language": "de",
+          "@value": "Person"
+        }
+      ]
     },
     {
       "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDecoration",

From f4e5792895dab7100a64c394019bb9982114cb3e Mon Sep 17 00:00:00 2001
From: himadri-kumari <himadri.naina@gmail.com>
Date: Mon, 1 Jul 2019 12:24:25 +0200
Subject: [PATCH 23/66] fixing issues

---
 .../d3v4-rdf-ontology-graph-view.js           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 044eda815..c83943b36 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -60,13 +60,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
     //START :: get english and deutsch labels values into arrays
     data["@graph"].forEach(function(elem) 
     {
-      if(elem["rdfs:label"] != undefined)
+      if(elem["rdfs:label"] !== undefined)
       {
         if(Object.prototype.toString.call(elem["rdfs:label"]) === '[object Array]')
         {
           elem["rdfs:label"].forEach(function(eachIds)
           {  
-            if(eachIds["@language"] == "de")
+            if(eachIds["@language"] === "de")
             {
               var tempLabel = {"id":elem["@id"],"language":"de","value":eachIds["@value"]}
               deLabelArray.push(tempLabel);
@@ -74,7 +74,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               var tepmNodeContent = {label:eachIds["@value"], contents:elem};
               nodeContents.push(tepmNodeContent);
             }
-            if(eachIds["@language"] == "en")
+            if(eachIds["@language"] === "en")
             {
               var tempLabel = {"id":elem["@id"],"language":"en","value":eachIds["@value"]}
               enLabelArray.push(tempLabel);
@@ -103,9 +103,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             var tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
             nodeContents.push(tepmNodeContent);
           }
-          if(elem["rdfs:label"]["@language"] == "en")
+          if(elem["rdfs:label"]["@language"] === "en")
           {
-            var tempLabel = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]}
+            var tempLabel = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]};
             enLabelArray.push(tempLabel);
 
             var tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
@@ -113,7 +113,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           }
           
           var tempLabelArray = elem["@id"].split('/');
-          var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+          var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(":");
           var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
 
           var tepmNodeContent = {label:tempLabel, contents:elem};
@@ -122,7 +122,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       }
       else
       {
-        var tempLabelArray = elem["@id"].split('/');
+        var tempLabelArray = elem["@id"].split("/");
         var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
         var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
 
@@ -146,7 +146,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
         //START :: Nodes and Links creation for subClassOf
         if(displaySubclasses)
         {
-            if(element["rdfs:subClassOf"] != undefined)
+            if(element["rdfs:subClassOf"] !== undefined)
             {
               tempSub = getLabel(displayDeustch,element["@id"]);
               if(tempSub == "noLabel")
@@ -156,7 +156,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
               }
 
-              if(Object.prototype.toString.call(element["rdfs:subClassOf"]) === '[object Array]')
+              if(Object.prototype.toString.call(element["rdfs:subClassOf"]) === "[object Array]")
               {
                 element["rdfs:subClassOf"].forEach(function(eachIds)
                 {  
@@ -180,7 +180,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 tempObj = getLabel(displayDeustch,element["rdfs:subClassOf"]["@id"]);
                 if(tempObj == "noLabel")
                 {
-                  var tempLabelArray = element["rdfs:subClassOf"]["@id"].split('/');
+                  var tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                   tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
@@ -509,7 +509,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               if ("@id" in element["rdfs:range"])
               {
                 tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
-                if(tempObj == "noLabel")
+                if(tempObj === "noLabel")
                 {
                   var tempLabelArray = element["rdfs:range"]["@id"].split('/');
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
@@ -528,7 +528,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               isLitteral = true;
             }
 
-            if(!tempDomainArray.length  ==0)
+            if(!tempDomainArray.length  ===0)
             {
               tempDomainArray.forEach(function(el)
               {

From 679085ee3b0239fc36ed4b7482503a399ff3f0fc Mon Sep 17 00:00:00 2001
From: Nandeesh <nandeeshpatelgp@gmail.com>
Date: Tue, 2 Jul 2019 10:40:24 +0200
Subject: [PATCH 24/66] Keeping the ontology explorer as a separate item on
 sidebar.

---
 ida-chatbot/src/app/app.component.html        |   2 +-
 ida-chatbot/src/app/app.component.ts          |   5 +-
 .../rdf-ontology-view.component.html          | 336 +++++++++---------
 3 files changed, 180 insertions(+), 163 deletions(-)

diff --git a/ida-chatbot/src/app/app.component.html b/ida-chatbot/src/app/app.component.html
index 8663a155c..760a07939 100644
--- a/ida-chatbot/src/app/app.component.html
+++ b/ida-chatbot/src/app/app.component.html
@@ -7,9 +7,9 @@
      
      
     <app-intro [ngClass]="{'hidden-cls': activeItem!==0 }"></app-intro>
+    <app-rdf-ontology-view [hidden]='activeItem !== 1'></app-rdf-ontology-view>
     <ng-container *ngFor="let mvw of getMainviewItems()" >
       <app-data-view-container [item]="mvw" [ngClass]="{'hidden-cls': activeItem!==mvw.id }"></app-data-view-container>
-      <app-rdf-ontology-view ></app-rdf-ontology-view>
     </ng-container>
   </div>
   <app-chatbox id="chatBox" fxFlexAlign="end" fxFlex="auto" (actnEmitter)="addNewUserMessage($event)"></app-chatbox>
diff --git a/ida-chatbot/src/app/app.component.ts b/ida-chatbot/src/app/app.component.ts
index d18a97581..6903cc806 100644
--- a/ida-chatbot/src/app/app.component.ts
+++ b/ida-chatbot/src/app/app.component.ts
@@ -18,11 +18,12 @@ import {IdaEventService} from './service/event/ida-event.service';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  idCount = 1;
+  idCount = 2;
   title = 'app';
   public introSideItem = new SidebarElement(0, 'Introduction', 'intro');
+  public ontologySideItem = new SidebarElement(1, 'Ontology Explorer', 'ontology');
   public activeItem = 0;
-  private sidebarItems: SidebarElement[] = [this.introSideItem];
+  private sidebarItems: SidebarElement[] = [this.introSideItem, this.ontologySideItem];
   private mainViewItems: MainviewElement[] = [];
 
   @ViewChild(ChatboxComponent)
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 3b5d9bb6b..6404448b5 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,175 +1,191 @@
-<div  [attr.id]="fdgId1" fxFlexstyle="height: 150vh; margin: 20px;border-color: #eaeaea;border-style: solid">
-  
-  <div style="width: 100%; height: 20%;">
-    <h1 align='center'>RDF Ontology Graph</h1>
-  </div>
-  <div id="filtersId" 
-  style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">  
-    <label class="labelClass">
-      Filters: 
-       
-    </label>
-    <label class="labelClass">
-      Display in Deutsch
-      <input class="checkboxClass" type="checkbox" [(ngModel)]="languageCheked" (change)="checkboxValuesChanged(isChecked)" /> 
-    </label>
-    <label class="labelClass"> 
-      Include Class Hierarchy
-      <input class="checkboxClass" type="checkbox" [(ngModel)]="classHeirarchyChecked" value="1" (change)="checkboxValuesChanged(isChecked)" /> 
-    </label>
-    <label class="labelClass">
-      Include All Properties 
-      <input class="checkboxClass" type="checkbox" [(ngModel)]="allPropChecked" (change)="checkboxValuesChanged(isChecked)" /> 
-    </label>
-    <label class="labelClass">
-      Bounded Graph
-      <input class="checkboxClass" type="checkbox" [(ngModel)]="allNodesInBoundClicked" (change)="checkboxValuesChanged(isChecked)" /> 
-    </label>
-    <label class="labelClass">
-      Disable Zoom
-      <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked" (change)="checkboxValuesChanged(isChecked)" /> 
-    </label>
-    <label class="labelClass"> 
-      <button #graphReset (click)="graphResetChanged($event)" 
-        style="width: 8%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:whitesmoke;">
-        Reset Graph
-      </button> 
-    </label>
-  </div>
-<br/>
-    <div  id="filtersId" 
-          style="display: block;float: right;width:24.5%; height: 1053px;background-color:#F2F3F4;border-radius: 8px;">
-          
-          <div  id="nodeInformationId" 
-              style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
+<mat-tab-group style="min-width: 40vw;max-height: 100vh">
+  <mat-tab label="Ontology Explorer">
+    <div [attr.id]="fdgId1" fxFlexstyle="height: 150vh; margin: 20px;border-color: #eaeaea;border-style: solid">
+
+      <div style="width: 100%; height: 20%;">
+        <h1 align='center'>RDF Ontology Graph</h1>
+      </div>
+      <div id="filtersId"
+        style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">
+        <label class="labelClass">
+          Filters:
+
+        </label>
+        <label class="labelClass">
+          Display in Deutsch
+          <input class="checkboxClass" type="checkbox" [(ngModel)]="languageCheked"
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          Include Class Hierarchy
+          <input class="checkboxClass" type="checkbox" [(ngModel)]="classHeirarchyChecked" value="1"
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          Include All Properties
+          <input class="checkboxClass" type="checkbox" [(ngModel)]="allPropChecked"
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          Bounded Graph
+          <input class="checkboxClass" type="checkbox" [(ngModel)]="allNodesInBoundClicked"
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          Disable Zoom
+          <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked"
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          <button #graphReset (click)="graphResetChanged($event)"
+            style="width: 8%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:whitesmoke;">
+            Reset Graph
+          </button>
+        </label>
+      </div>
+      <br />
+      <div id="filtersId"
+        style="display: block;float: right;width:24.5%; height: 1053px;background-color:#F2F3F4;border-radius: 8px;">
+
+        <div id="nodeInformationId"
+          style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
+          <label class="inputLabelClass">
+            Node Information:
+          </label>
+          <br />
+        </div>
+
+        <div id="nodeInfoTagesId" style=" text-align: justify;overflow: auto;display: block;background-color:#AED6F1;border-radius: 8px;
+                    padding-top: 10px;">
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              Node Information: 
+              Node:
             </label>
-            <br/>
+            <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
+            <br />
           </div>
-          
-          <div  id="nodeInfoTagesId" 
-              style=" text-align: justify;overflow: auto;display: block;background-color:#AED6F1;border-radius: 8px;
-                padding-top: 10px;">
-            <div class="nodeInfoDivClass"> 
-              <label class="inputLabelClass"> 
-                  Node: 
-              </label>
-              <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
-              <br/>
-            </div>
-            <div class="nodeInfoDivClass">
-              <label class="inputLabelClass" > 
-                Label:
-              </label>
-              <div class="nodeInfoDiv"  [attr.id]="nodeLabelId" ></div>
-              <br/>
-            </div> 
-            <div class="nodeInfoDivClass">
-              <label class="inputLabelClass" >
-                  Id:
-              </label>
-              <div class="nodeInfoDiv"  [attr.id]="nodeIdsId"></div>
-              <br/>
-            </div> 
-            <div class="nodeInfoDivClass">
-              <label class="inputLabelClass" >
-                  Type: 
-              </label>
-              <div class="nodeInfoDiv"  [attr.id]="nodeTypeId"> </div>
-              <br/>
-            </div> 
-            <div class="nodeInfoDivClass">
-              <label class="inputLabelClass">
-                  Description: 
-              </label>
-              <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
-              <br/>
-            </div> 
-            <div class="nodeInfoDivClass">
-              <label class="inputLabelClass">
-                  Sub Class Of:
-              </label>
-              <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
-              <br/>
-            </div> 
-            <div class="nodeInfoDivClass">
-              <label class="inputLabelClass">
-                  Domain:
-              </label>
-              <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
-              <br/>
-            </div> 
-            <div class="nodeInfoDivClass">
-              <label class="inputLabelClass" >
-                  Range:
-              </label>
-              <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
-              <br/>
-            </div> 
-            <div class="nodeInfoDivClass">
-              <label class="inputLabelClass">
-                  Comment:
-              </label> 
-              <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
-              <br/>
-            </div> 
-          </div>
-
-          <div  id="graphConfigId" 
-              style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              Customize Graph: 
+              Label:
             </label>
-            <br/>
+            <div class="nodeInfoDiv" [attr.id]="nodeLabelId"></div>
+            <br />
           </div>
-          
-          <div  id="graphConfigInputsId" 
-              style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
-                padding-top: 10px;">
-            <label class="inputLabelClass">
-              Edge Size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
-            </label><br/>
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              Graph Charge/Depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge" placeholder=" 1000">
-            </label><br/>
-            <label class="inputLabelClass">
-              Resource Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius" placeholder=" 10">
-            </label><br/>
-            <label class="inputLabelClass">
-              Literal Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
-            </label><br/>
-            <label class="inputLabelClass">
-              Resource Node Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor" placeholder=" #311B92">
-            </label><br/>
-            <label class="inputLabelClass">
-              Resource Node Text Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor" placeholder=" #311B92" >
-            </label><br/>
+              Id:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeIdsId"></div>
+            <br />
+          </div>
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              Literal Node Color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor" placeholder=" #FF9800">
-            </label><br/>
+              Type:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeTypeId"> </div>
+            <br />
+          </div>
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              Literal node text color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor" placeholder=" #FF9800" >
-            </label><br/>
+              Description:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
+            <br />
+          </div>
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              Sub Class Label: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel" placeholder=" --subClassOf--" >
-            </label><br/>
+              Sub Class Of:
+            </label>
+            <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
+            <br />
+          </div>
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              Sub Class Label Color: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor" placeholder=" #3498DB" >
-            </label><br/>
+              Domain:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
+            <br />
+          </div>
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              Property Text Color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor" placeholder=" #28B463">
-            </label><br/>
-            <!--
+              Range:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
+            <br />
+          </div>
+          <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
-              On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
-            </label>--><br/> <br/><br/> <br/> <br/> 
- 
-            <button #applyConfigBtn (click)="applyConfigClicked($event)" 
-              style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
-              Apply Changes
-            </button>
+              Comment:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
+            <br />
           </div>
+        </div>
+
+        <div id="graphConfigId"
+          style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
+          <label class="inputLabelClass">
+            Customize Graph:
+          </label>
+          <br />
+        </div>
+
+        <div id="graphConfigInputsId" style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
+                    padding-top: 10px;">
+          <label class="inputLabelClass">
+            Edge Size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
+          </label><br />
+          <label class="inputLabelClass">
+            Graph Charge/Depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge"
+              placeholder=" 1000">
+          </label><br />
+          <label class="inputLabelClass">
+            Resource Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius"
+              placeholder=" 10">
+          </label><br />
+          <label class="inputLabelClass">
+            Literal Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
+          </label><br />
+          <label class="inputLabelClass">
+            Resource Node Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor"
+              placeholder=" #311B92">
+          </label><br />
+          <label class="inputLabelClass">
+            Resource Node Text Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor"
+              placeholder=" #311B92">
+          </label><br />
+          <label class="inputLabelClass">
+            Literal Node Color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor"
+              placeholder=" #FF9800">
+          </label><br />
+          <label class="inputLabelClass">
+            Literal node text color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor"
+              placeholder=" #FF9800">
+          </label><br />
+          <label class="inputLabelClass">
+            Sub Class Label: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel"
+              placeholder=" --subClassOf--">
+          </label><br />
+          <label class="inputLabelClass">
+            Sub Class Label Color: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor"
+              placeholder=" #3498DB">
+          </label><br />
+          <label class="inputLabelClass">
+            Property Text Color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor"
+              placeholder=" #28B463">
+          </label><br />
+          <!--
+                <label class="inputLabelClass">
+                  On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
+                </label>--><br /> <br /><br /> <br /> <br />
+
+          <button #applyConfigBtn (click)="applyConfigClicked($event)"
+            style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
+            Apply Changes
+          </button>
+        </div>
+      </div>
+      <div [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;"></div>
     </div>
-    <div  [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;"></div>
-</div>
+  </mat-tab>
+</mat-tab-group>
\ No newline at end of file

From 3ae262702153303d2109b0168ce2d6ba16b2f42e Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 2 Jul 2019 11:22:56 +0200
Subject: [PATCH 25/66] fixing graph display issues after tab implementation.

---
 .../rdf-ontology-view.component.html          | 24 +++++++++----------
 .../d3v4-rdf-ontology-graph-view.js           |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 6404448b5..a238df0a1 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -3,7 +3,7 @@
     <div [attr.id]="fdgId1" fxFlexstyle="height: 150vh; margin: 20px;border-color: #eaeaea;border-style: solid">
 
       <div style="width: 100%; height: 20%;">
-        <h1 align='center'>RDF Ontology Graph</h1>
+        <h1 align='center'>Historian Ontology Graph</h1>
       </div>
       <div id="filtersId"
         style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">
@@ -62,63 +62,63 @@ <h1 align='center'>RDF Ontology Graph</h1>
               Node:
             </label>
             <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
-            <br />
+            <br /><br />
           </div>
           <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
               Label:
             </label>
             <div class="nodeInfoDiv" [attr.id]="nodeLabelId"></div>
-            <br />
+            <br /><br />
           </div>
           <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
               Id:
             </label>
             <div class="nodeInfoDiv" [attr.id]="nodeIdsId"></div>
-            <br />
+            <br /><br />
           </div>
           <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
               Type:
             </label>
             <div class="nodeInfoDiv" [attr.id]="nodeTypeId"> </div>
-            <br />
+            <br /><br />
           </div>
           <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
               Description:
             </label>
             <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
-            <br />
+            <br /><br />
           </div>
           <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
               Sub Class Of:
             </label>
             <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
-            <br />
+            <br /><br />
           </div>
           <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
               Domain:
             </label>
             <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
-            <br />
+            <br /><br />
           </div>
           <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
               Range:
             </label>
             <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
-            <br />
+            <br /><br />
           </div>
           <div class="nodeInfoDivClass">
             <label class="inputLabelClass">
               Comment:
             </label>
             <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
-            <br />
+            <br /><br />
           </div>
         </div>
 
@@ -127,7 +127,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
           <label class="inputLabelClass">
             Customize Graph:
           </label>
-          <br />
+          <br /><br />
         </div>
 
         <div id="graphConfigInputsId" style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
@@ -185,7 +185,7 @@ <h1 align='center'>RDF Ontology Graph</h1>
           </button>
         </div>
       </div>
-      <div [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;"></div>
+      <div [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;position: relative;left: 6px;"></div>
     </div>
   </mat-tab>
 </mat-tab-group>
\ No newline at end of file
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index c83943b36..633465b7c 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -7,7 +7,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
   var expandedNodesArray = [];
   var nodeContents = [];
 
-  var width = 1060,height = 900,resourceRadius = customizeGraphArray.resourceRadius,literalRadius = customizeGraphArray.literalRadius;
+  var width = 1025,height = 1100,resourceRadius = customizeGraphArray.resourceRadius,literalRadius = customizeGraphArray.literalRadius;
 
   var g,link,linkTexts,node,circles,lables;
   var svgClear = d3.select("#"+svgId);

From 5cc167c8325470fcc06aac7adaa7932081c82610 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 2 Jul 2019 11:39:46 +0200
Subject: [PATCH 26/66] ready for code review

---
 ida-chatbot/src/app/app.module.ts             |  2 +-
 .../rdf-ontology-view.component.ts            |  9 -----
 .../d3v4-rdf-ontology-graph-view.js           | 38 +++++--------------
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 18c6ada06..b4c9ea014 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -124,7 +124,7 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     MatToolbarModule,
     MatTooltipModule,
     FlexLayoutModule,
- NgbModule
+    NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index 16103d3fd..021fefee9 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -101,15 +101,6 @@ export class RdfOntologyViewComponent implements OnInit {
                 }
     createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
       this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
-    
-    /*if(event === "yes")
-    {
-      createV4RDFOntologyGraph(this.figId1, this.svgId1,this.fileName,"de",true,true);
-    }
-    else if(event === "no")
-    {
-      createV4RDFOntologyGraph(this.figId1, this.svgId1,this.fileName,"en",true,false);
-    }*/
   }
   graphResetChanged(event){
     this.languageCheked = false;
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 633465b7c..d0eab0a82 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -171,7 +171,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
                   linksArray.push(tripleValue);
                   
-                  //createNewNode(tempSub,'---subClassOf---',tempObj);
                   createNewNode(tempSub,pred,tempObj,false,'');
                 });
               }
@@ -184,11 +183,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                   tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
-                //var tripleValue = {source:tempSub, 	predicate:'---subClassOf---', 	target:tempObj,value: 1};
                 var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
                 linksArray.push(tripleValue);
 
-                //createNewNode(tempSub,'---subClassOf---',tempObj);
                 createNewNode(tempSub,pred,tempObj,false,'');
               }
             }
@@ -201,8 +198,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             //get the subject label  
             if(element["rdfs:domain"]!=undefined)
             {
-              if(Object.prototype.toString.call(element["rdfs:domain"]) === '[object Array]'){
-                //console.log("inside if");
+              if(Object.prototype.toString.call(element["rdfs:domain"]) === '[object Array]')
+              {
                 element["rdfs:domain"].forEach(function(eachIds)
                 {
                   var tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
@@ -241,8 +238,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
 
 
             //get the object  range
-            if(element["rdfs:range"]!=undefined){
-              //console.log(element.domain["@id"]);
+            if(element["rdfs:range"]!=undefined)
+            {
               if ("@id" in element["rdfs:range"])
               {
                 tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
@@ -263,7 +260,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               tempObj = tempObj + literalIndex;
               literalIndex = literalIndex + 1 ;
               isLitteral = true;
-              console.log('tempObj 0 '+tempObj);
             }
 
             if(!tempDomainArray.length  ==0)
@@ -330,18 +326,15 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           .attr("y2", function(d) { return d.target.y; })
       ;
       linkTexts
-          .attr("x", function(d) { //return  Math.max(5, Math.min(width - 10, (d.source.x + d.target.x)/2 ));
+          .attr("x", function(d) { 
             return 4 + (d.source.x + d.target.x)/2  ; })
           .attr("y", function(d) { 
-            // return  Math.max(5, Math.min(height - 10, (d.source.y + d.target.y)/2));
             return 4 + (d.source.y + d.target.y)/2 ; })
       ;
       node
         .attr("transform", function(d) {
             return "translate(" + d.x + "," + d.y + ")";
-            //return "translate(" + Math.max(10, Math.min(width - 10, d.x)) + "," + Math.max(5, Math.min(height - 10, d.y)) + ")";
-            //return "translate(" + (d.x < 1000 ? d.x = 100 : d.x > 1000 ? d.x = 900 : d.x) + "," + (d.y < 1000 ? d.y = 100 : d.y > 900 ? d.y = 900 : d.y) + ")";
-          })
+           })
       ;
       if(applyNodesBoundary)
       {
@@ -415,14 +408,12 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
         nodesArray.push(nodeValue);
       }
       //END :: Node creation
-      //console.log("nodeValue len =>"+nodesArray.length);
     }
 
     function clickFunctionality(d)
     {  
       var idVal =  "#"+d.nodeId;
       var clickedNodeLabel =  d.id;
-      console.log("d.id =< "+d.id);
       if(expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal))
       {
         expandedNodesArray.push(idVal);
@@ -449,7 +440,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           {
             if(Object.prototype.toString.call(element["rdfs:domain"]) === '[object Array]')
             {
-              //console.log("inside if");
               element["rdfs:domain"].forEach(function(eachIds)
               {
                 var tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
@@ -464,7 +454,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   includeThis = true;
                   tempDomainArray.push(tempDomainLabel);
-                  console.log("include tempDomainLabel< "+tempDomainLabel);
                 }
                 
               });
@@ -482,7 +471,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               if(clickedNodeLabel === tempSub)
               {
                 includeThis = true;
-                console.log("include tempSub< "+element["@id"]);
               }
             }
           }
@@ -501,11 +489,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               }
             }
 
-
             //get the object  range
             if(element["rdfs:range"]!=undefined)
             {
-              //console.log(element.domain["@id"]);
               if ("@id" in element["rdfs:range"])
               {
                 tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
@@ -538,15 +524,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   {
                     var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
                     linksArray.push(tripleValue);
-                    console.log("include 1 source "+el +" predicate- "+tempPred +"  target-" +tempObj);
-                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element,this.simulation);
+                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element);
                   }
                   else
                   {
                     var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
                     linksArray.push(tripleValue);
-                    console.log("include 2 source "+el +" predicate- "+tempPred +"  target-" +tempObj);
-                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,this.simulation);
+                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType);
                   }
                 }
               });
@@ -559,15 +543,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   var tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
                   linksArray.push(tripleValue);
-                  console.log("include 3 source "+tempSub +" predicate- "+tempPred +"  target-" +tempObj);
-                  createNewNode(tempSub,'',tempPred,isLitteral,literalDataType,this.simulation);
+                  createNewNode(tempSub,'',tempPred,isLitteral,literalDataType);
                 }
                 else
                 {
                   var tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
                   linksArray.push(tripleValue);
-                  console.log("include 4 source "+tempSub +" predicate- "+tempPred +"  target-" +tempObj);
-                  createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType,this.simulation);
+                  createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType);
                 }
               }
             }

From 3b3ed4778a55d45f4729212018444ee58f4d3ca6 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 2 Jul 2019 12:02:41 +0200
Subject: [PATCH 27/66] fix the Codacy/PR Quality Review  issues

---
 .../d3v4-rdf-ontology-graph-view.js           | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index d0eab0a82..80400a52a 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -62,13 +62,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
     {
       if(elem["rdfs:label"] !== undefined)
       {
-        if(Object.prototype.toString.call(elem["rdfs:label"]) === '[object Array]')
+        if(Object.prototype.toString.call(elem["rdfs:label"]) === "[object Array]")
         {
           elem["rdfs:label"].forEach(function(eachIds)
           {  
             if(eachIds["@language"] === "de")
             {
-              var tempLabel = {"id":elem["@id"],"language":"de","value":eachIds["@value"]}
+              var tempLabel = {"id":elem["@id"],"language":"de","value":eachIds["@value"]};
               deLabelArray.push(tempLabel);
 
               var tepmNodeContent = {label:eachIds["@value"], contents:elem};
@@ -76,8 +76,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             }
             if(eachIds["@language"] === "en")
             {
-              var tempLabel = {"id":elem["@id"],"language":"en","value":eachIds["@value"]}
-              enLabelArray.push(tempLabel);
+              var tempLabel1 = {"id":elem["@id"],"language":"en","value":eachIds["@value"]};
+              enLabelArray.push(tempLabel1);
 
               var tepmNodeContent = {label:eachIds["@value"], contents:elem};
               nodeContents.push(tepmNodeContent);
@@ -85,9 +85,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
            
             var tempLabelArray = elem["@id"].split('/');
             var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-            var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
+            var tempLabel2 = tempLabelArray1[tempLabelArray1.length -1 ];
 
-            var tepmNodeContent = {label:tempLabel, contents:elem};
+            var tepmNodeContent = {label:tempLabel2, contents:elem};
             nodeContents.push(tepmNodeContent);
             
 
@@ -95,28 +95,28 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
         }
         else
         {
-          if(elem["rdfs:label"]["@language"] == "de")
+          if(elem["rdfs:label"]["@language"] === "de")
           {
-            var tempLabel = {"id":elem["@id"],"language":"de","value":elem["rdfs:label"]["@value"]}
-            deLabelArray.push(tempLabel);
+            var tempLabel3 = {"id":elem["@id"],"language":"de","value":elem["rdfs:label"]["@value"]};
+            deLabelArray.push(tempLabel3);
 
             var tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
             nodeContents.push(tepmNodeContent);
           }
           if(elem["rdfs:label"]["@language"] === "en")
           {
-            var tempLabel = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]};
-            enLabelArray.push(tempLabel);
+            var tempLabel4 = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]};
+            enLabelArray.push(tempLabel4);
 
             var tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
             nodeContents.push(tepmNodeContent);
           }
           
-          var tempLabelArray = elem["@id"].split('/');
+          var tempLabelArray = elem["@id"].split("/");
           var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(":");
-          var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
+          var tempLabel5 = tempLabelArray1[tempLabelArray1.length -1 ];
 
-          var tepmNodeContent = {label:tempLabel, contents:elem};
+          var tepmNodeContent = {label:tempLabel5, contents:elem};
           nodeContents.push(tepmNodeContent);
          }
       }
@@ -124,9 +124,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
       {
         var tempLabelArray = elem["@id"].split("/");
         var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-        var tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
+        var tempLabel6 = tempLabelArray1[tempLabelArray1.length -1 ];
 
-        var tepmNodeContent = {label:tempLabel, contents:elem};
+        var tepmNodeContent = {label:tempLabel6, contents:elem};
         nodeContents.push(tepmNodeContent);
       }
       
@@ -186,7 +186,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
                 linksArray.push(tripleValue);
 
-                createNewNode(tempSub,pred,tempObj,false,'');
+                createNewNode(tempSub,pred,tempObj,false," ");
               }
             }
         }
@@ -217,7 +217,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 tempSub = getLabel(displayDeustch,element["rdfs:domain"]["@id"]);
                 if(tempSub == "noLabel")
                 {
-                  var tempLabelArray = element["rdfs:domain"]["@id"].split('/');
+                  var tempLabelArray = element["rdfs:domain"]["@id"].split("/");
                   var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                   tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
@@ -262,7 +262,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               isLitteral = true;
             }
 
-            if(!tempDomainArray.length  ==0)
+            if(tempDomainArray.length  !==0)
             {
               tempDomainArray.forEach(function(el)
               {

From 15650d8fcae995aa7085a8009049fee0e0c7c205 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Wed, 3 Jul 2019 19:58:05 +0200
Subject: [PATCH 28/66] try resolving merge conflict

---
 ida-chatbot/src/app/app.module.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index b4c9ea014..0d0673135 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -59,8 +59,8 @@ import {RestService} from './service/rest/rest.service';
 import {DatatableDetailComponent} from './components/datatable-detail/datatable-detail.component';
 import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
-import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
+import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
@@ -81,8 +81,9 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     DatatableDetailComponent,
     SsbViewComponent,
     VennViewComponent,
-    DeckglHexViewComponent,
-    RdfOntologyViewComponent
+    RdfOntologyViewComponent,
+    DeckglHexViewComponent
+    
   ],
   imports: [
     BrowserModule,

From 73c6dbbeb3db93a60ab8917b565f775c7f0882f6 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Wed, 3 Jul 2019 20:02:11 +0200
Subject: [PATCH 29/66] try resolving merge conflict ..

---
 ida-chatbot/src/app/app.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 0d0673135..9952ac3ba 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -74,6 +74,7 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     DataViewContainerComponent,
     DatatableViewComponent,
     FdgViewComponent,
+    RdfOntologyViewComponent,
     BargraphViewComponent,
     IntroComponent,
     ClickStopPropagationDirective,
@@ -81,7 +82,6 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     DatatableDetailComponent,
     SsbViewComponent,
     VennViewComponent,
-    RdfOntologyViewComponent,
     DeckglHexViewComponent
     
   ],

From 465abf53859119e0bdc24e8f24895fedb38c0f8c Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Wed, 3 Jul 2019 22:17:02 +0200
Subject: [PATCH 30/66] Update app.module.ts

try resolving merge conflict...
---
 ida-chatbot/src/app/app.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 9952ac3ba..f404865a2 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -83,7 +83,7 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     SsbViewComponent,
     VennViewComponent,
     DeckglHexViewComponent
-    
+     
   ],
   imports: [
     BrowserModule,

From 764359fb21497b46a06b4169c6dd92da7e37a76c Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Wed, 3 Jul 2019 22:19:09 +0200
Subject: [PATCH 31/66] try resolving merge conflict

---
 ida-chatbot/src/app/app.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index f404865a2..702215c89 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -82,7 +82,7 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     DatatableDetailComponent,
     SsbViewComponent,
     VennViewComponent,
-    DeckglHexViewComponent
+    DeckglHexViewComponent,
      
   ],
   imports: [

From 2b92da219500c777d1dbf2ca25d4bd13476c8275 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Wed, 3 Jul 2019 22:20:52 +0200
Subject: [PATCH 32/66] try resolving merge conflict

---
 ida-chatbot/src/app/app.module.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 702215c89..cc2289540 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -83,7 +83,6 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     SsbViewComponent,
     VennViewComponent,
     DeckglHexViewComponent,
-     
   ],
   imports: [
     BrowserModule,

From 04bdeefc02deba6e9231928909844acc827f5d7f Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Thu, 4 Jul 2019 15:49:31 +0200
Subject: [PATCH 33/66] try resolving merge conflict ..

---
 ida-chatbot/src/app/app.module.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index cc2289540..cc5f51586 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -83,6 +83,7 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     SsbViewComponent,
     VennViewComponent,
     DeckglHexViewComponent,
+    
   ],
   imports: [
     BrowserModule,

From 9666b566c77c22a64652ebcdafe8c1c203e0bd43 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Thu, 4 Jul 2019 16:24:08 +0200
Subject: [PATCH 34/66] resolve Codacy/PR Quality Review issues

---
 .../d3v4-rdf-ontology-graph-view.js           | 160 ++++++++++--------
 1 file changed, 87 insertions(+), 73 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 80400a52a..0f06144a4 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -55,6 +55,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
     .force("charge", d3.forceManyBody().strength(-customizeGraphArray.graphCharge)) //Charge strength is here
     .force("center", d3.forceCenter((width / 2), (height / 2)));
   
+  var tempLabel,tepmNodeContent,tempLabelArray,tempLabelArray1;
+  
   d3.json("assets/rdfontology/historian-onlogoly.json", function(error, data) 
   {
     //START :: get english and deutsch labels values into arrays
@@ -68,26 +70,26 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           {  
             if(eachIds["@language"] === "de")
             {
-              var tempLabel = {"id":elem["@id"],"language":"de","value":eachIds["@value"]};
+              tempLabel = {"id":elem["@id"],"language":"de","value":eachIds["@value"]};
               deLabelArray.push(tempLabel);
 
-              var tepmNodeContent = {label:eachIds["@value"], contents:elem};
+              tepmNodeContent = {label:eachIds["@value"], contents:elem};
               nodeContents.push(tepmNodeContent);
             }
             if(eachIds["@language"] === "en")
             {
-              var tempLabel1 = {"id":elem["@id"],"language":"en","value":eachIds["@value"]};
-              enLabelArray.push(tempLabel1);
+              tempLabel = {"id":elem["@id"],"language":"en","value":eachIds["@value"]};
+              enLabelArray.push(tempLabel);
 
-              var tepmNodeContent = {label:eachIds["@value"], contents:elem};
+              tepmNodeContent = {label:eachIds["@value"], contents:elem};
               nodeContents.push(tepmNodeContent);
             }
            
-            var tempLabelArray = elem["@id"].split('/');
-            var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-            var tempLabel2 = tempLabelArray1[tempLabelArray1.length -1 ];
+            tempLabelArray = elem["@id"].split('/');
+            tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+            tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
 
-            var tepmNodeContent = {label:tempLabel2, contents:elem};
+            tepmNodeContent = {label:tempLabel, contents:elem};
             nodeContents.push(tepmNodeContent);
             
 
@@ -97,36 +99,36 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
         {
           if(elem["rdfs:label"]["@language"] === "de")
           {
-            var tempLabel3 = {"id":elem["@id"],"language":"de","value":elem["rdfs:label"]["@value"]};
-            deLabelArray.push(tempLabel3);
+            tempLabel = {"id":elem["@id"],"language":"de","value":elem["rdfs:label"]["@value"]};
+            deLabelArray.push(tempLabel);
 
-            var tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
+            tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
             nodeContents.push(tepmNodeContent);
           }
           if(elem["rdfs:label"]["@language"] === "en")
           {
-            var tempLabel4 = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]};
-            enLabelArray.push(tempLabel4);
+            tempLabel = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]};
+            enLabelArray.push(tempLabel);
 
-            var tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
+            tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
             nodeContents.push(tepmNodeContent);
           }
           
-          var tempLabelArray = elem["@id"].split("/");
-          var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(":");
-          var tempLabel5 = tempLabelArray1[tempLabelArray1.length -1 ];
+          tempLabelArray = elem["@id"].split("/");
+          tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(":");
+          tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
 
-          var tepmNodeContent = {label:tempLabel5, contents:elem};
+          tepmNodeContent = {label:tempLabel, contents:elem};
           nodeContents.push(tepmNodeContent);
          }
       }
       else
       {
-        var tempLabelArray = elem["@id"].split("/");
-        var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-        var tempLabel6 = tempLabelArray1[tempLabelArray1.length -1 ];
+        tempLabelArray = elem["@id"].split("/");
+        tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+        tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
 
-        var tepmNodeContent = {label:tempLabel6, contents:elem};
+        tepmNodeContent = {label:tempLabel, contents:elem};
         nodeContents.push(tepmNodeContent);
       }
       
@@ -136,13 +138,20 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
     //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
     var literalIndex = 0;
     var circleIdIndex = 0;
+    var tempSub ="?";
+    var tempPred ="?";
+    var tempObj ="?";
+    var pred="---subClassOf---";
+    var tempDomainArray = [];
+    var tripleValue,isLitteral,literalDataType;
+
     data["@graph"].forEach(function(element) 
     {
-        var tempSub ="?";
-        var tempPred ="?";
-        var tempObj ="?";
-        var pred="---subClassOf---";
-        var tempDomainArray = [];
+        tempSub ="?";
+        tempPred ="?";
+        tempObj ="?";
+        pred="---subClassOf---";
+        tempDomainArray = [];
         //START :: Nodes and Links creation for subClassOf
         if(displaySubclasses)
         {
@@ -151,8 +160,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               tempSub = getLabel(displayDeustch,element["@id"]);
               if(tempSub == "noLabel")
               {
-                var tempLabelArray = element["@id"].split('/');
-                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                tempLabelArray = element["@id"].split('/');
+                tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                 tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
               }
 
@@ -163,12 +172,12 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                   tempObj = getLabel(displayDeustch,eachIds["@id"]);
                   if(tempObj == "noLabel")
                   {
-                    var tempLabelArray = eachIds["@id"].split('/');
-                    var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                    tempLabelArray = eachIds["@id"].split('/');
+                    tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                     tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                   }
 
-                  var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
+                  tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
                   linksArray.push(tripleValue);
                   
                   createNewNode(tempSub,pred,tempObj,false,'');
@@ -179,11 +188,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 tempObj = getLabel(displayDeustch,element["rdfs:subClassOf"]["@id"]);
                 if(tempObj == "noLabel")
                 {
-                  var tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
-                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
+                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                   tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
-                var tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
+                tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
                 linksArray.push(tripleValue);
 
                 createNewNode(tempSub,pred,tempObj,false," ");
@@ -202,11 +211,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 element["rdfs:domain"].forEach(function(eachIds)
                 {
-                  var tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
+                  tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
                   if(tempDomainLabel == "noLabel")
                   {
-                    var tempLabelArray = eachIds["@id"].split('/');
-                    var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                    tempLabelArray = eachIds["@id"].split('/');
+                    tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                     tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
                   }
                   tempDomainArray.push(tempDomainLabel);
@@ -217,8 +226,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 tempSub = getLabel(displayDeustch,element["rdfs:domain"]["@id"]);
                 if(tempSub == "noLabel")
                 {
-                  var tempLabelArray = element["rdfs:domain"]["@id"].split("/");
-                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempLabelArray = element["rdfs:domain"]["@id"].split("/");
+                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                   tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
               }
@@ -230,8 +239,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               tempPred = getLabel(displayDeustch,element["@id"]);
               if(tempPred == "noLabel")
               {
-                var tempLabelArray = element["@id"].split('/');
-                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                tempLabelArray = element["@id"].split('/');
+                tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                 tempPred = tempLabelArray1[tempLabelArray1.length -1 ];
               }
             }
@@ -245,15 +254,15 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
                 if(tempObj == "noLabel")
                 {
-                  var tempLabelArray = element["rdfs:range"]["@id"].split('/');
-                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempLabelArray = element["rdfs:range"]["@id"].split('/');
+                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                   tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
               }  
             }
             
-            var isLitteral = false;
-            var literalDataType = tempObj;
+            isLitteral = false;
+            literalDataType = tempObj;
 
             if(tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean")|| tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime"))
             {
@@ -270,13 +279,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   if(isLitteral)
                   {
-                    var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                    tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
                     linksArray.push(tripleValue);
                     createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element);
                   }
                   else
                   {
-                    var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                    tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
                     linksArray.push(tripleValue);
                     createNewNode(el,tempPred,tempObj,isLitteral,literalDataType);
                   }
@@ -289,13 +298,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 if(isLitteral)
                 {
-                  var tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
+                  tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
                   linksArray.push(tripleValue);
                   createNewNode(tempSub,'',tempPred,isLitteral,literalDataType);
                 }
                 else
                 {
-                  var tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
+                  tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
                   linksArray.push(tripleValue);
                   createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType);
                 }
@@ -423,17 +432,22 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
           .attr('r',resourceRadius+4)
           .style("fill",customizeGraphArray.onClickNodeColor)
         
-          
+        var tempSub ="?";
+        var tempPred ="?";
+        var tempObj ="?";
+        var pred="---subClassOf---";
+        var tempDomainArray = [];
+        var includeThis,tempDomainLabel,tempLabelArray,tempLabelArray1,isLitteral,literalDataType,tripleValue;
         
         data["@graph"].forEach(function(element) 
         {
-          var tempSub ="?";
-          var tempPred ="?";
-          var tempObj ="?";
-          var pred="---subClassOf---";
-          var tempDomainArray = [];
+          tempSub ="?";
+          tempPred ="?";
+          tempObj ="?";
+          pred="---subClassOf---";
+          tempDomainArray = [];
           
-          var includeThis = false;
+          includeThis = false;
           //START :: Nodes and Links creation for all Properties
           //get the subject label  
           if(element["rdfs:domain"]!=undefined)
@@ -442,11 +456,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
             {
               element["rdfs:domain"].forEach(function(eachIds)
               {
-                var tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
+                tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
                 if(tempDomainLabel == "noLabel")
                 {
-                  var tempLabelArray = eachIds["@id"].split('/');
-                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempLabelArray = eachIds["@id"].split('/');
+                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                   tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
                 
@@ -463,8 +477,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               tempSub = getLabel(displayDeustch,element["rdfs:domain"]["@id"]);
               if(tempSub == "noLabel")
               {
-                var tempLabelArray = element["rdfs:domain"]["@id"].split('/');
-                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                tempLabelArray = element["rdfs:domain"]["@id"].split('/');
+                tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                 tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
               }
 
@@ -483,8 +497,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               tempPred = getLabel(displayDeustch,element["@id"]);
               if(tempPred == "noLabel")
               {
-                var tempLabelArray = element["@id"].split('/');
-                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                tempLabelArray = element["@id"].split('/');
+                tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                 tempPred = tempLabelArray1[tempLabelArray1.length -1 ];
               }
             }
@@ -497,15 +511,15 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
                 if(tempObj === "noLabel")
                 {
-                  var tempLabelArray = element["rdfs:range"]["@id"].split('/');
-                  var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
+                  tempLabelArray = element["rdfs:range"]["@id"].split('/');
+                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
                   tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
                 }
               }  
             }
             
-            var isLitteral = false;
-            var literalDataType = tempObj;
+            isLitteral = false;
+            literalDataType = tempObj;
 
             if(tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean")|| tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime"))
             {
@@ -522,13 +536,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
                 {
                   if(isLitteral)
                   {
-                    var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                    tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
                     linksArray.push(tripleValue);
                     createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element);
                   }
                   else
                   {
-                    var tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
+                    tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
                     linksArray.push(tripleValue);
                     createNewNode(el,tempPred,tempObj,isLitteral,literalDataType);
                   }
@@ -541,13 +555,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
               {
                 if(isLitteral)
                 {
-                  var tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
+                  tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
                   linksArray.push(tripleValue);
                   createNewNode(tempSub,'',tempPred,isLitteral,literalDataType);
                 }
                 else
                 {
-                  var tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
+                  tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
                   linksArray.push(tripleValue);
                   createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType);
                 }

From fca10567cbf7196f4bbfc16583362cdfec62d4f9 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Thu, 4 Jul 2019 16:42:46 +0200
Subject: [PATCH 35/66] resolve Codacy/PR Quality Review issues

---
 ida-chatbot/src/app/app.module.ts             |    6 +-
 .../d3v4-rdf-ontology-graph-view.js           | 1936 +++++++++--------
 2 files changed, 974 insertions(+), 968 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 6436d8b59..1f43aecfc 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -62,7 +62,7 @@ import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { SpeechInputComponent } from './components/speech-input/speech-input.component';
-import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 @NgModule({
   declarations: [
     AppComponent,
@@ -124,8 +124,8 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule,
-    NgbModule
+    FlexLayoutModule//,
+    //NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 0f06144a4..90cb28248 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -1,5 +1,5 @@
-function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displaySubclasses,
-                                  dispalyAllprop,applyNodesBoundary,disableZoom,idsArray,customizeGraphArray) {
+function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displaySubclasses,
+  dispalyAllprop, applyNodesBoundary, disableZoom, idsArray, customizeGraphArray) {
   var linksArray = [];
   var nodesArray = [];
   var enLabelArray = [];
@@ -7,1047 +7,1053 @@ function createV4RDFOntologyGraph(figId, svgId, fileName,displayDeustch,displayS
   var expandedNodesArray = [];
   var nodeContents = [];
 
-  var width = 1025,height = 1100,resourceRadius = customizeGraphArray.resourceRadius,literalRadius = customizeGraphArray.literalRadius;
+  var width = 1025,
+      height = 1100,
+      resourceRadius = customizeGraphArray.resourceRadius,
+      literalRadius = customizeGraphArray.literalRadius;
 
-  var g,link,linkTexts,node,circles,lables;
-  var svgClear = d3.select("#"+svgId);
-  svgClear.selectAll("*").remove(); 
+  var g, link, linkTexts, node, circles, lables;
+  var svgClear = d3.select("#" + svgId);
+  svgClear.selectAll("*").remove();
+
+  var svg = d3.select("#" + svgId)
+      .append("svg")
+      .attr("width", width)
+      .attr("height", height);
 
-  var svg = d3.select("#"+svgId)
-    .append("svg")
-    .attr("width", width)
-    .attr("height", height);
- 
   svg.append("svg:defs").selectAll("marker")
-  .data(["normal"])
-  .enter().append("svg:marker")
-  .attr("id", String)
-  .attr("viewBox", "0 -4 10 10")
-  .attr("refX", 30) 
-  .attr("refY", -0.5)
-  .attr("markerWidth", 26)
-  .attr("markerHeight", 6)
-  .attr("orient", "auto")
-  .append("svg:polyline")
-  .style("fill","black")
-  .attr("points", "0,-4 20,0 0,5")
-  ;
+      .data(["normal"])
+      .enter().append("svg:marker")
+      .attr("id", String)
+      .attr("viewBox", "0 -4 10 10")
+      .attr("refX", 30)
+      .attr("refY", -0.5)
+      .attr("markerWidth", 26)
+      .attr("markerHeight", 6)
+      .attr("orient", "auto")
+      .append("svg:polyline")
+      .style("fill", "black")
+      .attr("points", "0,-4 20,0 0,5");
   svg.append("svg:defs").selectAll("marker")
-  .data(["subclass"])
-  .enter().append("svg:marker")
-  .attr("id", String)
-  .attr("viewBox", "0 -4 10 10")
-  .attr("refX", 30) 
-  .attr("refY", -0.5)
-  .attr("markerWidth", 26)
-  .attr("markerHeight", 6)
-  .attr("orient", "auto")
-  .append("svg:polyline")
-  .style("fill", "grey")
-  .attr("points", "0,-4 20,0 0,5")
-  ;
-  
+      .data(["subclass"])
+      .enter().append("svg:marker")
+      .attr("id", String)
+      .attr("viewBox", "0 -4 10 10")
+      .attr("refX", 30)
+      .attr("refY", -0.5)
+      .attr("markerWidth", 26)
+      .attr("markerHeight", 6)
+      .attr("orient", "auto")
+      .append("svg:polyline")
+      .style("fill", "grey")
+      .attr("points", "0,-4 20,0 0,5");
+
 
   var color = d3.scaleOrdinal(d3.schemeCategory20);
 
   var simulation = d3.forceSimulation()
-    .force("link", d3.forceLink().id(function(d) { return d.id; }).distance(customizeGraphArray.edgeSize))
-    .force("charge", d3.forceManyBody().strength(-customizeGraphArray.graphCharge)) //Charge strength is here
-    .force("center", d3.forceCenter((width / 2), (height / 2)));
-  
-  var tempLabel,tepmNodeContent,tempLabelArray,tempLabelArray1;
-  
-  d3.json("assets/rdfontology/historian-onlogoly.json", function(error, data) 
-  {
-    //START :: get english and deutsch labels values into arrays
-    data["@graph"].forEach(function(elem) 
-    {
-      if(elem["rdfs:label"] !== undefined)
-      {
-        if(Object.prototype.toString.call(elem["rdfs:label"]) === "[object Array]")
-        {
-          elem["rdfs:label"].forEach(function(eachIds)
-          {  
-            if(eachIds["@language"] === "de")
-            {
-              tempLabel = {"id":elem["@id"],"language":"de","value":eachIds["@value"]};
-              deLabelArray.push(tempLabel);
-
-              tepmNodeContent = {label:eachIds["@value"], contents:elem};
-              nodeContents.push(tepmNodeContent);
-            }
-            if(eachIds["@language"] === "en")
-            {
-              tempLabel = {"id":elem["@id"],"language":"en","value":eachIds["@value"]};
-              enLabelArray.push(tempLabel);
+      .force("link", d3.forceLink().id(function(d) {
+          return d.id;
+      }).distance(customizeGraphArray.edgeSize))
+      .force("charge", d3.forceManyBody().strength(-customizeGraphArray.graphCharge)) //Charge strength is here
+      .force("center", d3.forceCenter((width / 2), (height / 2)));
+
+  var tempLabel, tepmNodeContent, tempLabelArray, tempLabelArray1;
+
+  d3.json("assets/rdfontology/historian-onlogoly.json", function(error, data) {
+      //START :: get english and deutsch labels values into arrays
+      data["@graph"].forEach(function(elem) {
+          if (elem["rdfs:label"] !== undefined) {
+              if (Object.prototype.toString.call(elem["rdfs:label"]) === "[object Array]") {
+                  elem["rdfs:label"].forEach(function(eachIds) {
+                      if (eachIds["@language"] === "de") {
+                          tempLabel = {
+                              "id": elem["@id"],
+                              "language": "de",
+                              "value": eachIds["@value"]
+                          };
+                          deLabelArray.push(tempLabel);
+
+                          tepmNodeContent = {
+                              label: eachIds["@value"],
+                              contents: elem
+                          };
+                          nodeContents.push(tepmNodeContent);
+                      }
+                      if (eachIds["@language"] === "en") {
+                          tempLabel = {
+                              "id": elem["@id"],
+                              "language": "en",
+                              "value": eachIds["@value"]
+                          };
+                          enLabelArray.push(tempLabel);
+
+                          tepmNodeContent = {
+                              label: eachIds["@value"],
+                              contents: elem
+                          };
+                          nodeContents.push(tepmNodeContent);
+                      }
+
+                      tempLabelArray = elem["@id"].split("/");
+                      tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                      tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
+
+                      tepmNodeContent = {
+                          label: tempLabel,
+                          contents: elem
+                      };
+                      nodeContents.push(tepmNodeContent);
+
+
+                  });
+              } else {
+                  if (elem["rdfs:label"]["@language"] === "de") {
+                      tempLabel = {
+                          "id": elem["@id"],
+                          "language": "de",
+                          "value": elem["rdfs:label"]["@value"]
+                      };
+                      deLabelArray.push(tempLabel);
+
+                      tepmNodeContent = {
+                          label: elem["rdfs:label"]["@value"],
+                          contents: elem
+                      };
+                      nodeContents.push(tepmNodeContent);
+                  }
+                  if (elem["rdfs:label"]["@language"] === "en") {
+                      tempLabel = {
+                          "id": elem["@id"],
+                          "language": "en",
+                          "value": elem["rdfs:label"]["@value"]
+                      };
+                      enLabelArray.push(tempLabel);
+
+                      tepmNodeContent = {
+                          label: elem["rdfs:label"]["@value"],
+                          contents: elem
+                      };
+                      nodeContents.push(tepmNodeContent);
+                  }
 
-              tepmNodeContent = {label:eachIds["@value"], contents:elem};
+                  tempLabelArray = elem["@id"].split("/");
+                  tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                  tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
+
+                  tepmNodeContent = {
+                      label: tempLabel,
+                      contents: elem
+                  };
+                  nodeContents.push(tepmNodeContent);
+              }
+          } else {
+              tempLabelArray = elem["@id"].split("/");
+              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+              tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
+
+              tepmNodeContent = {
+                  label: tempLabel,
+                  contents: elem
+              };
               nodeContents.push(tepmNodeContent);
-            }
-           
-            tempLabelArray = elem["@id"].split('/');
-            tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-            tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
+          }
+ 
+      });
+      //END :: get english and deutch labels values into arrays
+
+      //returning label value
+      function getLabel(displayDeustch, id) {
+          var returnVaule = "noLabel"
+          if (!displayDeustch) {
+              enLabelArray.forEach(function(elem) {
+                  if (elem["id"] === id) {
+                      returnVaule = elem["value"];
+                  }
+              });
+          } else if (displayDeustch) {
+              deLabelArray.forEach(function(elem) {
+                  if (elem["id"] === id) {
+                      returnVaule = elem["value"];
+                  }
+              });
+          }
+          return returnVaule;
+      }
 
-            tepmNodeContent = {label:tempLabel, contents:elem};
-            nodeContents.push(tepmNodeContent);
-            
 
-          });
+    //crating node function
+    function createNewNode(tempSub, tempPred, tempObj, isLitteralVal, literalDataTypeVal) {
+        //START :: Node creation
+        var subNodeAdded = false;
+        var objNodeAdded = false;
+
+        if (nodesArray != undefined) {
+            nodesArray.forEach(function(elem) {
+                if (elem["id"] === tempSub) {
+                    subNodeAdded = true;
+                }
+                if (elem["id"] === tempObj) {
+                    objNodeAdded = true;
+                }
+            });
         }
-        else
-        {
-          if(elem["rdfs:label"]["@language"] === "de")
-          {
-            tempLabel = {"id":elem["@id"],"language":"de","value":elem["rdfs:label"]["@value"]};
-            deLabelArray.push(tempLabel);
-
-            tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
-            nodeContents.push(tepmNodeContent);
-          }
-          if(elem["rdfs:label"]["@language"] === "en")
-          {
-            tempLabel = {"id":elem["@id"],"language":"en","value":elem["rdfs:label"]["@value"]};
-            enLabelArray.push(tempLabel);
 
-            tepmNodeContent = {label:elem["rdfs:label"]["@value"], contents:elem};
-            nodeContents.push(tepmNodeContent);
-          }
-          
-          tempLabelArray = elem["@id"].split("/");
-          tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(":");
-          tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
-
-          tepmNodeContent = {label:tempLabel, contents:elem};
-          nodeContents.push(tepmNodeContent);
-         }
-      }
-      else
-      {
-        tempLabelArray = elem["@id"].split("/");
-        tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-        tempLabel = tempLabelArray1[tempLabelArray1.length -1 ];
-
-        tepmNodeContent = {label:tempLabel, contents:elem};
-        nodeContents.push(tepmNodeContent);
-      }
-      
-    });
-    //END :: get english and deutch labels values into arrays
-
-    //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
-    var literalIndex = 0;
-    var circleIdIndex = 0;
-    var tempSub ="?";
-    var tempPred ="?";
-    var tempObj ="?";
-    var pred="---subClassOf---";
-    var tempDomainArray = [];
-    var tripleValue,isLitteral,literalDataType;
-
-    data["@graph"].forEach(function(element) 
-    {
-        tempSub ="?";
-        tempPred ="?";
-        tempObj ="?";
-        pred="---subClassOf---";
-        tempDomainArray = [];
-        //START :: Nodes and Links creation for subClassOf
-        if(displaySubclasses)
-        {
-            if(element["rdfs:subClassOf"] !== undefined)
-            {
-              tempSub = getLabel(displayDeustch,element["@id"]);
-              if(tempSub == "noLabel")
-              {
-                tempLabelArray = element["@id"].split('/');
-                tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
-              }
+        if (subNodeAdded === false) {
+            circleIdIndex = circleIdIndex + 1;
+            var nodeValue = {
+                id: tempSub,
+                predicate: tempPred,
+                nodeId: "circleId" + circleIdIndex,
+                isLitteral: false,
+                literalDataType: literalDataTypeVal,
+                group: 1
+            };
+            nodesArray.push(nodeValue);
+        }
+        if (objNodeAdded === false) {
+            circleIdIndex = circleIdIndex + 1;
+            var nodeValue = {
+                id: tempObj,
+                predicate: tempPred,
+                nodeId: "circleId" + circleIdIndex,
+                isLitteral: isLitteralVal,
+                literalDataType: literalDataTypeVal,
+                group: 1
+            };
+            nodesArray.push(nodeValue);
+        }
+        //END :: Node creation
+    }
 
-              if(Object.prototype.toString.call(element["rdfs:subClassOf"]) === "[object Array]")
-              {
-                element["rdfs:subClassOf"].forEach(function(eachIds)
-                {  
-                  tempObj = getLabel(displayDeustch,eachIds["@id"]);
-                  if(tempObj == "noLabel")
-                  {
-                    tempLabelArray = eachIds["@id"].split('/');
-                    tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                    tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
+      //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
+      var literalIndex = 0;
+      var circleIdIndex = 0;
+      var tempSub = "?";
+      var tempPred = "?";
+      var tempObj = "?";
+      var pred = "---subClassOf---";
+      var tempDomainArray = [];
+      var tripleValue, isLitteral, literalDataType;
+
+      data["@graph"].forEach(function(element) {
+          tempSub = "?";
+          tempPred = "?";
+          tempObj = "?";
+          pred = "---subClassOf---";
+          tempDomainArray = [];
+          //START :: Nodes and Links creation for subClassOf
+          if (displaySubclasses) {
+              if (element["rdfs:subClassOf"] !== undefined) {
+                  tempSub = getLabel(displayDeustch, element["@id"]);
+                  if (tempSub == "noLabel") {
+                      tempLabelArray = element["@id"].split("/");
+                      tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                      tempSub = tempLabelArray1[tempLabelArray1.length - 1];
                   }
 
-                  tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
-                  linksArray.push(tripleValue);
-                  
-                  createNewNode(tempSub,pred,tempObj,false,'');
-                });
+                  if (Object.prototype.toString.call(element["rdfs:subClassOf"]) === "[object Array]") {
+                      element["rdfs:subClassOf"].forEach(function(eachIds) {
+                          tempObj = getLabel(displayDeustch, eachIds["@id"]);
+                          if (tempObj == "noLabel") {
+                              tempLabelArray = eachIds["@id"].split("/");
+                              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                              tempObj = tempLabelArray1[tempLabelArray1.length - 1];
+                          }
+
+                          tripleValue = {
+                              source: tempSub,
+                              predicate: pred,
+                              target: tempObj,
+                              value: 1
+                          };
+                          linksArray.push(tripleValue);
+
+                          createNewNode(tempSub, pred, tempObj, false, "");
+                      });
+                  } else {
+                      tempObj = getLabel(displayDeustch, element["rdfs:subClassOf"]["@id"]);
+                      if (tempObj == "noLabel") {
+                          tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
+                          tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                          tempObj = tempLabelArray1[tempLabelArray1.length - 1];
+                      }
+                      tripleValue = {
+                          source: tempSub,
+                          predicate: pred,
+                          target: tempObj,
+                          value: 1
+                      };
+                      linksArray.push(tripleValue);
+
+                      createNewNode(tempSub, pred, tempObj, false, " ");
+                  }
               }
-              else
-              {
-                tempObj = getLabel(displayDeustch,element["rdfs:subClassOf"]["@id"]);
-                if(tempObj == "noLabel")
-                {
-                  tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
-                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
-                }
-                tripleValue = {source:tempSub, 	predicate:pred, 	target:tempObj,value: 1};
-                linksArray.push(tripleValue);
+          }
+          //END :: Nodes and Links creation for subClassOf
 
-                createNewNode(tempSub,pred,tempObj,false," ");
+          //START :: Nodes and Links creation for all Properties
+          if (dispalyAllprop) {
+              //get the subject label  
+              if (element["rdfs:domain"] != undefined) {
+                  if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
+                      element["rdfs:domain"].forEach(function(eachIds) {
+                          tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
+                          if (tempDomainLabel == "noLabel") {
+                              tempLabelArray = eachIds["@id"].split("/");
+                              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                              tempDomainLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                          }
+                          tempDomainArray.push(tempDomainLabel);
+                      });
+                  } else {
+                      tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
+                      if (tempSub == "noLabel") {
+                          tempLabelArray = element["rdfs:domain"]["@id"].split("/");
+                          tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                          tempSub = tempLabelArray1[tempLabelArray1.length - 1];
+                      }
+                  }
               }
-            }
-        }
-        //END :: Nodes and Links creation for subClassOf
-
-        //START :: Nodes and Links creation for all Properties
-        if(dispalyAllprop)
-        {
-            //get the subject label  
-            if(element["rdfs:domain"]!=undefined)
-            {
-              if(Object.prototype.toString.call(element["rdfs:domain"]) === '[object Array]')
-              {
-                element["rdfs:domain"].forEach(function(eachIds)
-                {
-                  tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
-                  if(tempDomainLabel == "noLabel")
-                  {
-                    tempLabelArray = eachIds["@id"].split('/');
-                    tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                    tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
+
+              //get the predicate
+              if (element["rdfs:domain"] != undefined) {
+                  tempPred = getLabel(displayDeustch, element["@id"]);
+                  if (tempPred == "noLabel") {
+                      tempLabelArray = element["@id"].split("/");
+                      tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                      tempPred = tempLabelArray1[tempLabelArray1.length - 1];
                   }
-                  tempDomainArray.push(tempDomainLabel);
-                });
               }
-              else
-              {
-                tempSub = getLabel(displayDeustch,element["rdfs:domain"]["@id"]);
-                if(tempSub == "noLabel")
-                {
-                  tempLabelArray = element["rdfs:domain"]["@id"].split("/");
-                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
-                }
+
+
+              //get the object  range
+              if (element["rdfs:range"] != undefined) {
+                  if ("@id" in element["rdfs:range"]) {
+                      tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
+                      if (tempObj == "noLabel") {
+                          tempLabelArray = element["rdfs:range"]["@id"].split("/");
+                          tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                          tempObj = tempLabelArray1[tempLabelArray1.length - 1];
+                      }
+                  }
               }
-            }
-
-            //get the predicate
-            if(element["rdfs:domain"]!=undefined)
-            {
-              tempPred = getLabel(displayDeustch,element["@id"]);
-              if(tempPred == "noLabel")
-              {
-                tempLabelArray = element["@id"].split('/');
-                tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                tempPred = tempLabelArray1[tempLabelArray1.length -1 ];
+
+              isLitteral = false;
+              literalDataType = tempObj;
+
+              if (tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean") || tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime")) {
+                  tempObj = tempObj + literalIndex;
+                  literalIndex = literalIndex + 1;
+                  isLitteral = true;
               }
-            }
-
-
-            //get the object  range
-            if(element["rdfs:range"]!=undefined)
-            {
-              if ("@id" in element["rdfs:range"])
-              {
-                tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
-                if(tempObj == "noLabel")
-                {
-                  tempLabelArray = element["rdfs:range"]["@id"].split('/');
-                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
-                }
-              }  
-            }
-            
-            isLitteral = false;
-            literalDataType = tempObj;
-
-            if(tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean")|| tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime"))
-            {
-              tempObj = tempObj + literalIndex;
-              literalIndex = literalIndex + 1 ;
-              isLitteral = true;
-            }
-
-            if(tempDomainArray.length  !==0)
-            {
-              tempDomainArray.forEach(function(el)
-              {
-                if(el != "?" && tempPred != "?" && tempObj != "?")
-                {
-                  if(isLitteral)
-                  {
-                    tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
-                    linksArray.push(tripleValue);
-                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element);
-                  }
-                  else
-                  {
-                    tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
-                    linksArray.push(tripleValue);
-                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType);
+
+              if (tempDomainArray.length !== 0) {
+                  tempDomainArray.forEach(function(el) {
+                      if (el != "?" && tempPred != "?" && tempObj != "?") {
+                          if (isLitteral) {
+                              tripleValue = {
+                                  source: el,
+                                  predicate: tempPred,
+                                  target: tempObj,
+                                  value: 1
+                              };
+                              linksArray.push(tripleValue);
+                              createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
+                          } else {
+                              tripleValue = {
+                                  source: el,
+                                  predicate: tempPred,
+                                  target: tempObj,
+                                  value: 1
+                              };
+                              linksArray.push(tripleValue);
+                              createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
+                          }
+                      }
+                  });
+              } else {
+                  if (tempSub != "?" && tempPred != "?" && tempObj != "?") {
+                      if (isLitteral) {
+                          tripleValue = {
+                              source: tempSub,
+                              predicate: "",
+                              target: tempPred,
+                              value: 1
+                          };
+                          linksArray.push(tripleValue);
+                          createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
+                      } else {
+                          tripleValue = {
+                              source: tempSub,
+                              predicate: tempPred,
+                              target: tempObj,
+                              value: 1
+                          };
+                          linksArray.push(tripleValue);
+                          createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
+                      }
                   }
-                }
-              });
-            }
-            else
-            {
-              if(tempSub != "?" && tempPred != "?" && tempObj != "?")
-              {
-                if(isLitteral)
-                {
-                  tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
-                  linksArray.push(tripleValue);
-                  createNewNode(tempSub,'',tempPred,isLitteral,literalDataType);
-                }
-                else
-                {
-                  tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
-                  linksArray.push(tripleValue);
-                  createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType);
-                }
               }
-            }
-        }
-        //END :: Nodes and Links creation for all Properties
+          }
+          //END :: Nodes and Links creation for all Properties
       });
       //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
       if (error) {
-          return console.warn('Error in createV3RDFOntologyGraphView() method :'+error);
+          return console.warn("Error in createV3RDFOntologyGraphView() method :" + error);
       }
-      
 
-    
-
-    function ticked()
-    {
-      lables
-          .attr("x2", function(d){ return d.x-width; })
-          .attr("y2", function (d) {return d.y -height; })
-      ;
-      link
-          .attr("x1", function(d) { return d.source.x; })
-          .attr("y1", function(d) { return d.source.y; })
-          .attr("x2", function(d) { return d.target.x; })
-          .attr("y2", function(d) { return d.target.y; })
-      ;
-      linkTexts
-          .attr("x", function(d) { 
-            return 4 + (d.source.x + d.target.x)/2  ; })
-          .attr("y", function(d) { 
-            return 4 + (d.source.y + d.target.y)/2 ; })
-      ;
-      node
-        .attr("transform", function(d) {
-            return "translate(" + d.x + "," + d.y + ")";
-           })
-      ;
-      if(applyNodesBoundary)
-      {
-        node
-        .attr("cx", function(d) { return d.x = Math.max(Math.max(resourceRadius,literalRadius), Math.min(width - Math.max(resourceRadius,literalRadius), d.x)); })
-        .attr("cy", function(d) { return d.y = Math.max(Math.max(resourceRadius,literalRadius), Math.min(height - Math.max(resourceRadius,literalRadius), d.y)); });
-      }
-    }
 
-    update();
-
-    
-    
-    function getLabel(displayDeustch,id)
-    {
-      var returnVaule = "noLabel"
-      if(!displayDeustch)
-      {
-        enLabelArray.forEach(function(elem) 
-        {
-          if(elem["id"] === id)
-          {
-            returnVaule = elem["value"];
-          } 
-        });
-      }
-      else if(displayDeustch)
-      {
-        deLabelArray.forEach(function(elem) 
-        {
-          if(elem["id"] === id)
-          {
-            returnVaule = elem["value"];
-          } 
-        });
-      }
-      return returnVaule;
-    }
 
-    function createNewNode(tempSub,tempPred,tempObj,isLitteralVal,literalDataTypeVal)
-    {
-      //START :: Node creation
-      var subNodeAdded = false;  
-      var objNodeAdded = false;
-        
-      if(nodesArray != undefined)
-      {
-        nodesArray.forEach(function(elem) 
-        {
-          if(elem["id"] === tempSub)
-          {
-            subNodeAdded = true;
-          } 
-          if(elem["id"] === tempObj)
-          {
-            objNodeAdded = true;
-          } 
-        });
-      }
-      
-      if(subNodeAdded === false)
-      {
-        circleIdIndex =circleIdIndex+1; 
-        var nodeValue = {id:tempSub ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:false,literalDataType:literalDataTypeVal, group: 1};
-        nodesArray.push(nodeValue);
-      }
-      if(objNodeAdded === false)
-      {
-        circleIdIndex =circleIdIndex+1;
-        var nodeValue = {id:tempObj ,predicate:tempPred,nodeId:"circleId"+circleIdIndex,isLitteral:isLitteralVal,literalDataType:literalDataTypeVal, group: 1};
-        nodesArray.push(nodeValue);
-      }
-      //END :: Node creation
-    }
 
-    function clickFunctionality(d)
-    {  
-      var idVal =  "#"+d.nodeId;
-      var clickedNodeLabel =  d.id;
-      if(expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal))
-      {
-        expandedNodesArray.push(idVal);
-
-
-        d3.select(idVal)
-          .attr('r',resourceRadius+4)
-          .style("fill",customizeGraphArray.onClickNodeColor)
-        
-        var tempSub ="?";
-        var tempPred ="?";
-        var tempObj ="?";
-        var pred="---subClassOf---";
-        var tempDomainArray = [];
-        var includeThis,tempDomainLabel,tempLabelArray,tempLabelArray1,isLitteral,literalDataType,tripleValue;
-        
-        data["@graph"].forEach(function(element) 
-        {
-          tempSub ="?";
-          tempPred ="?";
-          tempObj ="?";
-          pred="---subClassOf---";
-          tempDomainArray = [];
-          
-          includeThis = false;
-          //START :: Nodes and Links creation for all Properties
-          //get the subject label  
-          if(element["rdfs:domain"]!=undefined)
-          {
-            if(Object.prototype.toString.call(element["rdfs:domain"]) === '[object Array]')
-            {
-              element["rdfs:domain"].forEach(function(eachIds)
-              {
-                tempDomainLabel = getLabel(displayDeustch,eachIds["@id"]);
-                if(tempDomainLabel == "noLabel")
-                {
-                  tempLabelArray = eachIds["@id"].split('/');
-                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempDomainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
-                }
-                
-                if(clickedNodeLabel === tempDomainLabel)
-                {
-                  includeThis = true;
-                  tempDomainArray.push(tempDomainLabel);
-                }
-                
+      function ticked() {
+          lables
+              .attr("x2", function(d) {
+                  return d.x - width;
+              })
+              .attr("y2", function(d) {
+                  return d.y - height;
               });
-            }
-            else
-            {
-              tempSub = getLabel(displayDeustch,element["rdfs:domain"]["@id"]);
-              if(tempSub == "noLabel")
-              {
-                tempLabelArray = element["rdfs:domain"]["@id"].split('/');
-                tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                tempSub = tempLabelArray1[tempLabelArray1.length -1 ];
-              }
-
-              if(clickedNodeLabel === tempSub)
-              {
-                includeThis = true;
-              }
-            }
+          link
+              .attr("x1", function(d) {
+                  return d.source.x;
+              })
+              .attr("y1", function(d) {
+                  return d.source.y;
+              })
+              .attr("x2", function(d) {
+                  return d.target.x;
+              })
+              .attr("y2", function(d) {
+                  return d.target.y;
+              });
+          linkTexts
+              .attr("x", function(d) {
+                  return 4 + (d.source.x + d.target.x) / 2;
+              })
+              .attr("y", function(d) {
+                  return 4 + (d.source.y + d.target.y) / 2;
+              });
+          node
+              .attr("transform", function(d) {
+                  return "translate(" + d.x + "," + d.y + ")";
+              });
+          if (applyNodesBoundary) {
+              node
+                  .attr("cx", function(d) {
+                      return d.x = Math.max(Math.max(resourceRadius, literalRadius), Math.min(width - Math.max(resourceRadius, literalRadius), d.x));
+                  })
+                  .attr("cy", function(d) {
+                      return d.y = Math.max(Math.max(resourceRadius, literalRadius), Math.min(height - Math.max(resourceRadius, literalRadius), d.y));
+                  });
           }
-          
-          if(includeThis)
-          {
-            //get the predicate
-            if(element["rdfs:domain"]!=undefined)
-            {
-              tempPred = getLabel(displayDeustch,element["@id"]);
-              if(tempPred == "noLabel")
-              {
-                tempLabelArray = element["@id"].split('/');
-                tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                tempPred = tempLabelArray1[tempLabelArray1.length -1 ];
-              }
-            }
-
-            //get the object  range
-            if(element["rdfs:range"]!=undefined)
-            {
-              if ("@id" in element["rdfs:range"])
-              {
-                tempObj = getLabel(displayDeustch,element["rdfs:range"]["@id"]);
-                if(tempObj === "noLabel")
-                {
-                  tempLabelArray = element["rdfs:range"]["@id"].split('/');
-                  tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                  tempObj = tempLabelArray1[tempLabelArray1.length -1 ];
-                }
-              }  
-            }
-            
-            isLitteral = false;
-            literalDataType = tempObj;
-
-            if(tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean")|| tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime"))
-            {
-              tempObj = tempObj + literalIndex;
-              literalIndex = literalIndex + 1 ;
-              isLitteral = true;
-            }
-
-            if(!tempDomainArray.length  ===0)
-            {
-              tempDomainArray.forEach(function(el)
-              {
-                if(el != "?" && tempPred != "?" && tempObj != "?")
-                {
-                  if(isLitteral)
-                  {
-                    tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
-                    linksArray.push(tripleValue);
-                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType,element);
+      }
+
+      update();
+
+
+      
+
+      function clickFunctionality(d) {
+          var idVal = "#" + d.nodeId;
+          var clickedNodeLabel = d.id;
+          if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
+              expandedNodesArray.push(idVal);
+
+
+              d3.select(idVal)
+                  .attr("r", resourceRadius + 4)
+                  .style("fill", customizeGraphArray.onClickNodeColor)
+
+              var tempSub = "?";
+              var tempPred = "?";
+              var tempObj = "?";
+              var pred = "---subClassOf---";
+              var tempDomainArray = [];
+              var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue;
+
+              data["@graph"].forEach(function(element) {
+                  tempSub = "?";
+                  tempPred = "?";
+                  tempObj = "?";
+                  pred = "---subClassOf---";
+                  tempDomainArray = [];
+
+                  includeThis = false;
+                  //START :: Nodes and Links creation for all Properties
+                  //get the subject label  
+                  if (element["rdfs:domain"] != undefined) {
+                      if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
+                          element["rdfs:domain"].forEach(function(eachIds) {
+                              tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
+                              if (tempDomainLabel == "noLabel") {
+                                  tempLabelArray = eachIds["@id"].split("/");
+                                  tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                                  tempDomainLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                              }
+
+                              if (clickedNodeLabel === tempDomainLabel) {
+                                  includeThis = true;
+                                  tempDomainArray.push(tempDomainLabel);
+                              }
+
+                          });
+                      } else {
+                          tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
+                          if (tempSub == "noLabel") {
+                              tempLabelArray = element["rdfs:domain"]["@id"].split("/");
+                              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                              tempSub = tempLabelArray1[tempLabelArray1.length - 1];
+                          }
+
+                          if (clickedNodeLabel === tempSub) {
+                              includeThis = true;
+                          }
+                      }
                   }
-                  else
-                  {
-                    tripleValue = {source:el, 	predicate:tempPred, 	target:tempObj,value: 1};
-                    linksArray.push(tripleValue);
-                    createNewNode(el,tempPred,tempObj,isLitteral,literalDataType);
+
+                  if (includeThis) {
+                      //get the predicate
+                      if (element["rdfs:domain"] != undefined) {
+                          tempPred = getLabel(displayDeustch, element["@id"]);
+                          if (tempPred == "noLabel") {
+                              tempLabelArray = element["@id"].split("/");
+                              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                              tempPred = tempLabelArray1[tempLabelArray1.length - 1];
+                          }
+                      }
+
+                      //get the object  range
+                      if (element["rdfs:range"] != undefined) {
+                          if ("@id" in element["rdfs:range"]) {
+                              tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
+                              if (tempObj === "noLabel") {
+                                  tempLabelArray = element["rdfs:range"]["@id"].split("/");
+                                  tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                                  tempObj = tempLabelArray1[tempLabelArray1.length - 1];
+                              }
+                          }
+                      }
+
+                      isLitteral = false;
+                      literalDataType = tempObj;
+
+                      if (tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean") || tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime")) {
+                          tempObj = tempObj + literalIndex;
+                          literalIndex = literalIndex + 1;
+                          isLitteral = true;
+                      }
+
+                      if (!tempDomainArray.length === 0) {
+                          tempDomainArray.forEach(function(el) {
+                              if (el != "?" && tempPred != "?" && tempObj != "?") {
+                                  if (isLitteral) {
+                                      tripleValue = {
+                                          source: el,
+                                          predicate: tempPred,
+                                          target: tempObj,
+                                          value: 1
+                                      };
+                                      linksArray.push(tripleValue);
+                                      createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
+                                  } else {
+                                      tripleValue = {
+                                          source: el,
+                                          predicate: tempPred,
+                                          target: tempObj,
+                                          value: 1
+                                      };
+                                      linksArray.push(tripleValue);
+                                      createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
+                                  }
+                              }
+                          });
+                      } else {
+                          if (tempSub != "?" && tempPred != "?" && tempObj != "?") {
+                              if (isLitteral) {
+                                  tripleValue = {
+                                      source: tempSub,
+                                      predicate: " ",
+                                      target: tempPred,
+                                      value: 1
+                                  };
+                                  linksArray.push(tripleValue);
+                                  createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
+                              } else {
+                                  tripleValue = {
+                                      source: tempSub,
+                                      predicate: tempPred,
+                                      target: tempObj,
+                                      value: 1
+                                  };
+                                  linksArray.push(tripleValue);
+                                  createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
+                              }
+                          }
+                      }
                   }
-                }
+                  //END :: Nodes and Links creation for all Properties
               });
-            }
-            else
-            {
-              if(tempSub != "?" && tempPred != "?" && tempObj != "?")
-              {
-                if(isLitteral)
-                {
-                  tripleValue = {source:tempSub, 	predicate:' ', 	target:tempPred,value: 1};
-                  linksArray.push(tripleValue);
-                  createNewNode(tempSub,'',tempPred,isLitteral,literalDataType);
-                }
-                else
-                {
-                  tripleValue = {source:tempSub, 	predicate:tempPred, 	target:tempObj,value: 1};
-                  linksArray.push(tripleValue);
-                  createNewNode(tempSub,tempPred,tempObj,isLitteral,literalDataType);
-                }
-              }
-            }
-          }
-          //END :: Nodes and Links creation for all Properties
-        });
-        
 
-        var allClear = d3.selectAll(".everything");
-        allClear.selectAll("*").remove(); 
 
-        update();
-        simulation.restart(); 
-      }
-      else
-      {
-        d3.select(idVal)
-          .attr('r',resourceRadius)
-          .style("fill",'#311B92')
+              var allClear = d3.selectAll(".everything");
+              allClear.selectAll("*").remove();
+
+              update();
+              simulation.restart();
+          } else {
+              d3.select(idVal)
+                  .attr("r", resourceRadius)
+                  .style("fill", "#311B92")
 
-        expandedNodesArray.pop(idVal);
+              expandedNodesArray.pop(idVal);
+          }
       }
-    }
-    
-    function update() {
-      simulation.restart();
-      simulation
-            .nodes(nodesArray)
-            .on("tick", ticked)
-      ;
-
-      simulation.force("link")
-            .links(linksArray)
-      ;
-
-
-      g = svg.append("g")
-          .attr("class", "everything");
-          
-      link =g.selectAll("line")
-            .attr("class", "links")
-            .data(linksArray)
-            .enter().append("line")
-            .attr("class", "link")
-            .attr("stroke-width",1)
-            .style("fill","#999")
-            .attr("marker-end",function (d) { 
-              var labelStr = d.predicate; 
-              if(labelStr.includes('subClassOf')){return  "url(#subclass)";}
-              return  "url(#normal)"})
-            .style("stroke-dasharray",function (d) { 
-              var labelStr = d.predicate; 
-              if(labelStr.includes('subClassOf')){return  ("3, 3");}
-              if(labelStr.includes('subPropertyOf')){return  ("5, 5");}
-              return  ("0, 0");});
-      ;
-
-      link.exit().remove();
-      // ==================== Add Link Names =====================
-      linkTexts = g.selectAll(".link-text")
+
+      function update() {
+          simulation.restart();
+          simulation
+              .nodes(nodesArray)
+              .on("tick", ticked);
+
+          simulation.force("link")
+              .links(linksArray);
+
+
+          g = svg.append("g")
+              .attr("class", "everything");
+
+          link = g.selectAll("line")
+              .attr("class", "links")
+              .data(linksArray)
+              .enter().append("line")
+              .attr("class", "link")
+              .attr("stroke-width", 1)
+              .style("fill", "#999")
+              .attr("marker-end", function(d) {
+                  var labelStr = d.predicate;
+                  if (labelStr.includes("subClassOf")) {
+                      return "url(#subclass)";
+                  }
+                  return "url(#normal)"
+              })
+              .style("stroke-dasharray", function(d) {
+                  var labelStr = d.predicate;
+                  if (labelStr.includes("subClassOf")) {
+                      return ("3, 3");
+                  }
+                  if (labelStr.includes("subPropertyOf")) {
+                      return ("5, 5");
+                  }
+                  return ("0, 0");
+              });;
+
+          link.exit().remove();
+          // ==================== Add Link Names =====================
+          linkTexts = g.selectAll(".link-text")
               .data(linksArray)
               .enter()
               .append("text")
-                .attr("class", "link-text")
-                .text( function (d) { 
-                  var labelStr = d.predicate; 
-                  if(labelStr.includes('subClassOf'))
-                    {return customizeGraphArray.subClassLabel;}
-                  return d.predicate; }) 
-                  .style("fill",function(d){var labelStr = d.predicate; 
-                    if(labelStr.includes('subClassOf'))
-                    {return customizeGraphArray.subClassLabelColor;}
-                    return customizeGraphArray.propertyTextColor;})
-                  .style("font-size", "80%")
-                  .style("font-style", "italic")
-                  .attr('x', 12)
-                  .attr('y', 3)
-      ;    
-
-      linkTexts.append("title")
-                .text(function(d) { 
-                  var labelStr = d.predicate; 
-                  if(labelStr.includes('subClassOf'))
-                  {
-                      var returnValue = 'Source : '+d.source +'\nProperty : '+customizeGraphArray.subClassLabel+'\nObject : '+d.target;
+              .attr("class", "link-text")
+              .text(function(d) {
+                  var labelStr = d.predicate;
+                  if (labelStr.includes("subClassOf")) {
+                      return customizeGraphArray.subClassLabel;
                   }
-                  else
-                  {
-                    var returnValue = 'Source : '+d.source +'\nProperty : '+d.predicate+'\nObject : '+d.target;
+                  return d.predicate;
+              })
+              .style("fill", function(d) {
+                  var labelStr = d.predicate;
+                  if (labelStr.includes("subClassOf")) {
+                      return customizeGraphArray.subClassLabelColor;
+                  }
+                  return customizeGraphArray.propertyTextColor;
+              })
+              .style("font-size", "80%")
+              .style("font-style", "italic")
+              .attr("x", 12)
+              .attr("y", 3);
+
+          linkTexts.append("title")
+              .text(function(d) {
+                  var labelStr = d.predicate;
+                  if (labelStr.includes("subClassOf")) {
+                      var returnValue = "Source : " + d.source + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target;
+                  } else {
+                      var returnValue = "Source : " + d.source + "\nProperty : " + d.predicate + "\nObject : " + d.target;
                   }
-                  
+
                   return returnValue;
-                });
-      ;        
-      // ==================== Add Link Names =====================
-      
-      node = g.append("g")
-            .attr("class", "nodes")
-          .selectAll("g")
-          .data(nodesArray)
-          .enter().append("g")
-      ;    
-      node.exit().remove();
-      
-      circles = node.append("circle")
-            .attr("id",function(d){return d.nodeId ;})
-            .attr("r",function(d){var labelStr = d.id;
-              if(d.isLitteral)
-              {return literalRadius;}
-              return resourceRadius;})
-            .style("fill",function(d){var labelStr = d.id; 
-              if(d.isLitteral)
-                  {return customizeGraphArray.literalNodeColor;} 
-              return customizeGraphArray.resourceNodeColor;})
-            .call(d3.drag()
-                .on("start", dragstarted)
-                .on("drag", dragged)
-              .on("end", dragended)
-      );
-
-      lables = node.append("text")
-                .attr("class", "node-text")
-                .text(function (d) {return d.id; })
-                .style("font-size", function(d){var labelStr = d.id; 
-                  if(d.isLitteral)
-                  {return "80%";}
-                  return "100%";})
-                .style("font-style", function(d){var labelStr = d.id; 
-                  if(d.isLitteral)
-                  {return "italic";}
-                  return "bold";})
-                .style("fill",function(d){var labelStr = d.id; 
-                  if(d.isLitteral)
-                      {return customizeGraphArray.literalNodeTextColor;}
-                  return customizeGraphArray.resourceNodeTextColor;})
-                .attr('x', function(d){
-                  if(d.isLitteral)
-                      {return 8;}
-                  return 12;})
-                .attr('y', 3) 
-      ;
-
-      node.append("title")
-            .text(function(d) { 
-              var returnValue = 'Node : '+d.id;
-              if(d.isLitteral){returnValue = 'Node : '+d.id +'\nData type : '+d.literalDataType;}
-              else{returnValue = 'Node : '+d.id;}
-              return returnValue; })
-      ;
-
-      //START :: on click
-      node.on("dblclick",clickFunctionality);
-      //END :: on click    
-
-      //START :: on double click
-      node.on("click",doubleClickFuntionality);
-      //END :: on double click
-    
-    
-      if(!disableZoom)
-      {
-        var zoom_handler = d3.zoom()
-          .on("zoom", zoom_actions);
-        //zoom_handler(svg);
-        //Zoom functions 
-        svg.call(zoom_handler).on("dblclick.zoom", null);
-        function zoom_actions(){
-          g.attr("transform", d3.event.transform)
-          
-        }
+              });;
+          // ==================== Add Link Names =====================
+
+          node = g.append("g")
+              .attr("class", "nodes")
+              .selectAll("g")
+              .data(nodesArray)
+              .enter().append("g");
+          node.exit().remove();
+
+          circles = node.append("circle")
+              .attr("id", function(d) {
+                  return d.nodeId;
+              })
+              .attr("r", function(d) {
+                  var labelStr = d.id;
+                  if (d.isLitteral) {
+                      return literalRadius;
+                  }
+                  return resourceRadius;
+              })
+              .style("fill", function(d) {
+                  var labelStr = d.id;
+                  if (d.isLitteral) {
+                      return customizeGraphArray.literalNodeColor;
+                  }
+                  return customizeGraphArray.resourceNodeColor;
+              })
+              .call(d3.drag()
+                  .on("start", dragstarted)
+                  .on("drag", dragged)
+                  .on("end", dragended)
+              );
+
+          lables = node.append("text")
+              .attr("class", "node-text")
+              .text(function(d) {
+                  return d.id;
+              })
+              .style("font-size", function(d) {
+                  var labelStr = d.id;
+                  if (d.isLitteral) {
+                      return "80%";
+                  }
+                  return "100%";
+              })
+              .style("font-style", function(d) {
+                  var labelStr = d.id;
+                  if (d.isLitteral) {
+                      return "italic";
+                  }
+                  return "bold";
+              })
+              .style("fill", function(d) {
+                  var labelStr = d.id;
+                  if (d.isLitteral) {
+                      return customizeGraphArray.literalNodeTextColor;
+                  }
+                  return customizeGraphArray.resourceNodeTextColor;
+              })
+              .attr("x", function(d) {
+                  if (d.isLitteral) {
+                      return 8;
+                  }
+                  return 12;
+              })
+              .attr("y", 3);
+
+          node.append("title")
+              .text(function(d) {
+                  var returnValue = "Node : " + d.id;
+                  if (d.isLitteral) {
+                      returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
+                  } else {
+                      returnValue = "Node : " + d.id;
+                  }
+                  return returnValue;
+              });
+
+          //START :: on click
+          node.on("dblclick", clickFunctionality);
+          //END :: on click    
+
+          //START :: on double click
+          node.on("click", doubleClickFuntionality);
+          //END :: on double click
+
+
+          if (!disableZoom) {
+              var zoom_handler = d3.zoom()
+                  .on("zoom", zoom_actions);
+              //zoom_handler(svg);
+              //Zoom functions 
+              svg.call(zoom_handler).on("dblclick.zoom", null);
+
+              function zoom_actions() {
+                  g.attr("transform", d3.event.transform)
+
+              }
+          }
+
       }
-    
-    }
 
 
-    function doubleClickFuntionality(d)
-    {   
-      var nodeIdVal =  d.id;
-      var tempNodeContains = [];
-      nodeContents.forEach(function(val){
-        if(val.label == nodeIdVal)
-        {
-          tempNodeContains = val.contents
-        }
-      });
+      function doubleClickFuntionality(d) {
+          var nodeIdVal = d.id;
+          var tempNodeContains = [];
+          nodeContents.forEach(function(val) {
+              if (val.label == nodeIdVal) {
+                  tempNodeContains = val.contents
+              }
+          });
 
-      var tempNode = d3.select("#"+idsArray.nodeId)
-      tempNode.selectAll("*").remove(); 
-      tempNode.append("text")
-             .text(" " + nodeIdVal+"\n")
-              .style("font-style","italic")
+          var tempNode = d3.select("#" + idsArray.nodeId)
+          tempNode.selectAll("*").remove();
+          tempNode.append("text")
+              .text(" " + nodeIdVal + "\n")
+              .style("font-style", "italic")
               .style("font-size", "80%")
               .style("position", "relative")
-              .style("bottom", "2px")
-        ;
-
-    
-      //node label on double click
-      if(tempNodeContains != undefined)
-      {
-        var nodeLabel = d3.select("#"+idsArray.nodeLabelId)
-        nodeLabel.selectAll("*").remove();
-        if(tempNodeContains["rdfs:label"] != undefined)
-        { 
-          if(Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === '[object Array]')
-          {
-            tempNodeContains["rdfs:label"].forEach(function(eachIds)
-            {
-              if(eachIds["@language"] == "de" && displayDeustch)
-              {
-                
-                nodeLabel.append("text")
-                  .text(" " + eachIds["@value"] +"\n")
-                    .style("font-style","italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
-              }
-              else if (eachIds["@language"] == "en" && !displayDeustch)
-              {
-                nodeLabel.append("text")
-                  .text(" " + eachIds["@value"] +"\n")
-                    .style("font-style","italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
+              .style("bottom", "2px");
+
+
+          //node label on double click
+          if (tempNodeContains != undefined) {
+              var nodeLabel = d3.select("#" + idsArray.nodeLabelId)
+              nodeLabel.selectAll("*").remove();
+              if (tempNodeContains["rdfs:label"] != undefined) {
+                  if (Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === "[object Array]") {
+                      tempNodeContains["rdfs:label"].forEach(function(eachIds) {
+                          if (eachIds["@language"] == "de" && displayDeustch) {
+
+                              nodeLabel.append("text")
+                                  .text(" " + eachIds["@value"] + "\n")
+                                  .style("font-style", "italic")
+                                  .style("font-size", "80%")
+                                  .style("position", "relative")
+                                  .style("bottom", "2px");
+                          } else if (eachIds["@language"] == "en" && !displayDeustch) {
+                              nodeLabel.append("text")
+                                  .text(" " + eachIds["@value"] + "\n")
+                                  .style("font-style", "italic")
+                                  .style("font-size", "80%")
+                                  .style("position", "relative")
+                                  .style("bottom", "2px");
+                          }
+
+                      });
+                  } else {
+                      nodeLabel.append("text")
+                          .text(" " + tempNodeContains["rdfs:label"]["@value"] + "\n")
+                          .style("font-style", "italic")
+                          .style("font-size", "80%")
+                          .style("position", "relative")
+                          .style("bottom", "2px");
+                  }
               }
-  
-            });
-          }
-          else
-          {
-            nodeLabel.append("text")
-              .text(" " + tempNodeContains["rdfs:label"]["@value"] +"\n")
-                .style("font-style","italic")
-                .style("font-size", "80%")
-                .style("position", "relative")
-                .style("bottom", "2px");
-          }
-        }
-  
-        //node id on double click
-        var nodeID = d3.select("#"+idsArray.nodeIdsId)
-        nodeID.selectAll("*").remove(); 
-        if(tempNodeContains["@id"] != undefined )
-        {
-          nodeID.append("text")
-              .text(" " + tempNodeContains["@id"]+"\n") 
-                .style("font-style","italic")
-                .style("font-size", "80%")
-                .style("position", "relative")
-                .style("bottom", "2px");
-        }
-        //node type on double click
-        var nodeType = d3.select("#"+idsArray.nodeTypeId)
-        nodeType.selectAll("*").remove(); 
-        if(tempNodeContains["@type"] != undefined)
-        {
-          nodeType.append("text")
-              .text(" " + tempNodeContains["@type"]+"\n\n")
-                .style("font-style","italic")
-                .style("font-size", "80%")
-                .style("position", "relative")
-                .style("bottom", "2px"); 
-        }
-        
-        //node description on double click
-        var nodeDescription = d3.select("#"+idsArray.nodeDescripId)
-        nodeDescription.selectAll("*").remove();
-        if(tempNodeContains["dc:description"] != undefined)
-        { 
-          if(Object.prototype.toString.call(tempNodeContains["dc:description"]) === '[object Array]')
-          {
-            tempNodeContains["dc:description"].forEach(function(eachIds)
-            {
-              if(eachIds["@language"] == "de" && displayDeustch)
-              {
-                
-                nodeDescription.append("text")
-                  .text(" " + eachIds["@value"] +"\n")
-                    .style("font-style","italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
+
+              //node id on double click
+              var nodeID = d3.select("#" + idsArray.nodeIdsId)
+              nodeID.selectAll("*").remove();
+              if (tempNodeContains["@id"] != undefined) {
+                  nodeID.append("text")
+                      .text(" " + tempNodeContains["@id"] + "\n")
+                      .style("font-style", "italic")
+                      .style("font-size", "80%")
+                      .style("position", "relative")
+                      .style("bottom", "2px");
               }
-              else if (eachIds["@language"] == "en" && !displayDeustch)
-              {
-                nodeDescription.append("text")
-                  .text(" " + eachIds["@value"] +"\n")
-                    .style("font-style","italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
+              //node type on double click
+              var nodeType = d3.select("#" + idsArray.nodeTypeId)
+              nodeType.selectAll("*").remove();
+              if (tempNodeContains["@type"] != undefined) {
+                  nodeType.append("text")
+                      .text(" " + tempNodeContains["@type"] + "\n\n")
+                      .style("font-style", "italic")
+                      .style("font-size", "80%")
+                      .style("position", "relative")
+                      .style("bottom", "2px");
               }
 
-            });
-          }
-          else
-          {
-            nodeDescription.append("text")
-              .text(" " + tempNodeContains["dc:description"]["@value"] +"\n")
-                .style("font-style","italic")
-                .style("font-size", "80%")
-                .style("position", "relative")
-                .style("bottom", "2px");
-          }
-        }
-        
-        var nodeSubClass = d3.select("#"+idsArray.nodeSubClassId)
-        nodeSubClass.selectAll("*").remove(); 
-        if(tempNodeContains["rdfs:subClassOf"] != undefined)
-        {
-          if(Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === '[object Array]')
-          {
-            var tempIndexSubClassof =1;
-            tempNodeContains["rdfs:subClassOf"].forEach(function(eachIds)
-            {
-              var subClassLabel = getLabel(displayDeustch,eachIds["@id"]);
-              if(subClassLabel == "noLabel")
-              {
-                var tempLabelArray = eachIds["@id"].split('/');
-                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                subClassLabel = tempLabelArray1[tempLabelArray1.length -1 ];
+              //node description on double click
+              var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
+              nodeDescription.selectAll("*").remove();
+              if (tempNodeContains["dc:description"] != undefined) {
+                  if (Object.prototype.toString.call(tempNodeContains["dc:description"]) === "[object Array]") {
+                      tempNodeContains["dc:description"].forEach(function(eachIds) {
+                          if (eachIds["@language"] == "de" && displayDeustch) {
+
+                              nodeDescription.append("text")
+                                  .text(" " + eachIds["@value"] + "\n")
+                                  .style("font-style", "italic")
+                                  .style("font-size", "80%")
+                                  .style("position", "relative")
+                                  .style("bottom", "2px");
+                          } else if (eachIds["@language"] == "en" && !displayDeustch) {
+                              nodeDescription.append("text")
+                                  .text(" " + eachIds["@value"] + "\n")
+                                  .style("font-style", "italic")
+                                  .style("font-size", "80%")
+                                  .style("position", "relative")
+                                  .style("bottom", "2px");
+                          }
+
+                      });
+                  } else {
+                      nodeDescription.append("text")
+                          .text(" " + tempNodeContains["dc:description"]["@value"] + "\n")
+                          .style("font-style", "italic")
+                          .style("font-size", "80%")
+                          .style("position", "relative")
+                          .style("bottom", "2px");
+                  }
               }
 
-              nodeSubClass.append("text")
-                  .text(" " + tempIndexSubClassof +". "+ subClassLabel +"\n")
-                    .style("font-style","italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
-              
-              tempIndexSubClassof = tempIndexSubClassof+1;
-
-            });
-          }
-          else
-          {
-            var subClassLabel = getLabel(displayDeustch,tempNodeContains["rdfs:subClassOf"]["@id"]);
-            if(subClassLabel == "noLabel")
-            {
-              var tempLabelArray = tempNodeContains["rdfs:subClassOf"]["@id"].split('/');
-              var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-              subClassLabel = tempLabelArray1[tempLabelArray1.length -1 ];
-            }
-
-            nodeSubClass.append("text")
-              .text( " " + subClassLabel+"\n")
-                .style("font-style","italic")
-                .style("font-size", "80%")
-                .style("position", "relative")
-                .style("bottom", "2px");
-          }
-        }
-
-        var nodeDomain = d3.select("#"+idsArray.nodeDomainId)
-        nodeDomain.selectAll("*").remove(); 
-        if(tempNodeContains["rdfs:domain"] != undefined )
-        {
-          
-          if(Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === '[object Array]')
-          {
-            var tempIndexdomain =1;
-            tempNodeContains["rdfs:domain"].forEach(function(eachIds)
-            {
-              var domainLabel = getLabel(displayDeustch,eachIds["@id"]);
-              if(domainLabel == "noLabel")
-              {
-                var tempLabelArray = eachIds["@id"].split('/');
-                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                domainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
+              var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
+              nodeSubClass.selectAll("*").remove();
+              if (tempNodeContains["rdfs:subClassOf"] != undefined) {
+                  if (Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === "[object Array]") {
+                      var tempIndexSubClassof = 1;
+                      tempNodeContains["rdfs:subClassOf"].forEach(function(eachIds) {
+                          var subClassLabel = getLabel(displayDeustch, eachIds["@id"]);
+                          if (subClassLabel == "noLabel") {
+                              var tempLabelArray = eachIds["@id"].split("/");
+                              var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                              subClassLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                          }
+
+                          nodeSubClass.append("text")
+                              .text(" " + tempIndexSubClassof + ". " + subClassLabel + "\n")
+                              .style("font-style", "italic")
+                              .style("font-size", "80%")
+                              .style("position", "relative")
+                              .style("bottom", "2px");
+
+                          tempIndexSubClassof = tempIndexSubClassof + 1;
+
+                      });
+                  } else {
+                      var subClassLabel = getLabel(displayDeustch, tempNodeContains["rdfs:subClassOf"]["@id"]);
+                      if (subClassLabel == "noLabel") {
+                          var tempLabelArray = tempNodeContains["rdfs:subClassOf"]["@id"].split("/");
+                          var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                          subClassLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                      }
+
+                      nodeSubClass.append("text")
+                          .text(" " + subClassLabel + "\n")
+                          .style("font-style", "italic")
+                          .style("font-size", "80%")
+                          .style("position", "relative")
+                          .style("bottom", "2px");
+                  }
               }
 
-              nodeDomain.append("text")
-                  .text(" " +  tempIndexdomain +". "+ domainLabel +"\n")
-                    .style("font-style","italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
-              
-              tempIndexdomain = tempIndexdomain+1;
-
-            });
-          }
-          else
-          {
-            var domainLabel = getLabel(displayDeustch,tempNodeContains["rdfs:domain"]["@id"]);
-            if(domainLabel == "noLabel")
-            {
-              var tempLabelArray = tempNodeContains["rdfs:domain"]["@id"].split('/');
-              var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-              domainLabel = tempLabelArray1[tempLabelArray1.length -1 ];
-            }
-
-            nodeDomain.append("text")
-              .text(" " + domainLabel+"\n")
-                .style("font-style","italic")
-                .style("font-size", "80%")
-                .style("position", "relative")
-                .style("bottom", "2px");
-          }  
-        }
+              var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
+              nodeDomain.selectAll("*").remove();
+              if (tempNodeContains["rdfs:domain"] != undefined) {
+
+                  if (Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === "[object Array]") {
+                      var tempIndexdomain = 1;
+                      tempNodeContains["rdfs:domain"].forEach(function(eachIds) {
+                          var domainLabel = getLabel(displayDeustch, eachIds["@id"]);
+                          if (domainLabel == "noLabel") {
+                              var tempLabelArray = eachIds["@id"].split("/");
+                              var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                              domainLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                          }
+
+                          nodeDomain.append("text")
+                              .text(" " + tempIndexdomain + ". " + domainLabel + "\n")
+                              .style("font-style", "italic")
+                              .style("font-size", "80%")
+                              .style("position", "relative")
+                              .style("bottom", "2px");
+
+                          tempIndexdomain = tempIndexdomain + 1;
+
+                      });
+                  } else {
+                      var domainLabel = getLabel(displayDeustch, tempNodeContains["rdfs:domain"]["@id"]);
+                      if (domainLabel == "noLabel") {
+                          var tempLabelArray = tempNodeContains["rdfs:domain"]["@id"].split("/");
+                          var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                          domainLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                      }
+
+                      nodeDomain.append("text")
+                          .text(" " + domainLabel + "\n")
+                          .style("font-style", "italic")
+                          .style("font-size", "80%")
+                          .style("position", "relative")
+                          .style("bottom", "2px");
+                  }
+              }
 
 
-        var nodeRange = d3.select("#"+idsArray.nodeRangeId)
-        nodeRange.selectAll("*").remove(); 
-        if(tempNodeContains["rdfs:range"] != undefined )
-        {
-          
-          if(Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === '[object Array]')
-          {
-            var tempIndexRange =1;
-            tempNodeContains["rdfs:range"].forEach(function(eachIds)
-            {
-              var rangeLabel = getLabel(displayDeustch,eachIds["@id"]);
-              if(rangeLabel == "noLabel")
-              {
-                var tempLabelArray = eachIds["@id"].split('/');
-                var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-                rangeLabel = tempLabelArray1[tempLabelArray1.length -1 ];
+              var nodeRange = d3.select("#" + idsArray.nodeRangeId)
+              nodeRange.selectAll("*").remove();
+              if (tempNodeContains["rdfs:range"] != undefined) {
+
+                  if (Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === "[object Array]") {
+                      var tempIndexRange = 1;
+                      tempNodeContains["rdfs:range"].forEach(function(eachIds) {
+                          var rangeLabel = getLabel(displayDeustch, eachIds["@id"]);
+                          if (rangeLabel == "noLabel") {
+                              var tempLabelArray = eachIds["@id"].split("/");
+                              var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                              rangeLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                          }
+
+                          nodeRange.append("text")
+                              .text(" " + tempIndexRange + ". " + rangeLabel + "\n")
+                              .style("font-style", "italic")
+                              .style("font-size", "80%")
+                              .style("position", "relative")
+                              .style("bottom", "2px");
+
+                          tempIndexRange = tempIndexRange + 1;
+
+                      });
+                  } else {
+                      var rangeLabel = getLabel(displayDeustch, tempNodeContains["rdfs:range"]["@id"]);
+                      if (rangeLabel == "noLabel") {
+                          var tempLabelArray = tempNodeContains["rdfs:range"]["@id"].split("/");
+                          var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                          rangeLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                      }
+
+                      nodeRange.append("text")
+                          .text(" " + rangeLabel + "\n")
+                          .style("font-style", "italic")
+                          .style("font-size", "80%")
+                          .style("position", "relative")
+                          .style("bottom", "2px");
+                  }
               }
 
-              nodeRange.append("text")
-                  .text(" " +  tempIndexRange +". "+ rangeLabel +"\n")
-                    .style("font-style","italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
-              
-              tempIndexRange = tempIndexRange+1;
+              var nodeComment = d3.select("#" + idsArray.nodeCommentId)
+              nodeComment.selectAll("*").remove();
+              if (tempNodeContains["rdfs:comment"] != undefined) {
+                  nodeComment.append("text")
+                      .text(tempNodeContains["rdfs:comment"] + "\n")
+                      .style("font-style", "italic")
+                      .style("font-size", "80%")
+                      .style("position", "relative")
+                      .style("bottom", "2px");
+              }
 
-            });
           }
-          else
-          {
-            var rangeLabel = getLabel(displayDeustch,tempNodeContains["rdfs:range"]["@id"]);
-            if(rangeLabel == "noLabel")
-            {
-              var tempLabelArray = tempNodeContains["rdfs:range"]["@id"].split('/');
-              var tempLabelArray1 = tempLabelArray[tempLabelArray.length -1 ].split(':');
-              rangeLabel = tempLabelArray1[tempLabelArray1.length -1 ];
-            }
-
-            nodeRange.append("text")
-              .text(" " + rangeLabel+"\n")
-                .style("font-style","italic")
-                .style("font-size", "80%")
-                .style("position", "relative")
-                .style("bottom", "2px");
-          }  
-        }
-        
-        var nodeComment = d3.select("#"+idsArray.nodeCommentId)
-        nodeComment.selectAll("*").remove(); 
-        if(tempNodeContains["rdfs:comment"] != undefined)
-        {
-          nodeComment.append("text")
-              .text(tempNodeContains["rdfs:comment"]+"\n") 
-                .style("font-style","italic")
-                .style("font-size", "80%")
-                .style("position", "relative")
-                .style("bottom", "2px");
-        }
 
       }
-      
-    }
   });
-  
+
   function dragstarted(d) {
-    if (!d3.event.active) simulation.alphaTarget(0.3).restart();
-    d.fx = d.x;
-    d.fy = d.y;
+      if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+      d.fx = d.x;
+      d.fy = d.y;
   }
 
   function dragged(d) {
-    d.fx = d3.event.x;
-    d.fy = d3.event.y;
+      d.fx = d3.event.x;
+      d.fy = d3.event.y;
   }
 
   function dragended(d) {
-    if (!d3.event.active) simulation.alphaTarget(0);
-    d.fx = null;
-    d.fy = null;
+      if (!d3.event.active) simulation.alphaTarget(0);
+      d.fx = null;
+      d.fy = null;
   }
-  
-};
+
+};
\ No newline at end of file

From 58439cc084b19250c380e941d1b7f2c67519046c Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Thu, 4 Jul 2019 16:58:31 +0200
Subject: [PATCH 36/66] resolve Codacy/PR Quality Review issues

---
 .../d3v4-rdf-ontology-graph-view.js           | 106 +++++++++---------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 90cb28248..2058bd5fe 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -59,8 +59,19 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
       .force("center", d3.forceCenter((width / 2), (height / 2)));
 
   var tempLabel, tepmNodeContent, tempLabelArray, tempLabelArray1;
+  var literalIndex = 0;
+  var circleIdIndex = 0;
+  var tempSub = "?";
+  var tempPred = "?";
+  var tempObj = "?";
+  var pred = "---subClassOf---";
+  var tempDomainArray = [];
+  var tripleValue, isLitteral, literalDataType;
 
   d3.json("assets/rdfontology/historian-onlogoly.json", function(error, data) {
+    if (error) {
+      return console.warn("Error in createV3RDFOntologyGraphView() method :" + error);
+  }
       //START :: get english and deutsch labels values into arrays
       data["@graph"].forEach(function(elem) {
           if (elem["rdfs:label"] !== undefined) {
@@ -164,7 +175,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
       //returning label value
       function getLabel(displayDeustch, id) {
-          var returnVaule = "noLabel"
+          var returnVaule = "noLabel";
           if (!displayDeustch) {
               enLabelArray.forEach(function(elem) {
                   if (elem["id"] === id) {
@@ -188,7 +199,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         var subNodeAdded = false;
         var objNodeAdded = false;
 
-        if (nodesArray != undefined) {
+        if (nodesArray !== undefined) {
             nodesArray.forEach(function(elem) {
                 if (elem["id"] === tempSub) {
                     subNodeAdded = true;
@@ -227,14 +238,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
     }
 
       //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
-      var literalIndex = 0;
-      var circleIdIndex = 0;
-      var tempSub = "?";
-      var tempPred = "?";
-      var tempObj = "?";
-      var pred = "---subClassOf---";
-      var tempDomainArray = [];
-      var tripleValue, isLitteral, literalDataType;
 
       data["@graph"].forEach(function(element) {
           tempSub = "?";
@@ -246,7 +249,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           if (displaySubclasses) {
               if (element["rdfs:subClassOf"] !== undefined) {
                   tempSub = getLabel(displayDeustch, element["@id"]);
-                  if (tempSub == "noLabel") {
+                  if (tempSub === "noLabel") {
                       tempLabelArray = element["@id"].split("/");
                       tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                       tempSub = tempLabelArray1[tempLabelArray1.length - 1];
@@ -255,7 +258,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                   if (Object.prototype.toString.call(element["rdfs:subClassOf"]) === "[object Array]") {
                       element["rdfs:subClassOf"].forEach(function(eachIds) {
                           tempObj = getLabel(displayDeustch, eachIds["@id"]);
-                          if (tempObj == "noLabel") {
+                          if (tempObj === "noLabel") {
                               tempLabelArray = eachIds["@id"].split("/");
                               tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               tempObj = tempLabelArray1[tempLabelArray1.length - 1];
@@ -273,7 +276,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       });
                   } else {
                       tempObj = getLabel(displayDeustch, element["rdfs:subClassOf"]["@id"]);
-                      if (tempObj == "noLabel") {
+                      if (tempObj === "noLabel") {
                           tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
                           tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           tempObj = tempLabelArray1[tempLabelArray1.length - 1];
@@ -295,11 +298,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           //START :: Nodes and Links creation for all Properties
           if (dispalyAllprop) {
               //get the subject label  
-              if (element["rdfs:domain"] != undefined) {
+              if (element["rdfs:domain"] !== undefined) {
                   if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
                       element["rdfs:domain"].forEach(function(eachIds) {
                           tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          if (tempDomainLabel == "noLabel") {
+                          if (tempDomainLabel === "noLabel") {
                               tempLabelArray = eachIds["@id"].split("/");
                               tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               tempDomainLabel = tempLabelArray1[tempLabelArray1.length - 1];
@@ -308,7 +311,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       });
                   } else {
                       tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
-                      if (tempSub == "noLabel") {
+                      if (tempSub === "noLabel") {
                           tempLabelArray = element["rdfs:domain"]["@id"].split("/");
                           tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           tempSub = tempLabelArray1[tempLabelArray1.length - 1];
@@ -317,9 +320,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               }
 
               //get the predicate
-              if (element["rdfs:domain"] != undefined) {
+              if (element["rdfs:domain"] !== undefined) {
                   tempPred = getLabel(displayDeustch, element["@id"]);
-                  if (tempPred == "noLabel") {
+                  if (tempPred === "noLabel") {
                       tempLabelArray = element["@id"].split("/");
                       tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                       tempPred = tempLabelArray1[tempLabelArray1.length - 1];
@@ -328,10 +331,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
 
               //get the object  range
-              if (element["rdfs:range"] != undefined) {
+              if (element["rdfs:range"] !== undefined) {
                   if ("@id" in element["rdfs:range"]) {
                       tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
-                      if (tempObj == "noLabel") {
+                      if (tempObj === "noLabel") {
                           tempLabelArray = element["rdfs:range"]["@id"].split("/");
                           tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           tempObj = tempLabelArray1[tempLabelArray1.length - 1];
@@ -350,7 +353,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               if (tempDomainArray.length !== 0) {
                   tempDomainArray.forEach(function(el) {
-                      if (el != "?" && tempPred != "?" && tempObj != "?") {
+                      if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
                           if (isLitteral) {
                               tripleValue = {
                                   source: el,
@@ -373,7 +376,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       }
                   });
               } else {
-                  if (tempSub != "?" && tempPred != "?" && tempObj != "?") {
+                  if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
                       if (isLitteral) {
                           tripleValue = {
                               source: tempSub,
@@ -400,10 +403,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
       });
       //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
-      if (error) {
-          return console.warn("Error in createV3RDFOntologyGraphView() method :" + error);
-      }
-
 
 
 
@@ -464,7 +463,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               d3.select(idVal)
                   .attr("r", resourceRadius + 4)
-                  .style("fill", customizeGraphArray.onClickNodeColor)
+                  .style("fill", customizeGraphArray.onClickNodeColor);
 
               var tempSub = "?";
               var tempPred = "?";
@@ -483,11 +482,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                   includeThis = false;
                   //START :: Nodes and Links creation for all Properties
                   //get the subject label  
-                  if (element["rdfs:domain"] != undefined) {
+                  if (element["rdfs:domain"] !== undefined) {
                       if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
                           element["rdfs:domain"].forEach(function(eachIds) {
                               tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                              if (tempDomainLabel == "noLabel") {
+                              if (tempDomainLabel === "noLabel") {
                                   tempLabelArray = eachIds["@id"].split("/");
                                   tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                                   tempDomainLabel = tempLabelArray1[tempLabelArray1.length - 1];
@@ -501,7 +500,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                           });
                       } else {
                           tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
-                          if (tempSub == "noLabel") {
+                          if (tempSub === "noLabel") {
                               tempLabelArray = element["rdfs:domain"]["@id"].split("/");
                               tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               tempSub = tempLabelArray1[tempLabelArray1.length - 1];
@@ -515,9 +514,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
                   if (includeThis) {
                       //get the predicate
-                      if (element["rdfs:domain"] != undefined) {
+                      if (element["rdfs:domain"] !== undefined) {
                           tempPred = getLabel(displayDeustch, element["@id"]);
-                          if (tempPred == "noLabel") {
+                          if (tempPred === "noLabel") {
                               tempLabelArray = element["@id"].split("/");
                               tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               tempPred = tempLabelArray1[tempLabelArray1.length - 1];
@@ -525,7 +524,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       }
 
                       //get the object  range
-                      if (element["rdfs:range"] != undefined) {
+                      if (element["rdfs:range"] !== undefined) {
                           if ("@id" in element["rdfs:range"]) {
                               tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
                               if (tempObj === "noLabel") {
@@ -547,7 +546,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
                       if (!tempDomainArray.length === 0) {
                           tempDomainArray.forEach(function(el) {
-                              if (el != "?" && tempPred != "?" && tempObj != "?") {
+                              if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
                                   if (isLitteral) {
                                       tripleValue = {
                                           source: el,
@@ -570,7 +569,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                               }
                           });
                       } else {
-                          if (tempSub != "?" && tempPred != "?" && tempObj != "?") {
+                          if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
                               if (isLitteral) {
                                   tripleValue = {
                                       source: tempSub,
@@ -605,7 +604,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           } else {
               d3.select(idVal)
                   .attr("r", resourceRadius)
-                  .style("fill", "#311B92")
+                  .style("fill", "#311B92");
 
               expandedNodesArray.pop(idVal);
           }
@@ -636,7 +635,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                   if (labelStr.includes("subClassOf")) {
                       return "url(#subclass)";
                   }
-                  return "url(#normal)"
+                  return "url(#normal)";
               })
               .style("stroke-dasharray", function(d) {
                   var labelStr = d.predicate;
@@ -678,14 +677,15 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           linkTexts.append("title")
               .text(function(d) {
                   var labelStr = d.predicate;
+                  var returnValue;
                   if (labelStr.includes("subClassOf")) {
-                      var returnValue = "Source : " + d.source + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target;
+                      returnValue = "Source : " + d.source + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target;
                   } else {
-                      var returnValue = "Source : " + d.source + "\nProperty : " + d.predicate + "\nObject : " + d.target;
+                      returnValue = "Source : " + d.source + "\nProperty : " + d.predicate + "\nObject : " + d.target;
                   }
 
                   return returnValue;
-              });;
+              });
           // ==================== Add Link Names =====================
 
           node = g.append("g")
@@ -809,10 +809,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
 
           //node label on double click
-          if (tempNodeContains != undefined) {
+          if (tempNodeContains !== undefined) {
               var nodeLabel = d3.select("#" + idsArray.nodeLabelId)
               nodeLabel.selectAll("*").remove();
-              if (tempNodeContains["rdfs:label"] != undefined) {
+              if (tempNodeContains["rdfs:label"] !== undefined) {
                   if (Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === "[object Array]") {
                       tempNodeContains["rdfs:label"].forEach(function(eachIds) {
                           if (eachIds["@language"] == "de" && displayDeustch) {
@@ -846,7 +846,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               //node id on double click
               var nodeID = d3.select("#" + idsArray.nodeIdsId)
               nodeID.selectAll("*").remove();
-              if (tempNodeContains["@id"] != undefined) {
+              if (tempNodeContains["@id"] !== undefined) {
                   nodeID.append("text")
                       .text(" " + tempNodeContains["@id"] + "\n")
                       .style("font-style", "italic")
@@ -857,7 +857,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               //node type on double click
               var nodeType = d3.select("#" + idsArray.nodeTypeId)
               nodeType.selectAll("*").remove();
-              if (tempNodeContains["@type"] != undefined) {
+              if (tempNodeContains["@type"] !== undefined) {
                   nodeType.append("text")
                       .text(" " + tempNodeContains["@type"] + "\n\n")
                       .style("font-style", "italic")
@@ -869,7 +869,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               //node description on double click
               var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
               nodeDescription.selectAll("*").remove();
-              if (tempNodeContains["dc:description"] != undefined) {
+              if (tempNodeContains["dc:description"] !== undefined) {
                   if (Object.prototype.toString.call(tempNodeContains["dc:description"]) === "[object Array]") {
                       tempNodeContains["dc:description"].forEach(function(eachIds) {
                           if (eachIds["@language"] == "de" && displayDeustch) {
@@ -902,7 +902,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
               nodeSubClass.selectAll("*").remove();
-              if (tempNodeContains["rdfs:subClassOf"] != undefined) {
+              if (tempNodeContains["rdfs:subClassOf"] !== undefined) {
                   if (Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === "[object Array]") {
                       var tempIndexSubClassof = 1;
                       tempNodeContains["rdfs:subClassOf"].forEach(function(eachIds) {
@@ -942,13 +942,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
               nodeDomain.selectAll("*").remove();
-              if (tempNodeContains["rdfs:domain"] != undefined) {
+              if (tempNodeContains["rdfs:domain"] !== undefined) {
 
                   if (Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === "[object Array]") {
                       var tempIndexdomain = 1;
                       tempNodeContains["rdfs:domain"].forEach(function(eachIds) {
                           var domainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          if (domainLabel == "noLabel") {
+                          if (domainLabel === "noLabel") {
                               var tempLabelArray = eachIds["@id"].split("/");
                               var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               domainLabel = tempLabelArray1[tempLabelArray1.length - 1];
@@ -966,7 +966,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       });
                   } else {
                       var domainLabel = getLabel(displayDeustch, tempNodeContains["rdfs:domain"]["@id"]);
-                      if (domainLabel == "noLabel") {
+                      if (domainLabel === "noLabel") {
                           var tempLabelArray = tempNodeContains["rdfs:domain"]["@id"].split("/");
                           var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           domainLabel = tempLabelArray1[tempLabelArray1.length - 1];
@@ -984,13 +984,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               var nodeRange = d3.select("#" + idsArray.nodeRangeId)
               nodeRange.selectAll("*").remove();
-              if (tempNodeContains["rdfs:range"] != undefined) {
+              if (tempNodeContains["rdfs:range"] !== undefined) {
 
                   if (Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === "[object Array]") {
                       var tempIndexRange = 1;
                       tempNodeContains["rdfs:range"].forEach(function(eachIds) {
                           var rangeLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          if (rangeLabel == "noLabel") {
+                          if (rangeLabel === "noLabel") {
                               var tempLabelArray = eachIds["@id"].split("/");
                               var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               rangeLabel = tempLabelArray1[tempLabelArray1.length - 1];
@@ -1008,7 +1008,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       });
                   } else {
                       var rangeLabel = getLabel(displayDeustch, tempNodeContains["rdfs:range"]["@id"]);
-                      if (rangeLabel == "noLabel") {
+                      if (rangeLabel === "noLabel") {
                           var tempLabelArray = tempNodeContains["rdfs:range"]["@id"].split("/");
                           var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           rangeLabel = tempLabelArray1[tempLabelArray1.length - 1];
@@ -1025,7 +1025,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               var nodeComment = d3.select("#" + idsArray.nodeCommentId)
               nodeComment.selectAll("*").remove();
-              if (tempNodeContains["rdfs:comment"] != undefined) {
+              if (tempNodeContains["rdfs:comment"] !== undefined) {
                   nodeComment.append("text")
                       .text(tempNodeContains["rdfs:comment"] + "\n")
                       .style("font-style", "italic")

From c980bfa2414a2dc4a37e7ebff0f9e72f05c4ca75 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Thu, 4 Jul 2019 16:59:41 +0200
Subject: [PATCH 37/66] resolve Codacy/PR Quality Review issues

---
 ida-chatbot/src/app/app.module.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 1f43aecfc..6436d8b59 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -62,7 +62,7 @@ import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { SpeechInputComponent } from './components/speech-input/speech-input.component';
-//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 @NgModule({
   declarations: [
     AppComponent,
@@ -124,8 +124,8 @@ import { SpeechInputComponent } from './components/speech-input/speech-input.com
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule//,
-    //NgbModule
+    FlexLayoutModule,
+    NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,

From c7725b4ca2059f23e82eb108fe72164730bb9e40 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 22 Oct 2019 15:05:21 +0200
Subject: [PATCH 38/66] changing svg id value in component html and starting
 use of Angular material.

---
 .../rdf-ontology-view.component.html          |  2 +-
 .../rdf-ontology-view.component.ts            | 12 +++++------
 .../d3v4-rdf-ontology-graph-view.js           | 20 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index a238df0a1..7bcbdcfcf 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -185,7 +185,7 @@ <h1 align='center'>Historian Ontology Graph</h1>
           </button>
         </div>
       </div>
-      <div [attr.id]="svgId" style="float: left; height: 140vh;background-color: #F8F9F9;border-radius: 8px;position: relative;left: 6px;"></div>
+      <div [attr.id]="ontologyId" style="float: left;width: 70%;background-color: #F8F9F9;border-radius: 8px;position: relative;left: 6px;"></div>
     </div>
   </mat-tab>
 </mat-tab-group>
\ No newline at end of file
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index 021fefee9..06d75d721 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -10,7 +10,7 @@ declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h,j,i);
 export class RdfOntologyViewComponent implements OnInit {
 
   public figId: string;
-  public svgId: string;
+  public ontologyId: string;
   public fileName: string;
   public nodeId: string;
   public nodeLabelId: string;
@@ -42,7 +42,7 @@ export class RdfOntologyViewComponent implements OnInit {
   
   constructor(public uip: UniqueIdProviderService) {
     this.figId = 'fig' + this.uip.getUniqueId();
-    this.svgId = 'svg' + this.uip.getUniqueId();
+    this.ontologyId = 'ontologyId' + this.uip.getUniqueId();
     this.nodeId = 'nodeLabelId' + this.uip.getUniqueId();
     this.nodeLabelId = 'nodeLabelId' + this.uip.getUniqueId();
     this.nodeIdsId = 'nodeIdsId' + this.uip.getUniqueId();
@@ -77,7 +77,7 @@ export class RdfOntologyViewComponent implements OnInit {
                 propertyTextColor:this.propertyTextColor,
                 onClickNodeColor:this.onClickNodeColor
                 }
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
       this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
   }
 
@@ -99,7 +99,7 @@ export class RdfOntologyViewComponent implements OnInit {
                 propertyTextColor:this.propertyTextColor,
                 onClickNodeColor:this.onClickNodeColor
                 }
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
       this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
   }
   graphResetChanged(event){
@@ -141,7 +141,7 @@ export class RdfOntologyViewComponent implements OnInit {
                               onClickNodeColor:this.onClickNodeColor
                               }
 
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
       this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
   }
 
@@ -164,7 +164,7 @@ export class RdfOntologyViewComponent implements OnInit {
                 propertyTextColor:this.propertyTextColor,
                 onClickNodeColor:this.onClickNodeColor
                 }
-    createV4RDFOntologyGraph(this.figId, this.svgId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
       this.allPropChecked,this.allNodesInBoundClicked,
       this.disableZoomClicked,idVal,customizeGraphVals);
   }
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 2058bd5fe..9654dc08a 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -7,7 +7,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
   var expandedNodesArray = [];
   var nodeContents = [];
 
-  var width = 1025,
+  var width = 1175,
       height = 1100,
       resourceRadius = customizeGraphArray.resourceRadius,
       literalRadius = customizeGraphArray.literalRadius;
@@ -454,7 +454,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
       
 
-      function clickFunctionality(d) {
+      function doubleClickFunctionality(d) {
           var idVal = "#" + d.nodeId;
           var clickedNodeLabel = d.id;
           if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
@@ -465,7 +465,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                   .attr("r", resourceRadius + 4)
                   .style("fill", customizeGraphArray.onClickNodeColor);
 
-              var tempSub = "?";
+              var tempSub = "?"; 
               var tempPred = "?";
               var tempObj = "?";
               var pred = "---subClassOf---";
@@ -764,13 +764,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                   return returnValue;
               });
 
-          //START :: on click
-          node.on("dblclick", clickFunctionality);
-          //END :: on click    
-
           //START :: on double click
-          node.on("click", doubleClickFuntionality);
-          //END :: on double click
+          node.on("dblclick", doubleClickFunctionality);
+          //END :: on double click    
+
+          //START :: on  click
+          node.on("click", clickFuntionality);
+          //END :: on  click
 
 
           if (!disableZoom) {
@@ -789,7 +789,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
       }
 
 
-      function doubleClickFuntionality(d) {
+      function clickFuntionality(d) {
           var nodeIdVal = d.id;
           var tempNodeContains = [];
           nodeContents.forEach(function(val) {

From 6bdc036e0962bc484ace623c5edf08cad28aca35 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Fri, 1 Nov 2019 15:38:43 +0100
Subject: [PATCH 39/66] implemented functionality of collapsing nodes and links
 that are expanded on Double click of a node.

---
 .../d3v4-rdf-ontology-graph-view.js           | 124 +++++++++++++++---
 1 file changed, 109 insertions(+), 15 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 9654dc08a..d8886eeef 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -6,6 +6,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
   var deLabelArray = [];
   var expandedNodesArray = [];
   var nodeContents = [];
+  var onDoubleClickedNewlyCreatedNodes = [];
+  var onDoubleClickedNewlyCreatedLinks = [];
+  var onDoubleClickCreatingNodes = false;
+  var nodeDoubleClicked = "";
 
   var width = 1175,
       height = 1100,
@@ -198,6 +202,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         //START :: Node creation
         var subNodeAdded = false;
         var objNodeAdded = false;
+        var onDoubleClickNodesCreated = ""; 
 
         if (nodesArray !== undefined) {
             nodesArray.forEach(function(elem) {
@@ -221,6 +226,12 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 group: 1
             };
             nodesArray.push(nodeValue);
+
+            if(onDoubleClickCreatingNodes)
+            { 
+                onDoubleClickNodesCreated = {nodeClicked:nodeDoubleClicked,nodeCreated:nodeValue};
+                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
+            }
         }
         if (objNodeAdded === false) {
             circleIdIndex = circleIdIndex + 1;
@@ -233,6 +244,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 group: 1
             };
             nodesArray.push(nodeValue);
+            if(onDoubleClickCreatingNodes)
+            {
+                onDoubleClickNodesCreated = {nodeClicked:nodeDoubleClicked,nodeCreated:nodeValue};
+                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
+            }
         }
         //END :: Node creation
     }
@@ -271,7 +287,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                               value: 1
                           };
                           linksArray.push(tripleValue);
-
                           createNewNode(tempSub, pred, tempObj, false, "");
                       });
                   } else {
@@ -403,9 +418,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
       });
       //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
-
-
-
       function ticked() {
           lables
               .attr("x2", function(d) {
@@ -452,11 +464,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
       update();
 
 
-      
-
       function doubleClickFunctionality(d) {
           var idVal = "#" + d.nodeId;
           var clickedNodeLabel = d.id;
+          var newlyCreatingLinkData = "";
+
           if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
               expandedNodesArray.push(idVal);
 
@@ -470,7 +482,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               var tempObj = "?";
               var pred = "---subClassOf---";
               var tempDomainArray = [];
-              var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue;
+              var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue,removeClikedNode;
+              
+              onDoubleClickCreatingNodes = true;
+              nodeDoubleClicked = idVal;
 
               data["@graph"].forEach(function(element) {
                   tempSub = "?";
@@ -555,6 +570,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                                           value: 1
                                       };
                                       linksArray.push(tripleValue);
+                                      newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                      onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
                                       createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
                                   } else {
                                       tripleValue = {
@@ -564,6 +581,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                                           value: 1
                                       };
                                       linksArray.push(tripleValue);
+                                      newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                      onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
                                       createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
                                   }
                               }
@@ -578,6 +597,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                                       value: 1
                                   };
                                   linksArray.push(tripleValue);
+                                  newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                  onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
                                   createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
                               } else {
                                   tripleValue = {
@@ -587,6 +608,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                                       value: 1
                                   };
                                   linksArray.push(tripleValue);
+                                  newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                  onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
                                   createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
                               }
                           }
@@ -594,24 +617,95 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                   }
                   //END :: Nodes and Links creation for all Properties
               });
+              
 
+              onDoubleClickCreatingNodes = false;
 
               var allClear = d3.selectAll(".everything");
               allClear.selectAll("*").remove();
 
               update();
               simulation.restart();
-          } else {
-              d3.select(idVal)
-                  .attr("r", resourceRadius)
-                  .style("fill", "#311B92");
 
-              expandedNodesArray.pop(idVal);
-          }
-      }
+              
+          } 
+          else if (expandedNodesArray.includes(idVal)) 
+          {  
+                removeClikedNode = "";
+                onDoubleClickedNewlyCreatedLinks.forEach(function(val) 
+                {
+                    if (val.nodeClicked === idVal) {
+                        for(var i=0;i<linksArray.length;i++)
+                        {
+                            if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) 
+                            {
+                                linksArray.splice(i, 1); 
+                                i--;
+                            }
+                        }
+                        removeClikedNode = val.nodeClicked;
+
+                    }
+                });
+                
+                for(var i=0;i<onDoubleClickedNewlyCreatedLinks.length;i++)
+                {
+                    if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) 
+                    {
+                        onDoubleClickedNewlyCreatedLinks.splice(i, 1); 
+                        i--;
+                    }
+                }
+
+                
+                removeClikedNode = "";
+                onDoubleClickedNewlyCreatedNodes.forEach(function(val) 
+                {
+                    if (val.nodeClicked === idVal) 
+                    {
+                        for(var i=0;i<nodesArray.length;i++)
+                        {
+                            if (nodesArray[i].id === val.nodeCreated.id) 
+                            {
+                                nodesArray.splice(i, 1); 
+                                i--;
+                            }
+                        }
+                        removeClikedNode = val.nodeClicked;
+                    }
+                });
+
+                for(var i=0;i<onDoubleClickedNewlyCreatedNodes.length;i++)
+                {
+                    if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) 
+                    {
+                        onDoubleClickedNewlyCreatedNodes.splice(i, 1); 
+                        i--;
+                    }
+                }
+
+                for(var i=0;i<expandedNodesArray.length;i++)
+                {
+                    if (expandedNodesArray[i] === idVal) 
+                    {
+                        expandedNodesArray.splice(i, 1); 
+                        break;
+                    }
+                }
+                var allClear = d3.selectAll(".everything");
+                allClear.selectAll("*").remove();
+
+                update();
+                simulation.restart();
+           
+            }
+        }
+
+        function update() 
+        {
 
-      function update() {
           simulation.restart();
+
           simulation
               .nodes(nodesArray)
               .on("tick", ticked);

From 1f5019f7e4d759b725aea63972708a69aa681293 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Fri, 1 Nov 2019 22:39:11 +0100
Subject: [PATCH 40/66] 1. change color of node on expanding/collapsing it. 2.
 fix old issue of on hover not displaying source and object values correctly.

---
 .../d3v4-rdf-ontology-graph-view.js           | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index d8886eeef..287bc6cd6 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -772,10 +772,12 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               .text(function(d) {
                   var labelStr = d.predicate;
                   var returnValue;
+                  
                   if (labelStr.includes("subClassOf")) {
-                      returnValue = "Source : " + d.source + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target;
+                    
+                      returnValue = "Source : " + d.source.id+ "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target.id;
                   } else {
-                      returnValue = "Source : " + d.source + "\nProperty : " + d.predicate + "\nObject : " + d.target;
+                      returnValue = "Source : " + d.source.id + "\nProperty : " + labelStr + "\nObject : " + d.target.id;
                   }
 
                   return returnValue;
@@ -802,7 +804,25 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               })
               .style("fill", function(d) {
                   var labelStr = d.id;
-                  if (d.isLitteral) {
+                  var expandedNode = false;
+                  
+                  if(!dispalyAllprop)
+                  {
+                    expandedNodesArray.forEach(function(val)
+                    {
+                        if(val === "#"+d.nodeId)
+                        {
+                            expandedNode = true;
+                        }
+                    });
+                  }
+                  
+                  if(expandedNode)
+                  {
+                     return "#8E44AD";
+                  }
+                  if (d.isLitteral) 
+                  {
                       return customizeGraphArray.literalNodeColor;
                   }
                   return customizeGraphArray.resourceNodeColor;

From f84a7a30b7634cc06a32bf81f48c6f3733e11ea6 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sat, 2 Nov 2019 13:39:10 +0100
Subject: [PATCH 41/66] 1.Angular material changes in rdf-ontology components.

---
 .../rdf-ontology-view.component.css           |  19 +-
 .../rdf-ontology-view.component.html          | 231 ++++--------------
 .../rdf-ontology-view.component.ts            |   1 +
 3 files changed, 69 insertions(+), 182 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
index b63415fd7..724aaf8cb 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
@@ -1,10 +1,17 @@
-.labelClass {
-    
+.rightSideContainer{
+  width: 30%;
+}
+.mat-toolbar.mat-primary {
+  background: #f7f7f8;
+  color: #0b0b0b;
+}
+.labelClass { 
     padding-left: 20px;
     text-indent: -15px;
     padding-top: 7px;
     font-size: 19px;
-  }
+    padding-right: 5px;
+}
 .checkboxClass {
     width: 20px; 
     height: 20px;
@@ -15,6 +22,9 @@
     top: -8px;
     *overflow: hidden;
   }
+
+
+  
   .inputLabelClass {
     padding-left: 10px;
     font-size: 15px;
@@ -35,4 +45,5 @@
     padding-left: 35px;
     font-size: 18px;
     width:275px;
-  }
\ No newline at end of file
+  }
+
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 7bcbdcfcf..1bee13ee4 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,191 +1,66 @@
 <mat-tab-group style="min-width: 40vw;max-height: 100vh">
   <mat-tab label="Ontology Explorer">
-    <div [attr.id]="fdgId1" fxFlexstyle="height: 150vh; margin: 20px;border-color: #eaeaea;border-style: solid">
+    
+    <mat-toolbar color="primary">
+      <mat-toolbar-row>
+        <div fxflex style="width: 100%; height: 20%;">
+          <h1 align='center'>Historian Ontology Graph</h1>
+        </div>
+      </mat-toolbar-row>
 
-      <div style="width: 100%; height: 20%;">
-        <h1 align='center'>Historian Ontology Graph</h1>
-      </div>
-      <div id="filtersId"
-        style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">
-        <label class="labelClass">
-          Filters:
+      <mat-toolbar-row class="filtersRowID">
+        <div id="filtersId" style="width: 99%;height: 40px;border-radius: 8px;background-color: #b7cad7;">
+          <mat-label class="labelClass">
+            Filters:
+          </mat-label>
 
-        </label>
-        <label class="labelClass">
-          Display in Deutsch
+          <mat-label class="labelClass">Display in Deutsch</mat-label>
           <input class="checkboxClass" type="checkbox" [(ngModel)]="languageCheked"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          Include Class Hierarchy
+              (change)="checkboxValuesChanged(isChecked)" />
+          
+          <mat-label class="labelClass">Include Class Hierarchy</mat-label>
           <input class="checkboxClass" type="checkbox" [(ngModel)]="classHeirarchyChecked" value="1"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          Include All Properties
+              (change)="checkboxValuesChanged(isChecked)" />
+          
+          <mat-label class="labelClass">Include All Properties</mat-label>
           <input class="checkboxClass" type="checkbox" [(ngModel)]="allPropChecked"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          Bounded Graph
+              (change)="checkboxValuesChanged(isChecked)" />
+          
+          
+          <mat-label class="labelClass">Bounded Graph</mat-label>
           <input class="checkboxClass" type="checkbox" [(ngModel)]="allNodesInBoundClicked"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          Disable Zoom
-          <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          <button #graphReset (click)="graphResetChanged($event)"
-            style="width: 8%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:whitesmoke;">
-            Reset Graph
-          </button>
-        </label>
-      </div>
-      <br />
-      <div id="filtersId"
-        style="display: block;float: right;width:24.5%; height: 1053px;background-color:#F2F3F4;border-radius: 8px;">
-
-        <div id="nodeInformationId"
-          style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
-          <label class="inputLabelClass">
-            Node Information:
-          </label>
-          <br />
-        </div>
+              (change)="checkboxValuesChanged(isChecked)" />
+          
+          <mat-label class="labelClass">Disable Zoom</mat-label>
+            <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked"
+              (change)="checkboxValuesChanged(isChecked)" />
 
-        <div id="nodeInfoTagesId" style=" text-align: justify;overflow: auto;display: block;background-color:#AED6F1;border-radius: 8px;
-                    padding-top: 10px;">
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Node:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Label:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeLabelId"></div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Id:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeIdsId"></div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Type:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeTypeId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Description:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Sub Class Of:
-            </label>
-            <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Domain:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Range:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Comment:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
-            <br /><br />
-          </div>
+          <mat-label class="labelClass">
+            <button mat-raised-button #graphReset (click)="graphResetChanged($event)"
+              style="border-radius: 8px;padding-top: 3px;">
+              Reset Graph
+            </button>
+          </mat-label>
         </div>
-
-        <div id="graphConfigId"
-          style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
-          <label class="inputLabelClass">
-            Customize Graph:
-          </label>
-          <br /><br />
-        </div>
-
-        <div id="graphConfigInputsId" style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
-                    padding-top: 10px;">
-          <label class="inputLabelClass">
-            Edge Size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
-          </label><br />
-          <label class="inputLabelClass">
-            Graph Charge/Depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge"
-              placeholder=" 1000">
-          </label><br />
-          <label class="inputLabelClass">
-            Resource Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius"
-              placeholder=" 10">
-          </label><br />
-          <label class="inputLabelClass">
-            Literal Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
-          </label><br />
-          <label class="inputLabelClass">
-            Resource Node Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor"
-              placeholder=" #311B92">
-          </label><br />
-          <label class="inputLabelClass">
-            Resource Node Text Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor"
-              placeholder=" #311B92">
-          </label><br />
-          <label class="inputLabelClass">
-            Literal Node Color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor"
-              placeholder=" #FF9800">
-          </label><br />
-          <label class="inputLabelClass">
-            Literal node text color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor"
-              placeholder=" #FF9800">
-          </label><br />
-          <label class="inputLabelClass">
-            Sub Class Label: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel"
-              placeholder=" --subClassOf--">
-          </label><br />
-          <label class="inputLabelClass">
-            Sub Class Label Color: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor"
-              placeholder=" #3498DB">
-          </label><br />
-          <label class="inputLabelClass">
-            Property Text Color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor"
-              placeholder=" #28B463">
-          </label><br />
-          <!--
-                <label class="inputLabelClass">
-                  On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
-                </label>--><br /> <br /><br /> <br /> <br />
-
-          <button #applyConfigBtn (click)="applyConfigClicked($event)"
-            style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
-            Apply Changes
-          </button>
+      </mat-toolbar-row>
+    </mat-toolbar> 
+    
+    <!--START :: main container grid -->
+    <mat-drawer-container class="ontologyMainContainer" autosize>
+      <mat-drawer #drawer class="rightSideContainer" mode="side" position="end">
+        <p>Auto-resizing sidenav</p>
+        <p *ngIf="expandNodeInfoCard">extra text.</p>
+        <button (click)="expandNodeInfoCard = !expandNodeInfoCard" mat-raised-button> Toggle extra text</button>
+      </mat-drawer>
+    
+      <div class="leftSideContainer">
+       <div align="end">
+          <mat-button-toggle mat-icon-button (click)="drawer.toggle()"> <mat-icon>code</mat-icon> </mat-button-toggle>
         </div>
-      </div>
-      <div [attr.id]="ontologyId" style="float: left;width: 70%;background-color: #F8F9F9;border-radius: 8px;position: relative;left: 6px;"></div>
-    </div>
+        <div [attr.id]="ontologyId" style="background-color: #F8F9F9;border-radius: 8px;"></div>
+      </div> 
+     
+    </mat-drawer-container>    
+    <!--END :: main container grid -->
   </mat-tab>
 </mat-tab-group>
\ No newline at end of file
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index 06d75d721..c5eb99438 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -22,6 +22,7 @@ export class RdfOntologyViewComponent implements OnInit {
   public nodeRangeId: string;
   public nodeCommentId: string;
 
+  expandNodeInfoCard = false;
   languageCheked = false;
   classHeirarchyChecked = true;
   allPropChecked = false;

From 97893fe7e5e4a7fe49294b88cfdebcb47fa2cd72 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sat, 2 Nov 2019 14:59:31 +0100
Subject: [PATCH 42/66] 1.Continued angular material changes in rdf-ontology
 components.

---
 .../rdf-ontology-view.component.css           |  64 +++++----
 .../rdf-ontology-view.component.html          | 122 +++++++++++++++++-
 .../d3v4-rdf-ontology-graph-view.js           |   2 +-
 3 files changed, 148 insertions(+), 40 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
index 724aaf8cb..60d0b7717 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
@@ -6,44 +6,38 @@
   color: #0b0b0b;
 }
 .labelClass { 
-    padding-left: 20px;
-    text-indent: -15px;
-    padding-top: 7px;
-    font-size: 19px;
-    padding-right: 5px;
+  padding-left: 20px;
+  text-indent: -15px;
+  padding-top: 7px;
+  font-size: 19px;
+  padding-right: 5px;
 }
 .checkboxClass {
-    width: 20px; 
-    height: 20px;
-    padding-top: 10px;
-    margin:0;
-    vertical-align: bottom;
-    position: relative;
-    top: -8px;
-    *overflow: hidden;
-  }
+  width: 20px; 
+  height: 20px;
+  padding-top: 10px;
+  margin:0;
+  vertical-align: bottom;
+  position: relative;
+  top: -8px;
+  *overflow: hidden;
+}
 
+.inputTextClass {
+  border-radius: 8px;
+  width: 33%;
+  padding-left: 3px;
+}
 
-  
-  .inputLabelClass {
-    padding-left: 10px;
-    font-size: 15px;
-    float: left;
-  }
-  
-  .inputTextClass {
-    border-radius: 8px;
-    width: 33%;
-    padding-left: 3px;
-  }
+.nodeInfoDivClass {
+  float: left;
+}
 
-  .nodeInfoDivClass {
-    float: left;
-  }
-  
-  .nodeInfoDiv {
-    padding-left: 35px;
-    font-size: 18px;
-    width:275px;
-  }
+.nodeInfoDiv {
+  position: relative;
+  bottom: 34px;
+  left: 80px;
+  font-size: 18px;
+  width:275px;
+}
 
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 1bee13ee4..9fba29e3a 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -3,7 +3,7 @@
     
     <mat-toolbar color="primary">
       <mat-toolbar-row>
-        <div fxflex style="width: 100%; height: 20%;">
+        <div style="width: 100%; height: 20%;">
           <h1 align='center'>Historian Ontology Graph</h1>
         </div>
       </mat-toolbar-row>
@@ -48,9 +48,123 @@ <h1 align='center'>Historian Ontology Graph</h1>
     <!--START :: main container grid -->
     <mat-drawer-container class="ontologyMainContainer" autosize>
       <mat-drawer #drawer class="rightSideContainer" mode="side" position="end">
-        <p>Auto-resizing sidenav</p>
-        <p *ngIf="expandNodeInfoCard">extra text.</p>
-        <button (click)="expandNodeInfoCard = !expandNodeInfoCard" mat-raised-button> Toggle extra text</button>
+        <mat-card>
+
+          <div id="nodeInformationId" style="border-radius: 8px;padding-top: 9px;">
+            <mat-card-title>Node Information</mat-card-title> 
+          </div>
+
+          
+          <div id="nodeInfoTagesId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Node:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Label:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeLabelId"></div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>ID:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeIdsId"></div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Type:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeTypeId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Description:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>SubClassOf:</mat-card-subtitle>
+              <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Domain:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Range:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Comment:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
+            </div>
+        
+          </div>
+        </mat-card>
+
+        <mat-card>
+          <div id="graphConfigId" style="border-radius: 8px;padding-top: 9px;">
+           
+            <mat-card-title>Customize Graph</mat-card-title>
+          </div>
+  
+          <div id="graphConfigInputsId" style="border-radius: 8px; padding-top: 10px;">
+            
+            <mat-card-subtitle>Edge Size:
+              <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
+            </mat-card-subtitle>
+            
+            <mat-card-subtitle> Graph Charge/Depth : 
+              <input type="text" class="inputTextClass" [(ngModel)]="graphCharge" placeholder=" 1000">
+            </mat-card-subtitle>
+
+            <mat-card-subtitle> Resource Node Radius: 
+              <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius" placeholder=" 10">
+            </mat-card-subtitle>
+
+            <mat-card-subtitle> Literal Node Radius: 
+              <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
+            </mat-card-subtitle>
+
+            <mat-card-subtitle>Resource Node Color: 
+              <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor" placeholder=" #311B92">
+            </mat-card-subtitle>
+
+              <mat-card-subtitle>Resource Node Text Color: 
+                <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor" placeholder=" #311B92">
+              </mat-card-subtitle>
+
+              <mat-card-subtitle>Literal Node Color:
+                 <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor" placeholder=" #FF9800">
+              </mat-card-subtitle>
+
+              <mat-card-subtitle>Literal node text color: 
+                <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor" placeholder=" #FF9800">
+              </mat-card-subtitle>
+
+            <mat-card-subtitle> Sub Class Label: 
+              <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel" placeholder=" --subClassOf--">
+              </mat-card-subtitle>
+
+              <mat-card-subtitle>Sub Class Label Color: 
+                <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor" placeholder=" #3498DB">
+              </mat-card-subtitle>
+
+              <mat-card-subtitle> Property Text Color:
+                <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor"placeholder=" #28B463">
+              </mat-card-subtitle>
+
+              <mat-card-actions>
+                  <button mat-raised-button #applyConfigBtn (click)="applyConfigClicked($event)">
+                  Apply Changes
+                </button>
+              </mat-card-actions>
+             
+          </div>
+        </mat-card>
       </mat-drawer>
     
       <div class="leftSideContainer">
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 287bc6cd6..5d29e19d9 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -22,7 +22,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
   var svg = d3.select("#" + svgId)
       .append("svg")
-      .attr("width", width)
+      .attr("width", "100%")
       .attr("height", height);
 
   svg.append("svg:defs").selectAll("marker")

From a9a7abd758d12dde12fe0e006caeba0b131174b9 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Thu, 5 Dec 2019 19:57:16 +0100
Subject: [PATCH 43/66] Resource and literals labels fetching and display
 changes

---
 .../d3v4-rdf-ontology-graph-view.js           |  113 +-
 .../rdfontology/historian-onlogoly.json       | 1160 +++++++++--------
 2 files changed, 706 insertions(+), 567 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 5d29e19d9..6c1eef0ae 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -9,8 +9,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
   var onDoubleClickedNewlyCreatedNodes = [];
   var onDoubleClickedNewlyCreatedLinks = [];
   var onDoubleClickCreatingNodes = false;
-  var nodeDoubleClicked = "";
-
+  var nodeDoubleClicked = ""; 
   var width = 1175,
       height = 1100,
       resourceRadius = customizeGraphArray.resourceRadius,
@@ -179,7 +178,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
       //returning label value
       function getLabel(displayDeustch, id) {
-          var returnVaule = "noLabel";
+          //var returnVaule = "noLabel";
+          var returnVaule = id;
           if (!displayDeustch) {
               enLabelArray.forEach(function(elem) {
                   if (elem["id"] === id) {
@@ -265,20 +265,20 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           if (displaySubclasses) {
               if (element["rdfs:subClassOf"] !== undefined) {
                   tempSub = getLabel(displayDeustch, element["@id"]);
-                  if (tempSub === "noLabel") {
+                  /*if (tempSub === "noLabel") {
                       tempLabelArray = element["@id"].split("/");
                       tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                       tempSub = tempLabelArray1[tempLabelArray1.length - 1];
-                  }
+                  }*/
 
                   if (Object.prototype.toString.call(element["rdfs:subClassOf"]) === "[object Array]") {
                       element["rdfs:subClassOf"].forEach(function(eachIds) {
                           tempObj = getLabel(displayDeustch, eachIds["@id"]);
-                          if (tempObj === "noLabel") {
+                          /*if (tempObj === "noLabel") {
                               tempLabelArray = eachIds["@id"].split("/");
                               tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                          }
+                          }*/
 
                           tripleValue = {
                               source: tempSub,
@@ -291,11 +291,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       });
                   } else {
                       tempObj = getLabel(displayDeustch, element["rdfs:subClassOf"]["@id"]);
-                      if (tempObj === "noLabel") {
+                      /*if (tempObj === "noLabel") {
                           tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
                           tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                      }
+                      }*/
                       tripleValue = {
                           source: tempSub,
                           predicate: pred,
@@ -317,31 +317,31 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                   if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
                       element["rdfs:domain"].forEach(function(eachIds) {
                           tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          if (tempDomainLabel === "noLabel") {
+                         /* if (tempDomainLabel === "noLabel") {
                               tempLabelArray = eachIds["@id"].split("/");
                               tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               tempDomainLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                          }
+                          }*/
                           tempDomainArray.push(tempDomainLabel);
                       });
                   } else {
                       tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
-                      if (tempSub === "noLabel") {
+                      /*if (tempSub === "noLabel") {
                           tempLabelArray = element["rdfs:domain"]["@id"].split("/");
                           tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           tempSub = tempLabelArray1[tempLabelArray1.length - 1];
-                      }
+                      }*/
                   }
               }
 
               //get the predicate
               if (element["rdfs:domain"] !== undefined) {
                   tempPred = getLabel(displayDeustch, element["@id"]);
-                  if (tempPred === "noLabel") {
+                  /*if (tempPred === "noLabel") {
                       tempLabelArray = element["@id"].split("/");
                       tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                       tempPred = tempLabelArray1[tempLabelArray1.length - 1];
-                  }
+                  }*/
               }
 
 
@@ -349,26 +349,29 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               if (element["rdfs:range"] !== undefined) {
                   if ("@id" in element["rdfs:range"]) {
                       tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
-                      if (tempObj === "noLabel") {
+                      /*if (tempObj === "noLabel") {
                           tempLabelArray = element["rdfs:range"]["@id"].split("/");
                           tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                      }
+                      }*/
                   }
               }
 
               isLitteral = false;
               literalDataType = tempObj;
 
-              if (tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean") || tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime")) {
-                  tempObj = tempObj + literalIndex;
+              //if (tempObj.toLowerCase() === "string" || tempObj.toLowerCase() === "boolean" || tempObj.toLowerCase() === "integer" || tempObj.toLowerCase() === "date" || tempObj.toLowerCase() === "datetime") {
+                if (tempObj.toLowerCase().includes("xsd:"))
+                { tempObj = tempObj + literalIndex;
                   literalIndex = literalIndex + 1;
                   isLitteral = true;
+                  console.log("abcd =================" +tempObj);
               }
 
               if (tempDomainArray.length !== 0) {
                   tempDomainArray.forEach(function(el) {
-                      if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
+                      if (el !== "?" && tempPred !== "?" && tempObj !== "?") 
+                      {
                           if (isLitteral) {
                               tripleValue = {
                                   source: el,
@@ -391,7 +394,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       }
                   });
               } else {
-                  if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
+                  if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") 
+                  {
                       if (isLitteral) {
                           tripleValue = {
                               source: tempSub,
@@ -501,11 +505,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
                           element["rdfs:domain"].forEach(function(eachIds) {
                               tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                              if (tempDomainLabel === "noLabel") {
+                              /*if (tempDomainLabel === "noLabel") {
                                   tempLabelArray = eachIds["@id"].split("/");
                                   tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                                   tempDomainLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                              }
+                              }*/
 
                               if (clickedNodeLabel === tempDomainLabel) {
                                   includeThis = true;
@@ -515,11 +519,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                           });
                       } else {
                           tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
-                          if (tempSub === "noLabel") {
+                          /*if (tempSub === "noLabel") {
                               tempLabelArray = element["rdfs:domain"]["@id"].split("/");
                               tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               tempSub = tempLabelArray1[tempLabelArray1.length - 1];
-                          }
+                          }*/
 
                           if (clickedNodeLabel === tempSub) {
                               includeThis = true;
@@ -531,32 +535,35 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       //get the predicate
                       if (element["rdfs:domain"] !== undefined) {
                           tempPred = getLabel(displayDeustch, element["@id"]);
-                          if (tempPred === "noLabel") {
+                          /*if (tempPred === "noLabel") {
                               tempLabelArray = element["@id"].split("/");
                               tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               tempPred = tempLabelArray1[tempLabelArray1.length - 1];
-                          }
+                          }*/
                       }
 
                       //get the object  range
                       if (element["rdfs:range"] !== undefined) {
                           if ("@id" in element["rdfs:range"]) {
                               tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
-                              if (tempObj === "noLabel") {
+                             /* if (tempObj === "noLabel") {
                                   tempLabelArray = element["rdfs:range"]["@id"].split("/");
                                   tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                                   tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                              }
+                              }*/
                           }
                       }
 
                       isLitteral = false;
                       literalDataType = tempObj;
 
-                      if (tempObj.toLowerCase().includes("string") || tempObj.toLowerCase().includes("boolean") || tempObj.toLowerCase().includes("integer") || tempObj.toLowerCase().includes("datetime")) {
-                          tempObj = tempObj + literalIndex;
+                      //if (tempObj.toLowerCase() === "string" || tempObj.toLowerCase() === "boolean" || tempObj.toLowerCase() === "integer" || tempObj.toLowerCase() === "date" || tempObj.toLowerCase() === "datetime") {
+                       if (tempObj.toLowerCase().includes("xsd:"))
+                       {
+                              tempObj = tempObj + literalIndex;
                           literalIndex = literalIndex + 1;
                           isLitteral = true;
+                          console.log("====================xyz = " +tempObj);
                       }
 
                       if (!tempDomainArray.length === 0) {
@@ -766,7 +773,20 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               .style("font-size", "80%")
               .style("font-style", "italic")
               .attr("x", 12)
-              .attr("y", 3);
+              .attr("y", 3) 
+              /*.attr("x", function(d) {
+                  
+                  return 4 + (d.source.x + d.target.x) / 2;
+                //return Math.random() * (+120 - +30) + +30 + (d.source.x + d.target.x) / 2;
+                })
+              .attr("y", function(d) {
+                //return 4 + (d.source.y + d.target.y) / 2;
+
+                console.log(Math.random() * (+120 - +30) + +30 + (d.source.x + d.target.y / 2));
+                return Math.random() * (+120 - +30) + +30 + (d.source.x + d.target.y) /2;
+              })*/
+              ;
+
 
           linkTexts.append("title")
               .text(function(d) {
@@ -871,6 +891,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               .text(function(d) {
                   var returnValue = "Node : " + d.id;
                   if (d.isLitteral) {
+                      if( d.literalDataType == "dateTime")
+                      {
+                        console.log(d.id + " type = "+d.literalDataType);
+                      }
+                    
                       returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
                   } else {
                       returnValue = "Node : " + d.id;
@@ -1021,11 +1046,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       var tempIndexSubClassof = 1;
                       tempNodeContains["rdfs:subClassOf"].forEach(function(eachIds) {
                           var subClassLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          if (subClassLabel == "noLabel") {
+                          /*if (subClassLabel == "noLabel") {
                               var tempLabelArray = eachIds["@id"].split("/");
                               var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               subClassLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                          }
+                          }*/
 
                           nodeSubClass.append("text")
                               .text(" " + tempIndexSubClassof + ". " + subClassLabel + "\n")
@@ -1039,11 +1064,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       });
                   } else {
                       var subClassLabel = getLabel(displayDeustch, tempNodeContains["rdfs:subClassOf"]["@id"]);
-                      if (subClassLabel == "noLabel") {
+                      /*if (subClassLabel == "noLabel") {
                           var tempLabelArray = tempNodeContains["rdfs:subClassOf"]["@id"].split("/");
                           var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           subClassLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                      }
+                      }*/
 
                       nodeSubClass.append("text")
                           .text(" " + subClassLabel + "\n")
@@ -1062,11 +1087,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       var tempIndexdomain = 1;
                       tempNodeContains["rdfs:domain"].forEach(function(eachIds) {
                           var domainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          if (domainLabel === "noLabel") {
+                          /*if (domainLabel === "noLabel") {
                               var tempLabelArray = eachIds["@id"].split("/");
                               var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               domainLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                          }
+                          }*/
 
                           nodeDomain.append("text")
                               .text(" " + tempIndexdomain + ". " + domainLabel + "\n")
@@ -1080,11 +1105,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       });
                   } else {
                       var domainLabel = getLabel(displayDeustch, tempNodeContains["rdfs:domain"]["@id"]);
-                      if (domainLabel === "noLabel") {
+                      /*if (domainLabel === "noLabel") {
                           var tempLabelArray = tempNodeContains["rdfs:domain"]["@id"].split("/");
                           var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           domainLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                      }
+                      }*/
 
                       nodeDomain.append("text")
                           .text(" " + domainLabel + "\n")
@@ -1104,11 +1129,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       var tempIndexRange = 1;
                       tempNodeContains["rdfs:range"].forEach(function(eachIds) {
                           var rangeLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          if (rangeLabel === "noLabel") {
+                          /*if (rangeLabel === "noLabel") {
                               var tempLabelArray = eachIds["@id"].split("/");
                               var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                               rangeLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                          }
+                          }*/
 
                           nodeRange.append("text")
                               .text(" " + tempIndexRange + ". " + rangeLabel + "\n")
@@ -1122,11 +1147,11 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       });
                   } else {
                       var rangeLabel = getLabel(displayDeustch, tempNodeContains["rdfs:range"]["@id"]);
-                      if (rangeLabel === "noLabel") {
+                      /*if (rangeLabel === "noLabel") {
                           var tempLabelArray = tempNodeContains["rdfs:range"]["@id"].split("/");
                           var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                           rangeLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                      }
+                      }*/
 
                       nodeRange.append("text")
                           .text(" " + rangeLabel + "\n")
diff --git a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
index 07fc2d4c9..02d568f24 100644
--- a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
+++ b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
@@ -13,93 +13,156 @@
   "@graph": [
     {
       "@id": "dbo:deathPlace",
-      "@type": "owl:DatatypeProperty"
+      "@type": [
+        "owl:ObjectProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:domain": {
+        "@id": "dbo:Person"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Death Place"
+      },
+      "rdfs:range": {
+        "@id": "dbo:Place"
+      }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/internalInformation",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:comment": "Internal information about the resource",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Internal Information"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "time:hasBeginning",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:ObjectProperty"
+      ],
+      "rdfs:comment": "Describes the beginning time of a temporal entity",
+      "rdfs:domain": {
+        "@id": "time:DateTimeInterval"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "startsAt"
+      },
+      "rdfs:range": {
+        "@id": "time:Instant"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent",
       "@type": "owl:Class",
       "rdfs:label": [
         {
-          "@language": "en",
-          "@value": "SoldierLiteratureInfo"
+          "@language": "de",
+          "@value": "Soldatendekoration Info"
         },
         {
-          "@language": "de",
-          "@value": "SoldatenLiteratur Info"
+          "@language": "en",
+          "@value": "DecorationEvent"
         }
       ],
       "rdfs:subClassOf": [
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
         },
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
         }
       ]
     },
     {
-      "@id": "time:hasBeginning",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Describes the beginning time of a temporal entity",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargeReason",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:comment": "Reason of Soldier's discharge",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
+      },
       "rdfs:label": {
         "@language": "en",
-        "@value": "startsAt"
+        "@value": "Discharge Reason"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment",
       "@type": "owl:Class",
       "rdfs:label": [
         {
           "@language": "de",
-          "@value": "Orden"
+          "@value": "Dienststellung"
         },
         {
           "@language": "en",
-          "@value": "Decoration"
+          "@value": "Regiment"
         }
       ],
       "rdfs:subClassOf": [
         {
           "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
         },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timeframable"
-        },
         {
           "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
         }
       ]
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunctionInfo",
-      "@type": "owl:ObjectProperty",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/deathPlaceStr",
+      "@type": "owl:DatatypeProperty",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo"
-      },
-	  "rdfs:label": {
+      "rdfs:label": {
         "@language": "en",
-        "@value": "NSDAPFunctionInfo"
+        "@value": "Death Place(Plain text)"
       },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
+      "rdfs:range": {
+        "@id": "xsd:string"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/listPageNumber",
+      "@id": "dc:title",
+      "@type": "owl:AnnotationProperty"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalDALId",
       "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
       ],
+      "rdfs:comment": "Information about the ID number used in the original list of the SS Soldiers",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "listPageNumber"
+        "@value": "Original DAL Id"
       },
       "rdfs:range": {
         "@id": "xsd:positiveInteger"
@@ -109,154 +172,145 @@
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable",
       "@type": "owl:Class",
+      "dc:description": {
+        "@language": "en",
+        "@value": "Describes a specific point in time"
+      },
       "rdfs:label": {
         "@language": "en",
-        "@value": "SoldierNSDAPFunctionInfo"
+        "@value": "Timestampable"
       },
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
-        }
-      ]
+      "rdfs:subClassOf": {
+        "@id": "owl:Thing"
+      }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/author",
-      "@type": "owl:DatatypeProperty",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPNumber",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:comment": "Soldier's NSDAP number in",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "author"
+        "@value": "NSDAP Number"
       },
       "rdfs:range": {
-        "@id": "xsd:string"
+        "@id": "xsd:positiveInteger"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRegiment",
-      "@type": "owl:ObjectProperty",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRankInfo",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "Soldier Rank Info"
+        },
+        {
+          "@language": "de",
+          "@value": "Soldat Rang Info"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/status",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Internal editing status",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "hasRegiment"
+        "@value": "processing status"
       },
       "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment"
+        "@id": "xsd:string"
       },
       "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
+        "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasSSRank",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDecoration",
       "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Details of Decoration given at a DecorationEvent",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierSSRankInfo"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "hasSSRank"
+        "@value": "Has Decoration"
       },
       "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSRank"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSRank",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "SSRang"
-        },
-        {
-          "@language": "en",
-          "@value": "SSRank"
-        }
-      ],
-      "rdfs:subClassOf": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable",
-      "@type": "owl:Class",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/",
+      "@type": "owl:Ontology",
       "dc:description": {
         "@language": "en",
-        "@value": "Describes the entity which can be discharged with a reason i.e. Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Dischargable"
-      },
-      "rdfs:subClassOf": {
-        "@id": "owl:Thing"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/applicableFrom",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Date on which a Soldier was given a Medal/Decoration.",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        "@value": "Vocabulary describing Concepts and Relationships of Schutzstaffel"
       },
-      "rdfs:label": {
+      "dc:title": {
         "@language": "en",
-        "@value": "applicableFrom"
-      },
-      "rdfs:range": {
-        "@id": "xsd:dateTime"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
+        "@value": "SS Vocabulary"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/internalInformation",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/id",
       "@type": [
         "owl:DatatypeProperty",
         "owl:FunctionalProperty"
       ],
+      "rdfs:comment": "Unique ID of an SSClass resource",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "internalInformation"
+        "@value": "id"
       },
       "rdfs:range": {
-        "@id": "xsd:string"
+        "@id": "xsd:positiveInteger"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/name",
-      "@type": "owl:DatatypeProperty",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipType",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:comment": "Additional information on the SS membership number",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "name"
+        "@value": "Membership Type"
       },
       "rdfs:range": {
         "@id": "xsd:string"
@@ -266,59 +320,130 @@
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dataDifference",
-      "@type": "owl:DatatypeProperty",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrolledOn",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:comment": "Date of Soldier's enrollment",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "Difference from DAL"
+        "@value": "Enrolled On"
       },
       "rdfs:range": {
-        "@id": "xsd:string"
+        "@id": "xsd:dateTime"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrolledOn",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDischargeInfo",
       "@type": [
-        "owl:DatatypeProperty",
+        "owl:ObjectProperty",
         "owl:FunctionalProperty"
       ],
+      "rdfs:comment": "Reason of Soldier's discharge",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "enrolledOn"
+        "@value": "Soldier Discharge Info"
       },
       "rdfs:range": {
-        "@id": "xsd:dateTime"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo"
       },
       "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
+        "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/citaviId",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Citavi Database Id"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "Soldier"
+        },
+        {
+          "@language": "de",
+          "@value": "Soldat"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "dbo:Person"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "SoldierRegimentInfo"
+        },
+        {
+          "@language": "de",
+          "@value": "Soldatendienststellung Info"
+        }
+      ],
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        }
+      ]
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRegiment",
+      "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Details of the Regiment",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Has Regiment"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment"
+      },
       "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
+        "@id": "owl:topObjectProperty"
       }
     },
+    {
+      "@id": "dbo:lastName",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "dbo:Person"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Last Name"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      }
+    },
+    {
+      "@id": "time:DateTimeInterval",
+      "@type": "owl:Class"
+    },
     {
       "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/origin",
       "@type": "owl:DatatypeProperty",
@@ -338,17 +463,60 @@
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargeReason",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasGovernmentFunction",
+      "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Details of Government Function",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo"
+      },
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "hasGovernmentFunction"
+        },
+        {
+          "@language": "en",
+          "@value": "Has Govt Function"
+        }
+      ],
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasNSDAPFunction",
+      "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Details of NSDAP Function",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Has NSDAP Function"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/title",
       "@type": [
         "owl:DatatypeProperty",
         "owl:FunctionalProperty"
       ],
+      "rdfs:comment": "Academic title, ex: Dr., Prof. Dr.",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "dischargeReason"
+        "@value": "title"
       },
       "rdfs:range": {
         "@id": "xsd:string"
@@ -358,21 +526,51 @@
       }
     },
     {
-      "@id": "time:TemporalEntity",
-      "@type": "owl:Class" ,"rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "TemporalEntity"
-        },
-        {
-          "@language": "de",
-          "@value": "TemporalEntity"
-        }
-      ]
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipNumber",
+      "@type": [
+        "owl:DatatypeProperty",
+        "owl:FunctionalProperty"
+      ],
+      "rdfs:comment": "NSDAP membership number",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "membershipNumber"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/sortation",
+      "@type": [
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
+      ],
+      "rdfs:comment": "Sortation of the Rank",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Rank"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "sortation"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/verifiedData",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DALVerified",
       "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Verification status of data against DAL",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
@@ -388,183 +586,122 @@
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction",
       "@type": "owl:Class",
       "rdfs:label": [
         {
-          "@language": "de",
-          "@value": "Soldatenregierungsfunktion Info"
+          "@language": "en",
+          "@value": "GovernmentFunction"
         },
         {
-          "@language": "en",
-          "@value": "SoldierGovernmentFunctionInfo"
+          "@language": "de",
+          "@value": "Regierungsfunktion"
         }
       ],
       "rdfs:subClassOf": [
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
         },
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
         }
       ]
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargedOn",
+      "@id": "dbo:birthPlace",
       "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
+        "owl:DatatypeProperty",
+        "owl:ObjectProperty"
       ],
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+        "@id": "dbo:Person"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "dischargedOn"
+        "@value": "Birth Place"
       },
       "rdfs:range": {
-        "@id": "xsd:dateTime"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
+        "@id": "dbo:Place"
       }
     },
     {
-      "@id": "dbo:lastName",
-      "@type": "owl:DatatypeProperty"
+      "@id": "dc:description",
+      "@type": "owl:AnnotationProperty"
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/literatureInfo",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRank",
       "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Details of the Rank",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRankInfo"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Has Rank"
       },
       "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Rank"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasLiterature",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/governmentFunctionInfo",
       "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Soldier's function in the government",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "hasLiterature"
+        "@value": "Soldier Govt Function"
       },
       "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass",
-      "@type": "owl:Class",
-      "dc:description": {
-        "@language": "en",
-        "@value": "Top level resource of SS Ontology"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "SSClass"
-      },
-      "rdfs:subClassOf": {
-        "@id": "owl:Thing"
-      }
+      "@id": "time:Instant",
+      "@type": "owl:Class"
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrollmentReason",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalDALPage",
       "@type": [
         "owl:DatatypeProperty",
         "owl:FunctionalProperty"
       ],
+      "rdfs:comment": "Page number of the original list where the information about the Soldier is given",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "enrollmentReason"
+        "@value": "Original DAL Page"
       },
       "rdfs:range": {
-        "@id": "xsd:string"
+        "@id": "xsd:positiveInteger"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topDataProperty"
       }
     },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction",
-      "@type": "owl:Class",
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "NSDAPFunction"
-      },
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "Soldatenentlassung Info"
-        },
-        {
-          "@language": "en",
-          "@value": "SoldierDischargeInfo"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "Literatur"
-        },
-        {
-          "@language": "en",
-          "@value": "Literature"
-        }
-      ],
-      "rdfs:subClassOf": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      }
-    },
     {
       "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/information",
       "@type": [
         "owl:FunctionalProperty",
         "owl:DatatypeProperty"
       ],
+      "rdfs:comment": "Information about the resource",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "information"
+        "@value": "Information"
       },
       "rdfs:range": {
         "@id": "xsd:string"
@@ -576,6 +713,7 @@
     {
       "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/signature",
       "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Signature of the Literature",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
       },
@@ -590,19 +728,16 @@
         "@id": "owl:topDataProperty"
       }
     },
-    {
-      "@id": "dbo:birthPlace",
-      "@type": "owl:DatatypeProperty"
-    },
     {
       "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/publicationYear",
       "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Publication year of the Literature",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "publicationYear"
+        "@value": "Year of Publication"
       },
       "rdfs:range": {
         "@id": "xsd:positiveInteger"
@@ -612,259 +747,211 @@
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/governmentFunctionInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo"
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction",
+      "@type": "owl:Class",
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "NSDAPFunction"
       },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        }
+      ]
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/deathDate",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
+      "@id": "dbo:birthDate",
+      "@type": "owl:DatatypeProperty",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+        "@id": "dbo:Person"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "deathDate"
+        "@value": "Birth Date"
       },
       "rdfs:range": {
-        "@id": "xsd:dateTime"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
+        "@id": "xsd:date"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSRankInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierSSRankInfo"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature",
+      "@type": "owl:Class",
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "Literature"
+        },
+        {
+          "@language": "de",
+          "@value": "Literatur"
+        }
+      ],
+      "rdfs:subClassOf": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo",
       "@type": "owl:Class",
       "rdfs:label": [
         {
           "@language": "en",
-          "@value": "GovernmentFunction"
+          "@value": "SoldierDischargeInfo"
         },
         {
           "@language": "de",
-          "@value": "Regierungsfunktion"
+          "@value": "Soldatenentlassung Info"
         }
       ],
       "rdfs:subClassOf": [
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
         },
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
         }
       ]
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/regimentInfo",
-      "@type": "owl:ObjectProperty",
+      "@id": "dbo:deathDate",
+      "@type": "owl:DatatypeProperty",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+        "@id": "dbo:Person"
       },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo"
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Death Date"
       },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
+      "rdfs:range": {
+        "@id": "xsd:date"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/sortation",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasLiterature",
+      "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Details of the Literature",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSRank"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "sortation"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
       },
+      "rdfs:label": [
+        {
+          "@language": "en",
+          "@value": "hasLiterature"
+        },
+        {
+          "@language": "en",
+          "@value": "Has Literature"
+        }
+      ],
       "rdfs:range": {
-        "@id": "xsd:positiveInteger"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
       },
       "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
+        "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipNumber",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable",
+      "@type": "owl:Class",
+      "dc:description": {
+        "@language": "en",
+        "@value": "Describes entities which have an abbreviated name"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "membershipNumber"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
+        "@value": "Abbreviable"
       },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
+      "rdfs:subClassOf": {
+        "@id": "owl:Thing"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasNSDAPFunction",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/literatureInfo",
       "@type": "owl:ObjectProperty",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "hasNSDAPFunction"
+        "@value": "Soldier Literature"
       },
       "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/birthDate",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunctionInfo",
+      "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Soldier's function in NSDAP",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "birthDate"
+        "@value": "Soldier NSDAP Function"
       },
       "rdfs:range": {
-        "@id": "xsd:dateTime"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo"
       },
       "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
+        "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Rank",
       "@type": "owl:Class",
       "rdfs:label": [
         {
           "@language": "de",
-          "@value": "Soldat"
+          "@value": "Rang"
         },
         {
           "@language": "en",
-          "@value": "Soldier"
+          "@value": "Rank"
         }
       ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
-        },
-        {
-          "@id": "dbo:Person"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/id",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:domain": {
+      "rdfs:subClassOf": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "id"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasTitle",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "hasTitle"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/title",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargedOn",
       "@type": [
         "owl:FunctionalProperty",
         "owl:DatatypeProperty"
       ],
+      "rdfs:comment": "Date of Soldier's discharge",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "title"
+        "@value": "Discharged On"
       },
       "rdfs:range": {
-        "@id": "xsd:string"
+        "@id": "xsd:dateTime"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo",
       "@type": "owl:Class",
       "rdfs:label": [
         {
           "@language": "de",
-          "@value": "Soldatendienststellung Info"
+          "@value": "Soldatenregierungsfunktion Info"
         },
         {
           "@language": "en",
-          "@value": "SoldierRegimentInfo"
+          "@value": "SoldierGovernmentFunctionInfo"
         }
       ],
       "rdfs:subClassOf": [
@@ -877,50 +964,36 @@
       ]
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalSoldierId",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/divergentDAL",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Differences observed from the original dataset",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "originalSoldierId"
+        "@value": "Divergent DAL"
       },
       "rdfs:range": {
-        "@id": "xsd:positiveInteger"
+        "@id": "xsd:string"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDischargeInfo",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrollmentReason",
       "@type": [
-        "owl:ObjectProperty",
-        "owl:FunctionalProperty"
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
       ],
+      "rdfs:comment": "Reason of Soldier's enrollment",
       "rdfs:domain": {
         "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/abbreviation",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
-      },
       "rdfs:label": {
         "@language": "en",
-        "@value": "abbreviation"
+        "@value": "Enrollment Reason"
       },
       "rdfs:range": {
         "@id": "xsd:string"
@@ -930,32 +1003,36 @@
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/",
-      "@type": "owl:Ontology",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass",
+      "@type": "owl:Class",
       "dc:description": {
         "@language": "en",
-        "@value": "Vocabulary describing Concepts and Relationships of Schutzstaffel"
+        "@value": "Top level resource of SS Ontology"
       },
-      "dc:title": {
+      "rdfs:label": {
         "@language": "en",
-        "@value": "SS Vocabulary"
+        "@value": "SSClass"
+      },
+      "rdfs:subClassOf": {
+        "@id": "owl:Thing"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipType",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "XML has no occurence of this column.",
+      "@id": "dbo:Place",
+      "@type": "owl:Class"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/name",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Name of the resource",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "membershipType"
+        "@value": "Name"
       },
-      "rdfs:range": { 
+      "rdfs:range": {
         "@id": "xsd:string"
       },
       "rdfs:subPropertyOf": {
@@ -963,14 +1040,15 @@
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/status",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/abbreviation",
       "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Abbreviation of the Abbreviable resource",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "processing status"
+        "@value": "Abbreviation"
       },
       "rdfs:range": {
         "@id": "xsd:string"
@@ -980,177 +1058,202 @@
       }
     },
     {
-      "@id": "dbo:Person",
-      "@type": "owl:Class",
-	  "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "Person"
-        },
-        {
-          "@language": "de",
-          "@value": "Person"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDecoration",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/rankInfo",
       "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Soldier'r rank in SS",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "hasDecoration"
+        "@value": "Soldier Rank"
       },
       "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRankInfo"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPNumber",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/applicableFrom",
       "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
+        "owl:ObjectProperty",
+        "owl:FunctionalProperty",
+        "owl:DatatypeProperty"
       ],
+      "rdfs:comment": "Date from which a Decoration/Rank/Literature/Regiment is recorded.",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "NSDAP Number"
+        "@value": "Applicable From"
       },
       "rdfs:range": {
-        "@id": "xsd:positiveInteger"
+        "@id": "time:Instant"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topDataProperty"
       }
     },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable",
-      "@type": "owl:Class",
-      "dc:description": {
-        "@language": "en",
-        "@value": "Describes a specific point in time"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Timestampable"
-      },
-      "rdfs:subClassOf": {
-        "@id": "owl:Thing"
-      }
-    },
     {
       "@id": "time:hasEnd",
-      "@type": "owl:DatatypeProperty",
+      "@type": [
+        "owl:ObjectProperty",
+        "owl:DatatypeProperty"
+      ],
       "rdfs:comment": "Describes the ending time of a temporal entity",
+      "rdfs:domain": {
+        "@id": "time:DateTimeInterval"
+      },
       "rdfs:label": {
         "@language": "en",
         "@value": "endsAt"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/decorationInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
+        "@id": "time:Instant"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasGovernmentFunction",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/regimentInfo",
       "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Soldier's Regiment",
       "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "hasGovernmentFunction"
+        "@value": "Soldier Regiment"
       },
       "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction"
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo"
       },
       "rdfs:subPropertyOf": {
         "@id": "owl:topObjectProperty"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timeframable",
+      "@id": "xsd:date",
+      "@type": "rdfs:Datatype"
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable",
       "@type": "owl:Class",
       "dc:description": {
         "@language": "en",
-        "@value": "Describes temporal entities, i.e with a beginning and end in time"
+        "@value": "Describes the entity which can be discharged with a reason i.e. Soldier"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "Timeframable"
+        "@value": "Dischargable"
       },
       "rdfs:subClassOf": {
-        "@id": "time:TemporalEntity"
+        "@id": "owl:Thing"
       }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable",
-      "@type": "owl:Class",
-      "dc:description": {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/birthPlaceStr",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
         "@language": "en",
-        "@value": "Describes entities which have an abbreviated name"
+        "@value": "Birth Place(Plain text)"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/author",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Author of a Literature",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
       },
       "rdfs:label": {
         "@language": "en",
-        "@value": "Abbreviable"
+        "@value": "Author"
       },
-      "rdfs:subClassOf": {
-        "@id": "owl:Thing"
+      "rdfs:range": {
+        "@id": "xsd:string"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
       }
     },
     {
-      "@id": "dc:description",
-      "@type": "owl:AnnotationProperty"
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo",
+      "@type": "owl:Class",
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "SoldierNSDAPFunctionInfo"
+      },
+      "rdfs:subClassOf": [
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+        },
+        {
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+        }
+      ]
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/citaviId",
+      "@type": "owl:DatatypeProperty",
+      "rdfs:comment": "Unique ID of a Literature in the Citavi database",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Citavi Database Id"
+      },
+      "rdfs:range": {
+        "@id": "xsd:positiveInteger"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topDataProperty"
+      }
+    },
+    {
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration",
       "@type": "owl:Class",
       "rdfs:label": [
         {
           "@language": "en",
-          "@value": "DecorationEvent"
+          "@value": "Decoration"
         },
         {
           "@language": "de",
-          "@value": "Soldatendekoration Info"
+          "@value": "Orden"
         }
       ],
       "rdfs:subClassOf": [
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
         },
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+        },
+        {
+          "@id": "time:DateTimeInterval"
         }
       ]
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment",
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo",
       "@type": "owl:Class",
       "rdfs:label": [
         {
           "@language": "de",
-          "@value": "Dienststellung"
+          "@value": "SoldatenLiteratur Info"
         },
         {
           "@language": "en",
-          "@value": "Regiment"
+          "@value": "SoldierLiteratureInfo"
         }
       ],
       "rdfs:subClassOf": [
@@ -1158,33 +1261,44 @@
           "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
         },
         {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
+          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
         }
       ]
     },
     {
-      "@id": "dc:title",
-      "@type": "owl:AnnotationProperty"
+      "@id": "dbo:Person",
+      "@type": "owl:Class"
     },
     {
       "@id": "dbo:firstName",
-      "@type": "owl:DatatypeProperty"
+      "@type": "owl:DatatypeProperty",
+      "rdfs:domain": {
+        "@id": "dbo:Person"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "First Name"
+      },
+      "rdfs:range": {
+        "@id": "xsd:string"
+      }
     },
     {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierSSRankInfo",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "Soldat SS Rang Info"
-        },
-        {
-          "@language": "en",
-          "@value": "Soldier SS Rank Info"
-        }
-      ],
-      "rdfs:subClassOf": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
+      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/decorationInfo",
+      "@type": "owl:ObjectProperty",
+      "rdfs:comment": "Medal acquired by a Soldier",
+      "rdfs:domain": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
+      },
+      "rdfs:label": {
+        "@language": "en",
+        "@value": "Soldier Decoration"
+      },
+      "rdfs:range": {
+        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent"
+      },
+      "rdfs:subPropertyOf": {
+        "@id": "owl:topObjectProperty"
       }
     }
   ]

From 38d76d918553ecbe1cc0aab8376e34e7cf1d7b85 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Fri, 3 Jan 2020 14:12:01 +0100
Subject: [PATCH 44/66] resolving push conflicts.

---
 .../rdf-ontology-view.component.html          | 339 +++++++++---------
 .../rdf-ontology-view.component.ts            |   5 +-
 ida-ws/src/main/java/upb/ida/Application.java |  34 +-
 .../src/main/java/upb/ida/fdg/FDG_Util.java   | 330 ++++++++---------
 4 files changed, 359 insertions(+), 349 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 9fba29e3a..7bcbdcfcf 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,180 +1,191 @@
 <mat-tab-group style="min-width: 40vw;max-height: 100vh">
   <mat-tab label="Ontology Explorer">
-    
-    <mat-toolbar color="primary">
-      <mat-toolbar-row>
-        <div style="width: 100%; height: 20%;">
-          <h1 align='center'>Historian Ontology Graph</h1>
-        </div>
-      </mat-toolbar-row>
-
-      <mat-toolbar-row class="filtersRowID">
-        <div id="filtersId" style="width: 99%;height: 40px;border-radius: 8px;background-color: #b7cad7;">
-          <mat-label class="labelClass">
-            Filters:
-          </mat-label>
-
-          <mat-label class="labelClass">Display in Deutsch</mat-label>
+    <div [attr.id]="fdgId1" fxFlexstyle="height: 150vh; margin: 20px;border-color: #eaeaea;border-style: solid">
+
+      <div style="width: 100%; height: 20%;">
+        <h1 align='center'>Historian Ontology Graph</h1>
+      </div>
+      <div id="filtersId"
+        style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">
+        <label class="labelClass">
+          Filters:
+
+        </label>
+        <label class="labelClass">
+          Display in Deutsch
           <input class="checkboxClass" type="checkbox" [(ngModel)]="languageCheked"
-              (change)="checkboxValuesChanged(isChecked)" />
-          
-          <mat-label class="labelClass">Include Class Hierarchy</mat-label>
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          Include Class Hierarchy
           <input class="checkboxClass" type="checkbox" [(ngModel)]="classHeirarchyChecked" value="1"
-              (change)="checkboxValuesChanged(isChecked)" />
-          
-          <mat-label class="labelClass">Include All Properties</mat-label>
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          Include All Properties
           <input class="checkboxClass" type="checkbox" [(ngModel)]="allPropChecked"
-              (change)="checkboxValuesChanged(isChecked)" />
-          
-          
-          <mat-label class="labelClass">Bounded Graph</mat-label>
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          Bounded Graph
           <input class="checkboxClass" type="checkbox" [(ngModel)]="allNodesInBoundClicked"
-              (change)="checkboxValuesChanged(isChecked)" />
-          
-          <mat-label class="labelClass">Disable Zoom</mat-label>
-            <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked"
-              (change)="checkboxValuesChanged(isChecked)" />
-
-          <mat-label class="labelClass">
-            <button mat-raised-button #graphReset (click)="graphResetChanged($event)"
-              style="border-radius: 8px;padding-top: 3px;">
-              Reset Graph
-            </button>
-          </mat-label>
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          Disable Zoom
+          <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked"
+            (change)="checkboxValuesChanged(isChecked)" />
+        </label>
+        <label class="labelClass">
+          <button #graphReset (click)="graphResetChanged($event)"
+            style="width: 8%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:whitesmoke;">
+            Reset Graph
+          </button>
+        </label>
+      </div>
+      <br />
+      <div id="filtersId"
+        style="display: block;float: right;width:24.5%; height: 1053px;background-color:#F2F3F4;border-radius: 8px;">
+
+        <div id="nodeInformationId"
+          style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
+          <label class="inputLabelClass">
+            Node Information:
+          </label>
+          <br />
         </div>
-      </mat-toolbar-row>
-    </mat-toolbar> 
-    
-    <!--START :: main container grid -->
-    <mat-drawer-container class="ontologyMainContainer" autosize>
-      <mat-drawer #drawer class="rightSideContainer" mode="side" position="end">
-        <mat-card>
 
-          <div id="nodeInformationId" style="border-radius: 8px;padding-top: 9px;">
-            <mat-card-title>Node Information</mat-card-title> 
+        <div id="nodeInfoTagesId" style=" text-align: justify;overflow: auto;display: block;background-color:#AED6F1;border-radius: 8px;
+                    padding-top: 10px;">
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Node:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
+            <br /><br />
           </div>
-
-          
-          <div id="nodeInfoTagesId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>Node:</mat-card-subtitle>
-              <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
-            </div>
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>Label:</mat-card-subtitle>
-              <div class="nodeInfoDiv" [attr.id]="nodeLabelId"></div>
-            </div>
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>ID:</mat-card-subtitle>
-              <div class="nodeInfoDiv" [attr.id]="nodeIdsId"></div>
-            </div>
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>Type:</mat-card-subtitle>
-              <div class="nodeInfoDiv" [attr.id]="nodeTypeId"> </div>
-            </div>
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>Description:</mat-card-subtitle>
-              <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
-            </div>
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>SubClassOf:</mat-card-subtitle>
-              <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
-            </div>
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>Domain:</mat-card-subtitle>
-              <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
-            </div>
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>Range:</mat-card-subtitle>
-              <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
-            </div>
-
-            <div class="nodeInfoDivClass">
-              <mat-card-subtitle>Comment:</mat-card-subtitle>
-              <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
-            </div>
-        
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Label:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeLabelId"></div>
+            <br /><br />
           </div>
-        </mat-card>
-
-        <mat-card>
-          <div id="graphConfigId" style="border-radius: 8px;padding-top: 9px;">
-           
-            <mat-card-title>Customize Graph</mat-card-title>
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Id:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeIdsId"></div>
+            <br /><br />
           </div>
-  
-          <div id="graphConfigInputsId" style="border-radius: 8px; padding-top: 10px;">
-            
-            <mat-card-subtitle>Edge Size:
-              <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
-            </mat-card-subtitle>
-            
-            <mat-card-subtitle> Graph Charge/Depth : 
-              <input type="text" class="inputTextClass" [(ngModel)]="graphCharge" placeholder=" 1000">
-            </mat-card-subtitle>
-
-            <mat-card-subtitle> Resource Node Radius: 
-              <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius" placeholder=" 10">
-            </mat-card-subtitle>
-
-            <mat-card-subtitle> Literal Node Radius: 
-              <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
-            </mat-card-subtitle>
-
-            <mat-card-subtitle>Resource Node Color: 
-              <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor" placeholder=" #311B92">
-            </mat-card-subtitle>
-
-              <mat-card-subtitle>Resource Node Text Color: 
-                <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor" placeholder=" #311B92">
-              </mat-card-subtitle>
-
-              <mat-card-subtitle>Literal Node Color:
-                 <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor" placeholder=" #FF9800">
-              </mat-card-subtitle>
-
-              <mat-card-subtitle>Literal node text color: 
-                <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor" placeholder=" #FF9800">
-              </mat-card-subtitle>
-
-            <mat-card-subtitle> Sub Class Label: 
-              <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel" placeholder=" --subClassOf--">
-              </mat-card-subtitle>
-
-              <mat-card-subtitle>Sub Class Label Color: 
-                <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor" placeholder=" #3498DB">
-              </mat-card-subtitle>
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Type:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeTypeId"> </div>
+            <br /><br />
+          </div>
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Description:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
+            <br /><br />
+          </div>
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Sub Class Of:
+            </label>
+            <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
+            <br /><br />
+          </div>
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Domain:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
+            <br /><br />
+          </div>
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Range:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
+            <br /><br />
+          </div>
+          <div class="nodeInfoDivClass">
+            <label class="inputLabelClass">
+              Comment:
+            </label>
+            <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
+            <br /><br />
+          </div>
+        </div>
 
-              <mat-card-subtitle> Property Text Color:
-                <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor"placeholder=" #28B463">
-              </mat-card-subtitle>
+        <div id="graphConfigId"
+          style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
+          <label class="inputLabelClass">
+            Customize Graph:
+          </label>
+          <br /><br />
+        </div>
 
-              <mat-card-actions>
-                  <button mat-raised-button #applyConfigBtn (click)="applyConfigClicked($event)">
-                  Apply Changes
-                </button>
-              </mat-card-actions>
-             
-          </div>
-        </mat-card>
-      </mat-drawer>
-    
-      <div class="leftSideContainer">
-       <div align="end">
-          <mat-button-toggle mat-icon-button (click)="drawer.toggle()"> <mat-icon>code</mat-icon> </mat-button-toggle>
+        <div id="graphConfigInputsId" style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
+                    padding-top: 10px;">
+          <label class="inputLabelClass">
+            Edge Size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
+          </label><br />
+          <label class="inputLabelClass">
+            Graph Charge/Depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge"
+              placeholder=" 1000">
+          </label><br />
+          <label class="inputLabelClass">
+            Resource Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius"
+              placeholder=" 10">
+          </label><br />
+          <label class="inputLabelClass">
+            Literal Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
+          </label><br />
+          <label class="inputLabelClass">
+            Resource Node Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor"
+              placeholder=" #311B92">
+          </label><br />
+          <label class="inputLabelClass">
+            Resource Node Text Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor"
+              placeholder=" #311B92">
+          </label><br />
+          <label class="inputLabelClass">
+            Literal Node Color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor"
+              placeholder=" #FF9800">
+          </label><br />
+          <label class="inputLabelClass">
+            Literal node text color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor"
+              placeholder=" #FF9800">
+          </label><br />
+          <label class="inputLabelClass">
+            Sub Class Label: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel"
+              placeholder=" --subClassOf--">
+          </label><br />
+          <label class="inputLabelClass">
+            Sub Class Label Color: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor"
+              placeholder=" #3498DB">
+          </label><br />
+          <label class="inputLabelClass">
+            Property Text Color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor"
+              placeholder=" #28B463">
+          </label><br />
+          <!--
+                <label class="inputLabelClass">
+                  On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
+                </label>--><br /> <br /><br /> <br /> <br />
+
+          <button #applyConfigBtn (click)="applyConfigClicked($event)"
+            style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
+            Apply Changes
+          </button>
         </div>
-        <div [attr.id]="ontologyId" style="background-color: #F8F9F9;border-radius: 8px;"></div>
-      </div> 
-     
-    </mat-drawer-container>    
-    <!--END :: main container grid -->
+      </div>
+      <div [attr.id]="ontologyId" style="float: left;width: 70%;background-color: #F8F9F9;border-radius: 8px;position: relative;left: 6px;"></div>
+    </div>
   </mat-tab>
 </mat-tab-group>
\ No newline at end of file
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index c5eb99438..5c1dc2223 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -22,7 +22,6 @@ export class RdfOntologyViewComponent implements OnInit {
   public nodeRangeId: string;
   public nodeCommentId: string;
 
-  expandNodeInfoCard = false;
   languageCheked = false;
   classHeirarchyChecked = true;
   allPropChecked = false;
@@ -131,7 +130,7 @@ export class RdfOntologyViewComponent implements OnInit {
     var customizeGraphVals = {edgeSize:this.edgeSize,
                               graphCharge:this.graphCharge,
                               resourceRadius:this.resourceRadius,
-                              literalRadius:this.literalRadius,
+                              literalRadius:this.literalRadius, 
                               resourceNodeColor:this.resourceNodeColor,
                               resourceNodeTextColor:this.resourceNodeTextColor,
                               literalNodeColor:this.literalNodeColor,
@@ -169,4 +168,4 @@ export class RdfOntologyViewComponent implements OnInit {
       this.allPropChecked,this.allNodesInBoundClicked,
       this.disableZoomClicked,idVal,customizeGraphVals);
   }
-}
+}
\ No newline at end of file
diff --git a/ida-ws/src/main/java/upb/ida/Application.java b/ida-ws/src/main/java/upb/ida/Application.java
index 925821cea..2b633a7fa 100644
--- a/ida-ws/src/main/java/upb/ida/Application.java
+++ b/ida-ws/src/main/java/upb/ida/Application.java
@@ -1,17 +1,17 @@
-package upb.ida;
-
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-@ImportResource({
-	"classpath:config/bean-config.xml",
-	"classpath:config/startup-config.xml"
-})
-public class Application extends SpringBootServletInitializer {
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
-}
\ No newline at end of file
+package upb.ida;
+
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+@ImportResource({
+	"classpath:config/bean-config.xml",
+	"classpath:config/startup-config.xml"
+})
+public class Application extends SpringBootServletInitializer {
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
+	}
+}
diff --git a/ida-ws/src/main/java/upb/ida/fdg/FDG_Util.java b/ida-ws/src/main/java/upb/ida/fdg/FDG_Util.java
index 2df67f069..0b20ac63e 100644
--- a/ida-ws/src/main/java/upb/ida/fdg/FDG_Util.java
+++ b/ida-ws/src/main/java/upb/ida/fdg/FDG_Util.java
@@ -1,165 +1,165 @@
-package upb.ida.fdg;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.math3.stat.StatUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import upb.ida.util.FileUtil;
-
-/**
- * Exposes util methods to perform FDG related operations
- * 
- * @author Nikit
- *
- */
-@Component
-public class FDG_Util {
-	@Autowired
-	private FileUtil dem;
-	public static final int MAX_STR = 10;
-
-	/**
-	 * Method to convert a list of triples into formatted json data for FDG
-	 * Visualization
-	 * 
-	 * @param triples
-	 *            - list of triples
-	 * @return jsonobject of data
-	 * @throws IOException
-	 * @throws JsonProcessingException
-	 */
-	public static ObjectNode getFDGData(List<FDG_Triple> triples, double[] strngthValArr)
-			throws JsonProcessingException, IOException {
-		double max = StatUtils.max(strngthValArr);
-		double min = StatUtils.min(strngthValArr);
-
-		ObjectMapper mapper = new ObjectMapper();
-		ObjectNode rootNode = mapper.createObjectNode();
-
-		ArrayNode nodeArr1 = mapper.createArrayNode();
-		ArrayNode edgeArr1 = mapper.createArrayNode();
-
-		rootNode.set("nodes", nodeArr1);
-		rootNode.set("links", edgeArr1);
-
-		Set<FDG_Node> nodeSet = new HashSet<>();
-		FDG_Node srcNd;
-		FDG_Node trgtNd;
-		ObjectNode edgeNode;
-		boolean isNew;
-		for (FDG_Triple entry : triples) {
-			srcNd = entry.getSourceNode();
-			trgtNd = entry.getTargetNode();
-			// Add nodes to the set
-			isNew = nodeSet.add(srcNd);
-			if (isNew) {
-				nodeArr1.add(mapper.readTree(mapper.writeValueAsString(srcNd)));
-			}
-			isNew = nodeSet.add(trgtNd);
-			if (isNew)
-				nodeArr1.add(mapper.readTree(mapper.writeValueAsString(trgtNd)));
-			// Add the edge
-			edgeNode = mapper.createObjectNode();
-			edgeArr1.add(edgeNode);
-			// add the properties
-			edgeNode.put("id", entry.getId());
-			edgeNode.put("source", entry.getSourceNode().getId());
-			edgeNode.put("target", entry.getTargetNode().getId());
-			edgeNode.put("str_val", calcNrmlStrngth(entry.getStrngthVal(), max, min));
-			if (entry.getLabel() != null)
-				edgeNode.put("label", entry.getLabel());
-		}
-		return rootNode;
-	}
-
-	/**
-	 * Method to generate a Json object representing a Force Directed Graph
-	 * 
-	 * @param filePath
-	 *            - path of the data file
-	 * @param srcNodeFtr
-	 *            - feature name of the source node
-	 * @param trgtNodeFtr
-	 *            - feature name of the target node
-	 * @param strngthFtr
-	 *            - feature name of the strength between nodes
-	 * @return - Json object representing a Force Directed Graph
-	 * @throws JsonProcessingException
-	 * @throws IOException
-	 * @throws ParseException
-	 */
-	public ObjectNode generateFDG(String filePath, String srcNodeFtr, String trgtNodeFtr, String strngthFtr)
-			throws JsonProcessingException, IOException, ParseException {
-		ObjectNode res = null;
-		int ndUniqueId = 1;
-		int tripUniqueId = 1;
-		File file = new File(dem.fetchSysFilePath(filePath));
-		List<FDG_Triple> tripleList = new ArrayList<>();
-
-		// Fetch the map for the file
-		List<Map<String, String>> dataMapList = dem.convertToMap(file);
-		double[] strngthValArr = new double[dataMapList.size()];
-		int sindx = 0;
-		// Create node map
-		Map<String, FDG_Node> nodeMap = new HashMap<>();
-		// Loop through the file map
-		for (Map<String, String> entry : dataMapList) {
-			String srcNdLbl = entry.get(srcNodeFtr);
-			String trgtNdLbl = entry.get(trgtNodeFtr);
-			String strngthVal = entry.get(strngthFtr);
-			// 1. Create/Fetch Source Node in/from map
-			FDG_Node srcNd = nodeMap.get(srcNdLbl);
-			if (srcNd == null) {
-				srcNd = new FDG_Node(ndUniqueId++, srcNdLbl, 1);
-				nodeMap.put(srcNdLbl, srcNd);
-			}
-			// 2. Create Target Node in/from map
-			FDG_Node trgtNd = nodeMap.get(trgtNdLbl);
-			if (trgtNd == null) {
-				trgtNd = new FDG_Node(ndUniqueId++, trgtNdLbl, 1);
-				nodeMap.put(trgtNdLbl, trgtNd);
-			}
-			Double strngthValD = Double.parseDouble(strngthVal);
-			strngthValArr[sindx++] = strngthValD;
-			// 3. Create Triple Object
-			FDG_Triple triple = new FDG_Triple(tripUniqueId++, srcNd, trgtNd, strngthValD);
-			tripleList.add(triple);
-		}
-		// Call FDGData
-		res = getFDGData(tripleList, strngthValArr);
-		return res;
-	}
-
-	/**
-	 * Method to calculate a custom normal value for a given number
-	 * 
-	 * @param num
-	 *            - number to normalize
-	 * @param max
-	 *            - maximum number in the range of numbers
-	 * @param min
-	 *            - minimum number in the range of numbers
-	 * @return - normalized value
-	 */
-	public static double calcNrmlStrngth(double num, double max, double min) {
-		double res = 0;
-		res = ((0.9) * (num - min) / (max - min)) + 0.1;
-		return res;
-	}
-
-}
+package upb.ida.fdg;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.math3.stat.StatUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import upb.ida.util.FileUtil;
+
+/**
+ * Exposes util methods to perform FDG related operations
+ *
+ * @author Nikit
+ *
+ */
+@Component
+public class FDG_Util {
+	@Autowired
+	private FileUtil dem;
+	public static final int MAX_STR = 10;
+
+	/**
+	 * Method to convert a list of triples into formatted json data for FDG
+	 * Visualization
+	 *
+	 * @param triples
+	 *            - list of triples
+	 * @return jsonobject of data
+	 * @throws IOException
+	 * @throws JsonProcessingException
+	 */
+	public static ObjectNode getFDGData(List<FDG_Triple> triples, double[] strngthValArr)
+			throws JsonProcessingException, IOException {
+		double max = StatUtils.max(strngthValArr);
+		double min = StatUtils.min(strngthValArr);
+
+		ObjectMapper mapper = new ObjectMapper();
+		ObjectNode rootNode = mapper.createObjectNode();
+
+		ArrayNode nodeArr1 = mapper.createArrayNode();
+		ArrayNode edgeArr1 = mapper.createArrayNode();
+
+		rootNode.set("nodes", nodeArr1);
+		rootNode.set("links", edgeArr1);
+
+		Set<FDG_Node> nodeSet = new HashSet<>();
+		FDG_Node srcNd;
+		FDG_Node trgtNd;
+		ObjectNode edgeNode;
+		boolean isNew;
+		for (FDG_Triple entry : triples) {
+			srcNd = entry.getSourceNode();
+			trgtNd = entry.getTargetNode();
+			// Add nodes to the set
+			isNew = nodeSet.add(srcNd);
+			if (isNew) {
+				nodeArr1.add(mapper.readTree(mapper.writeValueAsString(srcNd)));
+			}
+			isNew = nodeSet.add(trgtNd);
+			if (isNew)
+				nodeArr1.add(mapper.readTree(mapper.writeValueAsString(trgtNd)));
+			// Add the edge
+			edgeNode = mapper.createObjectNode();
+			edgeArr1.add(edgeNode);
+			// add the properties
+			edgeNode.put("id", entry.getId());
+			edgeNode.put("source", entry.getSourceNode().getId());
+			edgeNode.put("target", entry.getTargetNode().getId());
+			edgeNode.put("str_val", calcNrmlStrngth(entry.getStrngthVal(), max, min));
+			if (entry.getLabel() != null)
+				edgeNode.put("label", entry.getLabel());
+		}
+		return rootNode;
+	}
+
+	/**
+	 * Method to generate a Json object representing a Force Directed Graph
+	 *
+	 * @param filePath
+	 *            - path of the data file
+	 * @param srcNodeFtr
+	 *            - feature name of the source node
+	 * @param trgtNodeFtr
+	 *            - feature name of the target node
+	 * @param strngthFtr
+	 *            - feature name of the strength between nodes
+	 * @return - Json object representing a Force Directed Graph
+	 * @throws JsonProcessingException
+	 * @throws IOException
+	 * @throws ParseException
+	 */
+	public ObjectNode generateFDG(String filePath, String srcNodeFtr, String trgtNodeFtr, String strngthFtr)
+			throws JsonProcessingException, IOException, ParseException {
+		ObjectNode res = null;
+		int ndUniqueId = 1;
+		int tripUniqueId = 1;
+		File file = new File(dem.fetchSysFilePath(filePath));
+		List<FDG_Triple> tripleList = new ArrayList<>();
+
+		// Fetch the map for the file
+		List<Map<String, String>> dataMapList = dem.convertToMap(file);
+		double[] strngthValArr = new double[dataMapList.size()];
+		int sindx = 0;
+		// Create node map
+		Map<String, FDG_Node> nodeMap = new HashMap<>();
+		// Loop through the file map
+		for (Map<String, String> entry : dataMapList) {
+			String srcNdLbl = entry.get(srcNodeFtr);
+			String trgtNdLbl = entry.get(trgtNodeFtr);
+			String strngthVal = entry.get(strngthFtr);
+			// 1. Create/Fetch Source Node in/from map
+			FDG_Node srcNd = nodeMap.get(srcNdLbl);
+			if (srcNd == null) {
+				srcNd = new FDG_Node(ndUniqueId++, srcNdLbl, 1);
+				nodeMap.put(srcNdLbl, srcNd);
+			}
+			// 2. Create Target Node in/from map
+			FDG_Node trgtNd = nodeMap.get(trgtNdLbl);
+			if (trgtNd == null) {
+				trgtNd = new FDG_Node(ndUniqueId++, trgtNdLbl, 1);
+				nodeMap.put(trgtNdLbl, trgtNd);
+			}
+			Double strngthValD = Double.parseDouble(strngthVal);
+			strngthValArr[sindx++] = strngthValD;
+			// 3. Create Triple Object
+			FDG_Triple triple = new FDG_Triple(tripUniqueId++, srcNd, trgtNd, strngthValD);
+			tripleList.add(triple);
+		}
+		// Call FDGData
+		res = getFDGData(tripleList, strngthValArr);
+		return res;
+	}
+
+	/**
+	 * Method to calculate a custom normal value for a given number
+	 *
+	 * @param num
+	 *            - number to normalize
+	 * @param max
+	 *            - maximum number in the range of numbers
+	 * @param min
+	 *            - minimum number in the range of numbers
+	 * @return - normalized value
+	 */
+	public static double calcNrmlStrngth(double num, double max, double min) {
+		double res = 0;
+		res = ((0.9) * (num - min) / (max - min)) + 0.1;
+		return res;
+	}
+
+}

From bc86d17647e2d1687839d8b61883d19e16f8619d Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Fri, 3 Jan 2020 13:23:57 +0100
Subject: [PATCH 45/66] 1.Continued angular material changes in rdf-ontology
 components.

---
 .../rdf-ontology-view.component.html          | 335 +++++++++---------
 .../rdf-ontology-view.component.ts            |   9 +-
 2 files changed, 167 insertions(+), 177 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 7bcbdcfcf..d9c26044e 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,191 +1,180 @@
 <mat-tab-group style="min-width: 40vw;max-height: 100vh">
   <mat-tab label="Ontology Explorer">
-    <div [attr.id]="fdgId1" fxFlexstyle="height: 150vh; margin: 20px;border-color: #eaeaea;border-style: solid">
+   
+    <mat-toolbar color="primary">
+      <mat-toolbar-row>
+        <div style="width: 100%; height: 20%;">
+          <h1 align='center'>Historian Ontology Graph</h1>
+        </div>
+      </mat-toolbar-row>
 
-      <div style="width: 100%; height: 20%;">
-        <h1 align='center'>Historian Ontology Graph</h1>
-      </div>
-      <div id="filtersId"
-        style="width: 99%;height: 36px;margin-left: 3px;border-radius: 8px;background-color: #5DADE2;">
-        <label class="labelClass">
-          Filters:
-
-        </label>
-        <label class="labelClass">
-          Display in Deutsch
+      <mat-toolbar-row class="filtersRowID">
+        <div id="filtersId" style="width: 99%;height: 40px;border-radius: 8px;background-color: #b7cad7;">
+          <mat-label class="labelClass">
+            Filters:
+          </mat-label>
+
+          <mat-label class="labelClass">Display in Deutsch</mat-label>
           <input class="checkboxClass" type="checkbox" [(ngModel)]="languageCheked"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          Include Class Hierarchy
+              (change)="checkboxValuesChanged(isChecked)" />
+         
+          <mat-label class="labelClass">Include Class Hierarchy</mat-label>
           <input class="checkboxClass" type="checkbox" [(ngModel)]="classHeirarchyChecked" value="1"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          Include All Properties
+              (change)="checkboxValuesChanged(isChecked)" />
+         
+          <mat-label class="labelClass">Include All Properties</mat-label>
           <input class="checkboxClass" type="checkbox" [(ngModel)]="allPropChecked"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          Bounded Graph
+              (change)="checkboxValuesChanged(isChecked)" />
+         
+         
+          <mat-label class="labelClass">Bounded Graph</mat-label>
           <input class="checkboxClass" type="checkbox" [(ngModel)]="allNodesInBoundClicked"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          Disable Zoom
-          <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked"
-            (change)="checkboxValuesChanged(isChecked)" />
-        </label>
-        <label class="labelClass">
-          <button #graphReset (click)="graphResetChanged($event)"
-            style="width: 8%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:whitesmoke;">
-            Reset Graph
-          </button>
-        </label>
-      </div>
-      <br />
-      <div id="filtersId"
-        style="display: block;float: right;width:24.5%; height: 1053px;background-color:#F2F3F4;border-radius: 8px;">
-
-        <div id="nodeInformationId"
-          style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
-          <label class="inputLabelClass">
-            Node Information:
-          </label>
-          <br />
+              (change)="checkboxValuesChanged(isChecked)" />
+         
+          <mat-label class="labelClass">Disable Zoom</mat-label>
+            <input class="checkboxClass" type="checkbox" [(ngModel)]="disableZoomClicked"
+              (change)="checkboxValuesChanged(isChecked)" />
+
+          <mat-label class="labelClass">
+            <button mat-raised-button #graphReset (click)="graphResetChanged($event)"
+              style="border-radius: 8px;padding-top: 3px;">
+              Reset Graph
+            </button>
+          </mat-label>
         </div>
+      </mat-toolbar-row>
+    </mat-toolbar>
+   
+    <!--START :: main container grid -->
+    <mat-drawer-container class="ontologyMainContainer" autosize>
+      <mat-drawer #drawer class="rightSideContainer" mode="side" position="end">
+        <mat-card>
 
-        <div id="nodeInfoTagesId" style=" text-align: justify;overflow: auto;display: block;background-color:#AED6F1;border-radius: 8px;
-                    padding-top: 10px;">
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Node:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Label:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeLabelId"></div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Id:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeIdsId"></div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Type:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeTypeId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Description:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
-            <br /><br />
+          <div id="nodeInformationId" style="border-radius: 8px;padding-top: 9px;">
+            <mat-card-title>Node Information</mat-card-title>
           </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Sub Class Of:
-            </label>
-            <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Domain:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
-            <br /><br />
-          </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Range:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
-            <br /><br />
+
+         
+          <div id="nodeInfoTagesId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Node:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Label:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeLabelId"></div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>ID:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeIdsId"></div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Type:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeTypeId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Description:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeDescripId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>SubClassOf:</mat-card-subtitle>
+              <div class="nodeInfoDiv" style="width: 309px;" [attr.id]="nodeSubClassId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Domain:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeDomainId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Range:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeRangeId"> </div>
+            </div>
+
+            <div class="nodeInfoDivClass">
+              <mat-card-subtitle>Comment:</mat-card-subtitle>
+              <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
+            </div>
+       
           </div>
-          <div class="nodeInfoDivClass">
-            <label class="inputLabelClass">
-              Comment:
-            </label>
-            <div class="nodeInfoDiv" [attr.id]="nodeCommentId"> </div>
-            <br /><br />
+        </mat-card>
+
+        <mat-card>
+          <div id="graphConfigId" style="border-radius: 8px;padding-top: 9px;">
+           
+            <mat-card-title>Customize Graph</mat-card-title>
           </div>
-        </div>
+ 
+          <div id="graphConfigInputsId" style="border-radius: 8px; padding-top: 10px;">
+           
+            <mat-card-subtitle>Edge Size:
+              <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
+            </mat-card-subtitle>
+           
+            <mat-card-subtitle> Graph Charge/Depth :
+              <input type="text" class="inputTextClass" [(ngModel)]="graphCharge" placeholder=" 1000">
+            </mat-card-subtitle>
 
-        <div id="graphConfigId"
-          style="display: block;height: 26px;background-color:#5DADE2;border-radius: 8px;padding-top: 9px;">
-          <label class="inputLabelClass">
-            Customize Graph:
-          </label>
-          <br /><br />
-        </div>
+            <mat-card-subtitle> Resource Node Radius:
+              <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius" placeholder=" 10">
+            </mat-card-subtitle>
+
+            <mat-card-subtitle> Literal Node Radius:
+              <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
+            </mat-card-subtitle>
 
-        <div id="graphConfigInputsId" style="display: block;background-color:#AED6F1;border-radius: 8px;height: 480px;
-                    padding-top: 10px;">
-          <label class="inputLabelClass">
-            Edge Size: <input type="text" class="inputTextClass" [(ngModel)]="edgeSize" placeholder=" 50">
-          </label><br />
-          <label class="inputLabelClass">
-            Graph Charge/Depth : <input type="text" class="inputTextClass" [(ngModel)]="graphCharge"
-              placeholder=" 1000">
-          </label><br />
-          <label class="inputLabelClass">
-            Resource Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="resourceRadius"
-              placeholder=" 10">
-          </label><br />
-          <label class="inputLabelClass">
-            Literal Node Radius: <input type="text" class="inputTextClass" [(ngModel)]="literalRadius" placeholder=" 6">
-          </label><br />
-          <label class="inputLabelClass">
-            Resource Node Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor"
-              placeholder=" #311B92">
-          </label><br />
-          <label class="inputLabelClass">
-            Resource Node Text Color: <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor"
-              placeholder=" #311B92">
-          </label><br />
-          <label class="inputLabelClass">
-            Literal Node Color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor"
-              placeholder=" #FF9800">
-          </label><br />
-          <label class="inputLabelClass">
-            Literal node text color: <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor"
-              placeholder=" #FF9800">
-          </label><br />
-          <label class="inputLabelClass">
-            Sub Class Label: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel"
-              placeholder=" --subClassOf--">
-          </label><br />
-          <label class="inputLabelClass">
-            Sub Class Label Color: <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor"
-              placeholder=" #3498DB">
-          </label><br />
-          <label class="inputLabelClass">
-            Property Text Color: <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor"
-              placeholder=" #28B463">
-          </label><br />
-          <!--
-                <label class="inputLabelClass">
-                  On click node color: <input type="text" class="inputTextClass" [(ngModel)]="onClickNodeColor" placeholder=" red" >
-                </label>--><br /> <br /><br /> <br /> <br />
-
-          <button #applyConfigBtn (click)="applyConfigClicked($event)"
-            style="width: 33%; height: 36px;margin-left: 3px;border-radius: 8px;background-color:white;">
-            Apply Changes
-          </button>
+            <mat-card-subtitle>Resource Node Color:
+              <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeColor" placeholder=" #311B92">
+            </mat-card-subtitle>
+
+              <mat-card-subtitle>Resource Node Text Color:
+                <input type="text" class="inputTextClass" [(ngModel)]="resourceNodeTextColor" placeholder=" #311B92">
+              </mat-card-subtitle>
+
+              <mat-card-subtitle>Literal Node Color:
+                 <input type="text" class="inputTextClass" [(ngModel)]="literalNodeColor" placeholder=" #FF9800">
+              </mat-card-subtitle>
+
+              <mat-card-subtitle>Literal node text color:
+                <input type="text" class="inputTextClass" [(ngModel)]="literalNodeTextColor" placeholder=" #FF9800">
+              </mat-card-subtitle>
+
+            <mat-card-subtitle> Sub Class Label:
+              <input type="text" class="inputTextClass" [(ngModel)]="subClassLabel" placeholder=" --subClassOf--">
+              </mat-card-subtitle>
+
+              <mat-card-subtitle>Sub Class Label Color:
+                <input type="text" class="inputTextClass" [(ngModel)]="subClassLabelColor" placeholder=" #3498DB">
+              </mat-card-subtitle>
+
+              <mat-card-subtitle> Property Text Color:
+                <input type="text" class="inputTextClass" [(ngModel)]="propertyTextColor"placeholder=" #28B463">
+              </mat-card-subtitle>
+
+              <mat-card-actions>
+                  <button mat-raised-button #applyConfigBtn (click)="applyConfigClicked($event)">
+                  Apply Changes
+                </button>
+              </mat-card-actions>
+             
+          </div>
+        </mat-card>
+      </mat-drawer>
+   
+      <div class="leftSideContainer">
+       <div align="end">
+          <mat-button-toggle mat-icon-button (click)="drawer.toggle()"> <mat-icon>code</mat-icon> </mat-button-toggle>
         </div>
+        <div [attr.id]="ontologyId" style="background-color: #F8F9F9;border-radius: 8px;"></div>
       </div>
-      <div [attr.id]="ontologyId" style="float: left;width: 70%;background-color: #F8F9F9;border-radius: 8px;position: relative;left: 6px;"></div>
-    </div>
+     
+    </mat-drawer-container>    
+    <!--END :: main container grid -->
   </mat-tab>
 </mat-tab-group>
\ No newline at end of file
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index 5c1dc2223..070cc313d 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -22,6 +22,7 @@ export class RdfOntologyViewComponent implements OnInit {
   public nodeRangeId: string;
   public nodeCommentId: string;
 
+  expandNodeInfoCard = false;
   languageCheked = false;
   classHeirarchyChecked = true;
   allPropChecked = false;
@@ -39,7 +40,7 @@ export class RdfOntologyViewComponent implements OnInit {
   subClassLabelColor ="#3498DB";
   propertyTextColor ="#28B463";
   onClickNodeColor ="red";
-  
+ 
   constructor(public uip: UniqueIdProviderService) {
     this.figId = 'fig' + this.uip.getUniqueId();
     this.ontologyId = 'ontologyId' + this.uip.getUniqueId();
@@ -57,7 +58,7 @@ export class RdfOntologyViewComponent implements OnInit {
   ngOnInit() {
   }
 
-  ngAfterViewInit() 
+  ngAfterViewInit()
   {
     this.fileName = "";
     var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
@@ -130,7 +131,7 @@ export class RdfOntologyViewComponent implements OnInit {
     var customizeGraphVals = {edgeSize:this.edgeSize,
                               graphCharge:this.graphCharge,
                               resourceRadius:this.resourceRadius,
-                              literalRadius:this.literalRadius, 
+                              literalRadius:this.literalRadius,
                               resourceNodeColor:this.resourceNodeColor,
                               resourceNodeTextColor:this.resourceNodeTextColor,
                               literalNodeColor:this.literalNodeColor,
@@ -146,7 +147,7 @@ export class RdfOntologyViewComponent implements OnInit {
   }
 
   applyConfigClicked(event){
-    
+   
     var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
                 nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
                 nodeCommentId:this.nodeCommentId

From 7b82a9b5528cc18a40a507abbbd97e30e1cdac0e Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Fri, 3 Jan 2020 13:27:54 +0100
Subject: [PATCH 46/66] 1.Continued angular material changes in rdf-ontology
 components.

---
 ida-chatbot/src/app/app.module.ts                           | 6 +++---
 .../rdf-ontology-view/rdf-ontology-view.component.html      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 6436d8b59..d89ec179f 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -62,7 +62,7 @@ import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { SpeechInputComponent } from './components/speech-input/speech-input.component';
-import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 @NgModule({
   declarations: [
     AppComponent,
@@ -124,8 +124,8 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule,
-    NgbModule
+    FlexLayoutModule //,
+   // NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index d9c26044e..bdf35e124 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -3,7 +3,7 @@
    
     <mat-toolbar color="primary">
       <mat-toolbar-row>
-        <div style="width: 100%; height: 20%;">
+        <div style="width: 100%; height: 30%;">
           <h1 align='center'>Historian Ontology Graph</h1>
         </div>
       </mat-toolbar-row>
@@ -177,4 +177,4 @@ <h1 align='center'>Historian Ontology Graph</h1>
     </mat-drawer-container>    
     <!--END :: main container grid -->
   </mat-tab>
-</mat-tab-group>
\ No newline at end of file
+</mat-tab-group>

From 7d89a2edab1e5c9b22f3c9033dbcc1db6e7100b4 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Fri, 3 Jan 2020 13:28:42 +0100
Subject: [PATCH 47/66] 1.Continued angular material changes in rdf-ontology
 components.

---
 .../rdf-ontology-view/rdf-ontology-view.component.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index bdf35e124..57330d512 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -3,7 +3,7 @@
    
     <mat-toolbar color="primary">
       <mat-toolbar-row>
-        <div style="width: 100%; height: 30%;">
+        <div style="width: 100%; height: 40%;">
           <h1 align='center'>Historian Ontology Graph</h1>
         </div>
       </mat-toolbar-row>

From 16953c556d47445f481016c6ec63488ca1e3f272 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Fri, 3 Jan 2020 13:44:27 +0100
Subject: [PATCH 48/66] test ignore

---
 .../rdf-ontology-view/rdf-ontology-view.component.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 57330d512..4e08d30ce 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -3,7 +3,7 @@
    
     <mat-toolbar color="primary">
       <mat-toolbar-row>
-        <div style="width: 100%; height: 40%;">
+        <div style="width: 100%; height: 60%;">
           <h1 align='center'>Historian Ontology Graph</h1>
         </div>
       </mat-toolbar-row>

From 6caf5e58fbff05b75f185d3ebebf6be54d30d2aa Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 12 Jan 2020 17:49:09 +0100
Subject: [PATCH 49/66] rive script changes

---
 ida-chatbot/src/app/app.component.html        |   2 +-
 ida-chatbot/src/app/app.component.ts          |  10 +-
 .../rdf-ontology-view.component.ts            |   4 +-
 .../tab-view/tab-view.component.html          |   1 +
 ida-chatbot/src/app/enums/tab-type.enum.ts    |   2 +-
 ida-ws/pom.xml                                |   6 +
 .../ontologyExplorer/OntologyExplorer.java    | 100 +++
 .../ida/provider/OntologyExplorerHandler.java |  29 +
 .../ida/provider/RiveScriptBeanProvider.java  | 184 ++---
 .../upb/ida/rest/MessageRestController.java   | 161 +++--
 .../main/resources/ontologies/ss-ontology.ttl | 670 ++++++++++++++++++
 .../rivescript/ontology-explorer.rive         |  10 +
 12 files changed, 1009 insertions(+), 170 deletions(-)
 create mode 100644 ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java
 create mode 100644 ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
 create mode 100644 ida-ws/src/main/resources/ontologies/ss-ontology.ttl
 create mode 100644 ida-ws/src/main/resources/rivescript/ontology-explorer.rive

diff --git a/ida-chatbot/src/app/app.component.html b/ida-chatbot/src/app/app.component.html
index 760a07939..8e0458293 100644
--- a/ida-chatbot/src/app/app.component.html
+++ b/ida-chatbot/src/app/app.component.html
@@ -7,7 +7,7 @@
      
      
     <app-intro [ngClass]="{'hidden-cls': activeItem!==0 }"></app-intro>
-    <app-rdf-ontology-view [hidden]='activeItem !== 1'></app-rdf-ontology-view>
+    <!--<app-rdf-ontology-view [hidden]='activeItem !== 1'></app-rdf-ontology-view> -->
     <ng-container *ngFor="let mvw of getMainviewItems()" >
       <app-data-view-container [item]="mvw" [ngClass]="{'hidden-cls': activeItem!==mvw.id }"></app-data-view-container>
     </ng-container>
diff --git a/ida-chatbot/src/app/app.component.ts b/ida-chatbot/src/app/app.component.ts
index 6903cc806..74842c15d 100644
--- a/ida-chatbot/src/app/app.component.ts
+++ b/ida-chatbot/src/app/app.component.ts
@@ -18,12 +18,13 @@ import {IdaEventService} from './service/event/ida-event.service';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  idCount = 2;
+  idCount = 1;
   title = 'app';
   public introSideItem = new SidebarElement(0, 'Introduction', 'intro');
-  public ontologySideItem = new SidebarElement(1, 'Ontology Explorer', 'ontology');
+  //public ontologySideItem = new SidebarElement(1, 'Ontology Explorer', 'ontology');
   public activeItem = 0;
-  private sidebarItems: SidebarElement[] = [this.introSideItem, this.ontologySideItem];
+  //private sidebarItems: SidebarElement[] = [this.introSideItem, this.ontologySideItem];
+  private sidebarItems: SidebarElement[] = [this.introSideItem];
   private mainViewItems: MainviewElement[] = [];
 
   @ViewChild(ChatboxComponent)
@@ -79,6 +80,9 @@ export class AppComponent {
       // Open new tab with DataTable
       const newTab = new TabElement(this.uis.getUniqueId(), resp.payload.actvTbl, TabType.SSB, resp.payload.ssbDiagramData, true, true);
       this.addNewTab(newTab, resp);
+    }else if (resp.actnCode === 11) {
+      const newTab = new TabElement(this.uis.getUniqueId(), "Ontology Explorer", TabType.OE, resp.payload.ontologyData, true, true);
+      this.addNewTab(newTab, resp);
     }
   }
 
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index 070cc313d..e95e4e0ff 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, AfterViewInit} from '@angular/core';
+import { Component, OnInit, AfterViewInit, Input} from '@angular/core';
 import {UniqueIdProviderService} from '../../service/misc/unique-id-provider.service';
 
 declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h,j,i);
@@ -9,6 +9,8 @@ declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h,j,i);
 })
 export class RdfOntologyViewComponent implements OnInit {
 
+  @Input('data') ontologyData: any;
+
   public figId: string;
   public ontologyId: string;
   public fileName: string;
diff --git a/ida-chatbot/src/app/components/tab-view/tab-view.component.html b/ida-chatbot/src/app/components/tab-view/tab-view.component.html
index 9cb1c9345..1fd29a8e9 100644
--- a/ida-chatbot/src/app/components/tab-view/tab-view.component.html
+++ b/ida-chatbot/src/app/components/tab-view/tab-view.component.html
@@ -9,4 +9,5 @@
   <app-venn-view *ngSwitchCase="tabType.VENND" [data]="tabElement.content"></app-venn-view>
   <app-deckgl-hex-view *ngSwitchCase="tabType.GSD" [data]="tabElement.content"></app-deckgl-hex-view>
   <app-ssb-view *ngSwitchCase="tabType.SSB" [data]="tabElement.content"></app-ssb-view>
+  <app-rdf-ontology-view *ngSwitchCase="tabType.OE" [data]="tabElement.content"></app-rdf-ontology-view>
 </ng-container>
diff --git a/ida-chatbot/src/app/enums/tab-type.enum.ts b/ida-chatbot/src/app/enums/tab-type.enum.ts
index c9ea794b9..fc6bc53c8 100644
--- a/ida-chatbot/src/app/enums/tab-type.enum.ts
+++ b/ida-chatbot/src/app/enums/tab-type.enum.ts
@@ -1,3 +1,3 @@
 export enum TabType {
-  BG, FDG, DTTBL, GEN, DSDET, VENND, GSD, SSB
+  BG, FDG, DTTBL, GEN, DSDET, VENND, GSD, SSB, OE
 }
diff --git a/ida-ws/pom.xml b/ida-ws/pom.xml
index 5edd6a52b..32e5adc4d 100644
--- a/ida-ws/pom.xml
+++ b/ida-ws/pom.xml
@@ -220,6 +220,12 @@
 		    <version>2.1.0.RELEASE</version>
 		    <scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.aksw.jena-sparql-api</groupId>
+			<artifactId>jena-sparql-api-core</artifactId>
+			<version>3.9.0-1</version>
+		</dependency>
+
 
 	</dependencies>
 	<build>
diff --git a/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java b/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java
new file mode 100644
index 000000000..d63d19f3b
--- /dev/null
+++ b/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java
@@ -0,0 +1,100 @@
+package upb.ida.ontologyExplorer;
+
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import upb.ida.constant.IDALiteral;
+import upb.ida.util.FileUtil;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.*;
+import java.io.*;
+import upb.ida.util.FileUtil;
+
+@Component
+public class OntologyExplorer {
+
+	@Autowired
+	private FileUtil fileUtil;
+	public String fetchSysFilePath(String path) {
+		System.out.println("path sdfg=>"+path);
+		System.out.println("getClass() sdfg=>"+getClass());
+		System.out.println("getClass().getClassLoader() sdfg=>"+getClass().getClassLoader());
+		System.out.println("getClass().getClassLoader().getResource(path) sdfg=>"+getClass().getClassLoader().getResource(path));
+		System.out.println("ggetClass().getClassLoader().getResource(path).getFile() sdfg=>"+getClass().getClassLoader().getResource(path).getFile());
+
+
+		return getClass().getClassLoader().getResource(path).getFile();
+	}
+
+	public String fetchData(String filename) throws IOException {
+
+		System.out.println("before read =>");
+
+		//Model model = ModelFactory.createDefaultModel();
+		//String path = getClass().getClassLoader().getResource("test.ttl").getFile();
+		Path currentRelativePath = Paths.get("");
+
+		System.out.println("before readfghj 45 =>"+currentRelativePath);
+		//model.read("ss-ontology.ttl", "TURTLE") ;
+
+
+
+		//String path = fetchSysFilePath("ss-ontology.ttl");
+		String path = fileUtil.fetchSysFilePath("ss-ontology.ttl");
+		//System.out.println("path =>"+path);
+
+		/*
+		File file = new File(path);
+
+		System.out.println("file =>"+file);
+
+		model.read(String.valueOf(new File(path)));
+		*/
+		String inputFile="ss-ontology.ttl";
+		Model model = ModelFactory.createDefaultModel();
+
+		try
+		{
+			InputStream in =new  FileInputStream("/src/main/resources/ontologies/ss-ontology.ttl");
+			if (in == null) {
+				System.out.println("File not found");
+			}
+			else
+			{
+				System.out.println("File found"+in);
+			}
+			model.read(in," ");
+			//model.write(System.out);
+		}
+		catch(Exception e)
+		{
+			System.out.println("exception "+e);
+		}
+
+
+			System.out.println("before read 56789 =>");
+			System.out.println("after read =>"+model);
+
+return "none-empty";
+	}
+
+
+}
diff --git a/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java b/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
new file mode 100644
index 000000000..a051421bc
--- /dev/null
+++ b/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
@@ -0,0 +1,29 @@
+package upb.ida.provider;
+
+import com.rivescript.macro.Subroutine;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import upb.ida.bean.ResponseBean;
+import upb.ida.constant.IDALiteral;
+import upb.ida.ontologyExplorer.OntologyExplorer;
+
+import java.util.Map;
+
+@Component
+public class OntologyExplorerHandler implements Subroutine {
+	@Autowired
+	private ResponseBean responseBean;
+
+	public String call (com.rivescript.RiveScript rs, String[] args) {
+		Map<String, Object> dataMap = responseBean.getPayload();
+		OntologyExplorer oe = new OntologyExplorer();
+		responseBean.setActnCode(11);
+		try {
+			dataMap.put("ontologyData", oe.fetchData(args[0]));
+			return IDALiteral.RESP_PASS_ROUTINE;
+		} catch (Exception ex){
+			System.out.println(ex.getMessage());
+		}
+		return IDALiteral.RESP_FAIL_ROUTINE;
+	}
+}
diff --git a/ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java b/ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java
index 46904ec5a..f24425750 100644
--- a/ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java
+++ b/ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java
@@ -1,90 +1,94 @@
-package upb.ida.provider;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.annotation.ScopedProxyMode;
-import org.springframework.stereotype.Component;
-
-import com.rivescript.Config;
-import com.rivescript.RiveScript;
-
-import upb.ida.constant.IDALiteral;
-import upb.ida.temp.ExampleMacro;
-import upb.ida.util.FileUtil;
-
-
-/**
- * Beans provider for the rivescript bot instance
- * 
- */
-
-@Component
-public class RiveScriptBeanProvider {
-
-	@Autowired
-	private LoadDataContent loadDataContent;
-	@Autowired
-	private FdgHandler fdgHandler;
-	@Autowired
-	private BgdHandler bgdHandler;
-	@Autowired
-	private ClusterConHandler clusterConHandler;
-	@Autowired
-	private ParamsHandler paramsHandler;
-	@Autowired
-	private UserParamEntry userParamEntry;
-	@Autowired
-	private UserParamValueCollector userParamValueCollector;
-	@Autowired
-	private ClusterDataGetter clusterDataGetter;
-	@Autowired
-	private CheckParamCollected checkParamCollected;
-	@Autowired
-	private FileUtil demoMain;
-	@Autowired
-	private LoadDsMetadata dsmdLoader;
-	@Autowired
-	private VennDiagramHandler VennDiagramHandler;
-	@Autowired
-	private GeoDiagramHandler GeoDiagramHandler;
-	@Autowired
-	private SSBDiagramHandler SSBDiagramHandler;
-
-	/**
-	 * Method to provide a session scoped bean for the RiveScript bot
-	 * @return - RiveScript Instance
-	 */
-	@Bean
-	@Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
-	@Qualifier("sessionBotInstance")
-	public RiveScript initBotInstance() {
-
-		RiveScript bot = new RiveScript(Config.utf8());
-
-		// Load the Rivescript directory.
-		bot.loadDirectory(demoMain.fetchSysFilePath(IDALiteral.RS_DIRPATH));
-
-		// Sort the replies and set Subroutine calls for designated functionality
-		bot.sortReplies();
-		bot.setSubroutine("sayname", new ExampleMacro());
-		bot.setSubroutine("loadDataset", loadDataContent);
-		bot.setSubroutine("FdgHandler", fdgHandler);
-		bot.setSubroutine("BgdHandler", bgdHandler);
-		bot.setSubroutine("ClusterConHandler", clusterConHandler);
-		bot.setSubroutine("ParamsHandler", paramsHandler);
-		bot.setSubroutine("UserParamEntry", userParamEntry);
-		bot.setSubroutine("UserParamValueCollector", userParamValueCollector);
-		bot.setSubroutine("ClusterDataGetter", clusterDataGetter);
-		bot.setSubroutine("CheckParamCollected", checkParamCollected);
-		bot.setSubroutine("LoadDsMetadata", dsmdLoader);
-		bot.setSubroutine("VennDiagramHandler", VennDiagramHandler);
-		bot.setSubroutine("GeoDiagramHandler", GeoDiagramHandler);
-		bot.setSubroutine("SSBDiagramHandler", SSBDiagramHandler);
-		return bot;
-	}
-
-	
-
-}
+package upb.ida.provider;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.stereotype.Component;
+
+import com.rivescript.Config;
+import com.rivescript.RiveScript;
+
+import upb.ida.constant.IDALiteral;
+import upb.ida.ontologyExplorer.OntologyExplorer;
+import upb.ida.temp.ExampleMacro;
+import upb.ida.util.FileUtil;
+
+
+/**
+ * Beans provider for the rivescript bot instance
+ *
+ */
+
+@Component
+public class RiveScriptBeanProvider {
+
+	@Autowired
+	private LoadDataContent loadDataContent;
+	@Autowired
+	private FdgHandler fdgHandler;
+	@Autowired
+	private BgdHandler bgdHandler;
+	@Autowired
+	private ClusterConHandler clusterConHandler;
+	@Autowired
+	private ParamsHandler paramsHandler;
+	@Autowired
+	private UserParamEntry userParamEntry;
+	@Autowired
+	private UserParamValueCollector userParamValueCollector;
+	@Autowired
+	private ClusterDataGetter clusterDataGetter;
+	@Autowired
+	private CheckParamCollected checkParamCollected;
+	@Autowired
+	private FileUtil demoMain;
+	@Autowired
+	private LoadDsMetadata dsmdLoader;
+	@Autowired
+	private VennDiagramHandler VennDiagramHandler;
+	@Autowired
+	private GeoDiagramHandler GeoDiagramHandler;
+	@Autowired
+	private SSBDiagramHandler SSBDiagramHandler;
+	@Autowired
+	private OntologyExplorerHandler ontologyExplorerHandler;
+
+	/**
+	 * Method to provide a session scoped bean for the RiveScript bot
+	 * @return - RiveScript Instance
+	 */
+	@Bean
+	@Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
+	@Qualifier("sessionBotInstance")
+	public RiveScript initBotInstance() {
+
+		RiveScript bot = new RiveScript(Config.utf8());
+
+		// Load the Rivescript directory.
+		bot.loadDirectory(demoMain.fetchSysFilePath(IDALiteral.RS_DIRPATH));
+
+		// Sort the replies and set Subroutine calls for designated functionality
+		bot.sortReplies();
+		bot.setSubroutine("sayname", new ExampleMacro());
+		bot.setSubroutine("loadDataset", loadDataContent);
+		bot.setSubroutine("FdgHandler", fdgHandler);
+		bot.setSubroutine("BgdHandler", bgdHandler);
+		bot.setSubroutine("ClusterConHandler", clusterConHandler);
+		bot.setSubroutine("ParamsHandler", paramsHandler);
+		bot.setSubroutine("UserParamEntry", userParamEntry);
+		bot.setSubroutine("UserParamValueCollector", userParamValueCollector);
+		bot.setSubroutine("ClusterDataGetter", clusterDataGetter);
+		bot.setSubroutine("CheckParamCollected", checkParamCollected);
+		bot.setSubroutine("LoadDsMetadata", dsmdLoader);
+		bot.setSubroutine("VennDiagramHandler", VennDiagramHandler);
+		bot.setSubroutine("GeoDiagramHandler", GeoDiagramHandler);
+		bot.setSubroutine("SSBDiagramHandler", SSBDiagramHandler);
+		bot.setSubroutine("OntologyExplorerHandler", ontologyExplorerHandler);
+		return bot;
+	}
+
+
+
+}
diff --git a/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java b/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
index 7efc536a5..05c232e6f 100644
--- a/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
+++ b/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
@@ -1,74 +1,87 @@
-package upb.ida.rest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import upb.ida.bean.ResponseBean;
-import upb.ida.service.DataService;
-import upb.ida.service.RiveScriptService;
-
-/**
- * Exposes RESTful RPCs for the IDA Chatbot
- * 
- * @author Nikit
- *
- */
-@RestController
-@CrossOrigin(origins = "*", allowCredentials = "true")
-@RequestMapping("/message")
-public class MessageRestController {
-	@Autowired
-	private ResponseBean response;
-	@Autowired
-	private RiveScriptService rsService;
-	@Autowired 
-	private DataService dataService;
-	@RequestMapping("/sayhello")
-	public String greeting(@RequestParam(value = "name", defaultValue = "World") String name) {
-		return "Hello " + name + "!";
-	}
-	/**
-	 * Method to accept queries for the chatbot
-	 * @param msg - query in natural language
-	 * @param actvScrId - id of the active screen
-	 * @param actvTbl - name of the active data table on screen
-	 * @param actvDs - name of the active dataset on screen
-	 * @return - instance of {@link ResponseBean}
-	 * @throws Exception
-	 */
-	@RequestMapping("/sendmessage")
-	public ResponseBean sendmessage(@RequestParam(value = "msg") String msg,
-			@RequestParam(value = "actvScrId") String actvScrId, @RequestParam(value = "actvTbl") String actvTbl,
-			@RequestParam(value = "actvDs") String actvDs) throws Exception {
-
-		Map<String, Object> dataMap = new HashMap<>();
-		dataMap.put("actvScrId", actvScrId);
-		dataMap.put("actvTbl", actvTbl);
-		dataMap.put("actvDs", actvDs);
-		response.setPayload(dataMap);
-		String reply = rsService.getRSResponse(msg);
-
-		response.setChatmsg(reply);
-		return response;
-	}
-	
-	@RequestMapping("/getdatatable")
-	public ResponseBean getDataTable(@RequestParam(value = "actvScrId") String actvScrId, @RequestParam(value = "actvTbl") String actvTbl,
-			@RequestParam(value = "actvDs") String actvDs) throws Exception {
-
-		Map<String, Object> dataMap = new HashMap<>();
-		dataMap.put("actvScrId", actvScrId);
-		dataMap.put("actvTbl", actvTbl);
-		dataMap.put("actvDs", actvDs);
-		response.setPayload(dataMap);
-		dataService.getDataTable(actvDs, actvTbl);
-		return response;
-	}
-
-}
\ No newline at end of file
+package upb.ida.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import upb.ida.bean.ResponseBean;
+import upb.ida.ontologyExplorer.OntologyExplorer;
+import upb.ida.service.DataService;
+import upb.ida.service.RiveScriptService;
+
+/**
+ * Exposes RESTful RPCs for the IDA Chatbot
+ *
+ * @author Nikit
+ *
+ */
+@RestController
+@CrossOrigin(origins = "*", allowCredentials = "true")
+@RequestMapping("/message")
+public class MessageRestController {
+	@Autowired
+	private ResponseBean response;
+	@Autowired
+	private RiveScriptService rsService;
+	@Autowired
+	private DataService dataService;
+	@RequestMapping("/sayhello")
+	public String greeting(@RequestParam(value = "name", defaultValue = "World") String name) {
+		return "Hello " + name + "!";
+	}
+	/**
+	 * Method to accept queries for the chatbot
+	 * @param msg - query in natural language
+	 * @param actvScrId - id of the active screen
+	 * @param actvTbl - name of the active data table on screen
+	 * @param actvDs - name of the active dataset on screen
+	 * @return - instance of {@link ResponseBean}
+	 * @throws Exception
+	 */
+	@RequestMapping("/sendmessage")
+	public ResponseBean sendmessage(@RequestParam(value = "msg") String msg,
+			@RequestParam(value = "actvScrId") String actvScrId, @RequestParam(value = "actvTbl") String actvTbl,
+			@RequestParam(value = "actvDs") String actvDs) throws Exception {
+
+		Map<String, Object> dataMap = new HashMap<>();
+		dataMap.put("actvScrId", actvScrId);
+		dataMap.put("actvTbl", actvTbl);
+		dataMap.put("actvDs", actvDs);
+		response.setPayload(dataMap);
+		String reply = rsService.getRSResponse(msg);
+
+		response.setChatmsg(reply);
+		return response;
+	}
+
+	@RequestMapping("/getdatatable")
+	public ResponseBean getDataTable(@RequestParam(value = "actvScrId") String actvScrId, @RequestParam(value = "actvTbl") String actvTbl,
+			@RequestParam(value = "actvDs") String actvDs) throws Exception {
+
+		Map<String, Object> dataMap = new HashMap<>();
+		dataMap.put("actvScrId", actvScrId);
+		dataMap.put("actvTbl", actvTbl);
+		dataMap.put("actvDs", actvDs);
+		response.setPayload(dataMap);
+		dataService.getDataTable(actvDs, actvTbl);
+		return response;
+	}
+
+	@RequestMapping("/getOntologyData")
+	public ResponseBean getOntologyData(@RequestParam(value = "fileName") String fileName) throws Exception {
+		Map<String, Object> dataMap = new HashMap<>();
+		OntologyExplorer oe = new OntologyExplorer();
+		dataMap.put("actvScrId", "");
+		dataMap.put("actvTbl", "");
+		dataMap.put("actvDs", "");
+		dataMap.put("soldier", oe.fetchData(fileName));
+		response.setPayload(dataMap);
+		return response;
+	}
+
+}
diff --git a/ida-ws/src/main/resources/ontologies/ss-ontology.ttl b/ida-ws/src/main/resources/ontologies/ss-ontology.ttl
new file mode 100644
index 000000000..4fb53fac4
--- /dev/null
+++ b/ida-ws/src/main/resources/ontologies/ss-ontology.ttl
@@ -0,0 +1,670 @@
+@prefix : <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/> .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+@prefix dbo: <http://dbpedia.org/ontology/> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix data: <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/data/> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix time: <http://www.w3.org/2006/time#> .
+@base <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/> .
+
+<https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/> rdf:type owl:Ontology ;
+                                                                               dc:description "Vocabulary describing Concepts and Relationships of Schutzstaffel"@en ;
+                                                                               dc:title "SS Vocabulary"@en .
+
+#################################################################
+#    Annotation properties
+#################################################################
+
+###  http://purl.org/dc/elements/1.1/description
+dc:description rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/elements/1.1/title
+dc:title rdf:type owl:AnnotationProperty .
+
+
+#################################################################
+#    Datatypes
+#################################################################
+
+###  http://www.w3.org/2001/XMLSchema#date
+xsd:date rdf:type rdfs:Datatype .
+
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  http://dbpedia.org/ontology/birthPlace
+dbo:birthPlace rdf:type owl:ObjectProperty ;
+               rdfs:domain dbo:Person ;
+               rdfs:range dbo:Place .
+
+
+###  http://dbpedia.org/ontology/deathPlace
+dbo:deathPlace rdf:type owl:ObjectProperty ;
+               rdfs:domain dbo:Person ;
+               rdfs:range dbo:Place .
+
+
+###  http://www.w3.org/2006/time#hasBeginning
+time:hasBeginning rdf:type owl:ObjectProperty ;
+                  rdfs:domain time:DateTimeInterval ;
+                  rdfs:range time:Instant .
+
+
+###  http://www.w3.org/2006/time#hasEnd
+time:hasEnd rdf:type owl:ObjectProperty ;
+            rdfs:domain time:DateTimeInterval ;
+            rdfs:range time:Instant .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunctionInfo
+:NSDAPFunctionInfo rdf:type owl:ObjectProperty ;
+                   rdfs:subPropertyOf owl:topObjectProperty ;
+                   rdfs:domain :Soldier ;
+                   rdfs:range :SoldierNSDAPFunctionInfo ;
+                   rdfs:comment "Soldier's function in NSDAP"^^xsd:string ;
+                   rdfs:label "Soldier NSDAP Function"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/applicableFrom
+:applicableFrom rdf:type owl:ObjectProperty ,
+                         owl:FunctionalProperty ;
+                rdfs:domain :Timestampable ;
+                rdfs:range time:Instant .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/decorationInfo
+:decorationInfo rdf:type owl:ObjectProperty ;
+                rdfs:subPropertyOf owl:topObjectProperty ;
+                rdfs:domain :Soldier ;
+                rdfs:range :DecorationEvent ;
+                rdfs:comment "Medal acquired by a Soldier"^^xsd:string ;
+                rdfs:label "Soldier Decoration"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/governmentFunctionInfo
+:governmentFunctionInfo rdf:type owl:ObjectProperty ;
+                        rdfs:subPropertyOf owl:topObjectProperty ;
+                        rdfs:domain :Soldier ;
+                        rdfs:range :SoldierGovernmentFunctionInfo ;
+                        rdfs:comment "Soldier's function in the government"^^xsd:string ;
+                        rdfs:label "Soldier Govt Function"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDecoration
+:hasDecoration rdf:type owl:ObjectProperty ;
+               rdfs:subPropertyOf owl:topObjectProperty ;
+               rdfs:domain :DecorationEvent ;
+               rdfs:range :Decoration ;
+               rdfs:comment "Details of Decoration given at a DecorationEvent"^^xsd:string ;
+               rdfs:label "Has Decoration"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDischargeInfo
+:hasDischargeInfo rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf owl:topObjectProperty ;
+                  rdf:type owl:FunctionalProperty ;
+                  rdfs:domain :Soldier ;
+                  rdfs:range :SoldierDischargeInfo ;
+                  rdfs:comment "Reason of Soldier's discharge"^^xsd:string ;
+                  rdfs:label "Soldier Discharge Info"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasGovernmentFunction
+:hasGovernmentFunction rdf:type owl:ObjectProperty ;
+                       rdfs:subPropertyOf owl:topObjectProperty ;
+                       rdfs:domain :SoldierGovernmentFunctionInfo ;
+                       rdfs:range :GovernmentFunction ;
+                       rdfs:comment "Details of Government Function"^^xsd:string ;
+                       rdfs:label "Has Govt Function"@en ,
+                                  "hasGovernmentFunction"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasLiterature
+:hasLiterature rdf:type owl:ObjectProperty ;
+               rdfs:subPropertyOf owl:topObjectProperty ;
+               rdfs:domain :SoldierLiteratureInfo ;
+               rdfs:range :Literature ;
+               rdfs:comment "Details of the Literature"^^xsd:string ;
+               rdfs:label "Has Literature"@en ,
+                          "hasLiterature"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasNSDAPFunction
+:hasNSDAPFunction rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf owl:topObjectProperty ;
+                  rdfs:domain :SoldierNSDAPFunctionInfo ;
+                  rdfs:range :NSDAPFunction ;
+                  rdfs:comment "Details of NSDAP Function"^^xsd:string ;
+                  rdfs:label "Has NSDAP Function"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRank
+:hasRank rdf:type owl:ObjectProperty ;
+         rdfs:subPropertyOf owl:topObjectProperty ;
+         rdfs:domain :SoldierRankInfo ;
+         rdfs:range :Rank ;
+         rdfs:comment "Details of the Rank"^^xsd:string ;
+         rdfs:label "Has Rank"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRegiment
+:hasRegiment rdf:type owl:ObjectProperty ;
+             rdfs:subPropertyOf owl:topObjectProperty ;
+             rdfs:domain :SoldierRegimentInfo ;
+             rdfs:range :Regiment ;
+             rdfs:comment "Details of the Regiment"^^xsd:string ;
+             rdfs:label "Has Regiment"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/literatureInfo
+:literatureInfo rdf:type owl:ObjectProperty ;
+                rdfs:subPropertyOf owl:topObjectProperty ;
+                rdfs:domain :Soldier ;
+                rdfs:range :SoldierLiteratureInfo ;
+                rdfs:label "Soldier Literature"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/rankInfo
+:rankInfo rdf:type owl:ObjectProperty ;
+          rdfs:subPropertyOf owl:topObjectProperty ;
+          rdfs:domain :Soldier ;
+          rdfs:range :SoldierRankInfo ;
+          rdfs:comment "Soldier'r rank in SS"^^xsd:string ;
+          rdfs:label "Soldier Rank"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/regimentInfo
+:regimentInfo rdf:type owl:ObjectProperty ;
+              rdfs:subPropertyOf owl:topObjectProperty ;
+              rdfs:domain :Soldier ;
+              rdfs:range :SoldierRegimentInfo ;
+              rdfs:comment "Soldier's Regiment"^^xsd:string ;
+              rdfs:label "Soldier Regiment"@en .
+
+
+#################################################################
+#    Data properties
+#################################################################
+
+###  http://dbpedia.org/ontology/birthDate
+dbo:birthDate rdf:type owl:DatatypeProperty ;
+              rdfs:domain dbo:Person ;
+              rdfs:range xsd:date ;
+              rdfs:label "Birth Date"@en .
+
+
+###  http://dbpedia.org/ontology/birthPlace
+dbo:birthPlace rdf:type owl:DatatypeProperty .
+
+
+###  http://dbpedia.org/ontology/deathDate
+dbo:deathDate rdf:type owl:DatatypeProperty ;
+              rdfs:domain dbo:Person ;
+              rdfs:range xsd:date ;
+              rdfs:label "Death Date"@en .
+
+
+###  http://dbpedia.org/ontology/deathPlace
+dbo:deathPlace rdf:type owl:DatatypeProperty .
+
+
+###  http://dbpedia.org/ontology/firstName
+dbo:firstName rdf:type owl:DatatypeProperty ;
+              rdfs:domain dbo:Person ;
+              rdfs:range xsd:string ;
+              rdfs:label "First Name"@en .
+
+
+###  http://dbpedia.org/ontology/lastName
+dbo:lastName rdf:type owl:DatatypeProperty ;
+             rdfs:domain dbo:Person ;
+             rdfs:range xsd:string ;
+             rdfs:label "Last Name"@en .
+
+
+###  http://www.w3.org/2006/time#hasBeginning
+time:hasBeginning rdf:type owl:DatatypeProperty .
+
+
+###  http://www.w3.org/2006/time#hasEnd
+time:hasEnd rdf:type owl:DatatypeProperty .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DALVerified
+:DALVerified rdf:type owl:DatatypeProperty ;
+             rdfs:subPropertyOf owl:topDataProperty ;
+             rdfs:domain :Soldier ;
+             rdfs:range xsd:boolean ;
+             rdfs:comment "Verification status of data against DAL"^^xsd:string ;
+             rdfs:label "Data verified on DAL?"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPNumber
+:NSDAPNumber rdf:type owl:DatatypeProperty ;
+             rdfs:subPropertyOf owl:topDataProperty ;
+             rdf:type owl:FunctionalProperty ;
+             rdfs:domain :Soldier ;
+             rdfs:range xsd:positiveInteger ;
+             rdfs:comment "Soldier's NSDAP number in"^^xsd:string ;
+             rdfs:label "NSDAP Number"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/abbreviation
+:abbreviation rdf:type owl:DatatypeProperty ;
+              rdfs:subPropertyOf owl:topDataProperty ;
+              rdfs:domain :Abbreviable ;
+              rdfs:range xsd:string ;
+              rdfs:comment "Abbreviation of the Abbreviable resource"^^xsd:string ;
+              rdfs:label "Abbreviation"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/applicableFrom
+:applicableFrom rdf:type owl:DatatypeProperty ;
+                rdfs:subPropertyOf owl:topDataProperty ;
+                rdf:type owl:FunctionalProperty .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/author
+:author rdf:type owl:DatatypeProperty ;
+        rdfs:subPropertyOf owl:topDataProperty ;
+        rdfs:domain :Literature ;
+        rdfs:range xsd:string ;
+        rdfs:comment "Author of a Literature"^^xsd:string ;
+        rdfs:label "Author"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/birthPlaceStr
+:birthPlaceStr rdf:type owl:DatatypeProperty ;
+               rdfs:domain :Soldier ;
+               rdfs:range xsd:string ;
+               rdfs:label "Birth Place(Plain text)"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/citaviId
+:citaviId rdf:type owl:DatatypeProperty ;
+          rdfs:subPropertyOf owl:topDataProperty ;
+          rdfs:domain :Literature ;
+          rdfs:range xsd:positiveInteger ;
+          rdfs:comment "Unique ID of a Literature in the Citavi database"^^xsd:string ;
+          rdfs:label "Citavi Database Id"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/deathPlaceStr
+:deathPlaceStr rdf:type owl:DatatypeProperty ;
+               rdfs:domain :Soldier ;
+               rdfs:range xsd:string ;
+               rdfs:label "Death Place(Plain text)"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargeReason
+:dischargeReason rdf:type owl:DatatypeProperty ;
+                 rdfs:subPropertyOf owl:topDataProperty ;
+                 rdf:type owl:FunctionalProperty ;
+                 rdfs:domain :Dischargable ;
+                 rdfs:range xsd:string ;
+                 rdfs:comment "Reason of Soldier's discharge"^^xsd:string ;
+                 rdfs:label "Discharge Reason"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargedOn
+:dischargedOn rdf:type owl:DatatypeProperty ;
+              rdfs:subPropertyOf owl:topDataProperty ;
+              rdf:type owl:FunctionalProperty ;
+              rdfs:domain :Soldier ;
+              rdfs:range xsd:dateTime ;
+              rdfs:comment "Date of Soldier's discharge"^^xsd:string ;
+              rdfs:label "Discharged On"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/divergentDAL
+:divergentDAL rdf:type owl:DatatypeProperty ;
+              rdfs:subPropertyOf owl:topDataProperty ;
+              rdfs:domain :Soldier ;
+              rdfs:range xsd:string ;
+              rdfs:comment "Differences observed from the original dataset"^^xsd:string ;
+              rdfs:label "Divergent DAL"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrolledOn
+:enrolledOn rdf:type owl:DatatypeProperty ;
+            rdfs:subPropertyOf owl:topDataProperty ;
+            rdf:type owl:FunctionalProperty ;
+            rdfs:domain :Soldier ;
+            rdfs:range xsd:dateTime ;
+            rdfs:comment "Date of Soldier's enrollment"^^xsd:string ;
+            rdfs:label "Enrolled On"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrollmentReason
+:enrollmentReason rdf:type owl:DatatypeProperty ;
+                  rdfs:subPropertyOf owl:topDataProperty ;
+                  rdf:type owl:FunctionalProperty ;
+                  rdfs:domain :Soldier ;
+                  rdfs:range xsd:string ;
+                  rdfs:comment "Reason of Soldier's enrollment"^^xsd:string ;
+                  rdfs:label "Enrollment Reason"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/id
+:id rdf:type owl:DatatypeProperty ;
+    rdfs:subPropertyOf owl:topDataProperty ;
+    rdf:type owl:FunctionalProperty ;
+    rdfs:domain :SSClass ;
+    rdfs:range xsd:positiveInteger ;
+    rdfs:comment "Unique ID of an SSClass resource"^^xsd:string ;
+    rdfs:label "id"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/information
+:information rdf:type owl:DatatypeProperty ;
+             rdfs:subPropertyOf owl:topDataProperty ;
+             rdf:type owl:FunctionalProperty ;
+             rdfs:domain :SSClass ;
+             rdfs:range xsd:string ;
+             rdfs:comment "Information about the resource"^^xsd:string ;
+             rdfs:label "Information"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/internalInformation
+:internalInformation rdf:type owl:DatatypeProperty ;
+                     rdfs:subPropertyOf owl:topDataProperty ;
+                     rdf:type owl:FunctionalProperty ;
+                     rdfs:domain :SSClass ;
+                     rdfs:range xsd:string ;
+                     rdfs:comment "Internal information about the resource"^^xsd:string ;
+                     rdfs:label "Internal Information"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipNumber
+:membershipNumber rdf:type owl:DatatypeProperty ;
+                  rdfs:subPropertyOf owl:topDataProperty ;
+                  rdf:type owl:FunctionalProperty ;
+                  rdfs:domain :Soldier ;
+                  rdfs:range xsd:positiveInteger ;
+                  rdfs:comment "NSDAP membership number"^^xsd:string ;
+                  rdfs:label "membershipNumber"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipType
+:membershipType rdf:type owl:DatatypeProperty ;
+                rdfs:subPropertyOf owl:topDataProperty ;
+                rdf:type owl:FunctionalProperty ;
+                rdfs:domain :Soldier ;
+                rdfs:range xsd:string ;
+                rdfs:comment "Additional information on the SS membership number"^^xsd:string ;
+                rdfs:label "Membership Type"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/name
+:name rdf:type owl:DatatypeProperty ;
+      rdfs:subPropertyOf owl:topDataProperty ;
+      rdfs:domain :SSClass ;
+      rdfs:range xsd:string ;
+      rdfs:comment "Name of the resource"^^xsd:string ;
+      rdfs:label "Name"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/origin
+:origin rdf:type owl:DatatypeProperty ;
+        rdfs:subPropertyOf owl:topDataProperty ;
+        rdfs:domain :Literature ;
+        rdfs:range xsd:string ;
+        rdfs:comment "Origin of the Literature"^^xsd:string ;
+        rdfs:label "Origin"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalDALId
+:originalDALId rdf:type owl:DatatypeProperty ;
+               rdfs:subPropertyOf owl:topDataProperty ;
+               rdf:type owl:FunctionalProperty ;
+               rdfs:domain :SoldierLiteratureInfo ;
+               rdfs:range xsd:positiveInteger ;
+               rdfs:comment "Information about the ID number used in the original list of the SS Soldiers"^^xsd:string ;
+               rdfs:label "Original DAL Id"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalDALPage
+:originalDALPage rdf:type owl:DatatypeProperty ;
+                 rdfs:subPropertyOf owl:topDataProperty ;
+                 rdf:type owl:FunctionalProperty ;
+                 rdfs:domain :SoldierLiteratureInfo ;
+                 rdfs:range xsd:positiveInteger ;
+                 rdfs:comment "Page number of the original list where the information about the Soldier is given"^^xsd:string ;
+                 rdfs:label "Original DAL Page"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/publicationYear
+:publicationYear rdf:type owl:DatatypeProperty ;
+                 rdfs:subPropertyOf owl:topDataProperty ;
+                 rdfs:domain :Literature ;
+                 rdfs:range xsd:positiveInteger ;
+                 rdfs:comment "Publication year of the Literature"^^xsd:string ;
+                 rdfs:label "Year of Publication"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/signature
+:signature rdf:type owl:DatatypeProperty ;
+           rdfs:subPropertyOf owl:topDataProperty ;
+           rdfs:domain :Literature ;
+           rdfs:range xsd:string ;
+           rdfs:comment "Signature of the Literature"^^xsd:string ;
+           rdfs:label "signature"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/sortation
+:sortation rdf:type owl:DatatypeProperty ;
+           rdfs:subPropertyOf owl:topDataProperty ;
+           rdf:type owl:FunctionalProperty ;
+           rdfs:domain :Rank ;
+           rdfs:range xsd:positiveInteger ;
+           rdfs:comment "Sortation of the Rank"^^xsd:string ;
+           rdfs:label "sortation"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/status
+:status rdf:type owl:DatatypeProperty ;
+        rdfs:subPropertyOf owl:topDataProperty ;
+        rdfs:domain :Literature ;
+        rdfs:range xsd:string ;
+        rdfs:comment "Internal editing status"^^xsd:string ;
+        rdfs:label "processing status"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/title
+:title rdf:type owl:DatatypeProperty ;
+       rdfs:subPropertyOf owl:topDataProperty ;
+       rdf:type owl:FunctionalProperty ;
+       rdfs:domain :Soldier ;
+       rdfs:range xsd:string ;
+       rdfs:comment "Academic title, ex: Dr., Prof. Dr."^^xsd:string ;
+       rdfs:label "title"@en .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  http://dbpedia.org/ontology/Person
+dbo:Person rdf:type owl:Class .
+
+
+###  http://dbpedia.org/ontology/Place
+dbo:Place rdf:type owl:Class .
+
+
+###  http://www.w3.org/2006/time#DateTimeInterval
+time:DateTimeInterval rdf:type owl:Class .
+
+
+###  http://www.w3.org/2006/time#Instant
+time:Instant rdf:type owl:Class .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable
+:Abbreviable rdf:type owl:Class ;
+             rdfs:subClassOf owl:Thing ;
+             dc:description "Describes entities which have an abbreviated name"@en ;
+             rdfs:label "Abbreviable"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration
+:Decoration rdf:type owl:Class ;
+            rdfs:subClassOf time:DateTimeInterval ,
+                            :Abbreviable ,
+                            :SSClass ;
+            rdfs:label "Decoration"@en ,
+                       "Orden"@de .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent
+:DecorationEvent rdf:type owl:Class ;
+                 rdfs:subClassOf :SSClass ,
+                                 :Timestampable ;
+                 rdfs:label "DecorationEvent"@en ,
+                            "Soldatendekoration Info"@de .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable
+:Dischargable rdf:type owl:Class ;
+              rdfs:subClassOf owl:Thing ;
+              dc:description "Describes the entity which can be discharged with a reason i.e. Soldier"@en ;
+              rdfs:label "Dischargable"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction
+:GovernmentFunction rdf:type owl:Class ;
+                    rdfs:subClassOf :Abbreviable ,
+                                    :SSClass ;
+                    rdfs:label "GovernmentFunction"@en ,
+                               "Regierungsfunktion"@de .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature
+:Literature rdf:type owl:Class ;
+            rdfs:subClassOf :SSClass ;
+            rdfs:label "Literatur"@de ,
+                       "Literature"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction
+:NSDAPFunction rdf:type owl:Class ;
+               rdfs:subClassOf :Abbreviable ,
+                               :SSClass ;
+               rdfs:label "NSDAPFunction"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Rank
+:Rank rdf:type owl:Class ;
+      rdfs:subClassOf :SSClass ;
+      rdfs:label "Rang"@de ,
+                 "Rank"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment
+:Regiment rdf:type owl:Class ;
+          rdfs:subClassOf :Abbreviable ,
+                          :SSClass ;
+          rdfs:label "Dienststellung"@de ,
+                     "Regiment"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass
+:SSClass rdf:type owl:Class ;
+         rdfs:subClassOf owl:Thing ;
+         dc:description "Top level resource of SS Ontology"@en ;
+         rdfs:label "SSClass"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier
+:Soldier rdf:type owl:Class ;
+         rdfs:subClassOf dbo:Person ,
+                         :Dischargable ,
+                         :SSClass ;
+         rdfs:label "Soldat"@de ,
+                    "Soldier"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo
+:SoldierDischargeInfo rdf:type owl:Class ;
+                      rdfs:subClassOf :Dischargable ,
+                                      :SSClass ;
+                      rdfs:label "Soldatenentlassung Info"@de ,
+                                 "SoldierDischargeInfo"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo
+:SoldierGovernmentFunctionInfo rdf:type owl:Class ;
+                               rdfs:subClassOf :SSClass ,
+                                               :Timestampable ;
+                               rdfs:label "Soldatenregierungsfunktion Info"@de ,
+                                          "SoldierGovernmentFunctionInfo"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo
+:SoldierLiteratureInfo rdf:type owl:Class ;
+                       rdfs:subClassOf :SSClass ,
+                                       :Timestampable ;
+                       rdfs:label "SoldatenLiteratur Info"@de ,
+                                  "SoldierLiteratureInfo"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo
+:SoldierNSDAPFunctionInfo rdf:type owl:Class ;
+                          rdfs:subClassOf :SSClass ,
+                                          :Timestampable ;
+                          rdfs:label "SoldierNSDAPFunctionInfo"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRankInfo
+:SoldierRankInfo rdf:type owl:Class ;
+                 rdfs:subClassOf :SSClass ,
+                                 :Timestampable ;
+                 rdfs:label "Soldat Rang Info"@de ,
+                            "Soldier Rank Info"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo
+:SoldierRegimentInfo rdf:type owl:Class ;
+                     rdfs:subClassOf :SSClass ,
+                                     :Timestampable ;
+                     rdfs:label "Soldatendienststellung Info"@de ,
+                                "SoldierRegimentInfo"@en .
+
+
+###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable
+:Timestampable rdf:type owl:Class ;
+               rdfs:subClassOf owl:Thing ;
+               dc:description "Describes a specific point in time"@en ;
+               rdfs:label "Timestampable"@en .
+
+
+#################################################################
+#    Annotations
+#################################################################
+
+dbo:birthPlace rdfs:label "Birth Place"@en .
+
+
+dbo:deathPlace rdfs:label "Death Place"@en .
+
+
+time:hasBeginning rdfs:comment "Describes the beginning time of a temporal entity"^^xsd:string ;
+                  rdfs:label "startsAt"@en .
+
+
+time:hasEnd rdfs:comment "Describes the ending time of a temporal entity"^^xsd:string ;
+            rdfs:label "endsAt"@en .
+
+
+:applicableFrom rdfs:label "Applicable From"@en ;
+                rdfs:comment "Date from which a Decoration/Rank/Literature/Regiment is recorded."^^xsd:string .
+
+
+###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
diff --git a/ida-ws/src/main/resources/rivescript/ontology-explorer.rive b/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
new file mode 100644
index 000000000..8734c4a06
--- /dev/null
+++ b/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
@@ -0,0 +1,10 @@
+! version = 2.0
+
+//User queries for ontology
+
++ i want a ontology explorer for <star>
+* <call>OntologyExplorerHandler "<star1>"</call> == pass => Your requested
+^ \s ontology explorer is now added to the main view
+
++ open ontology *
+@ i want a ontology explorer for <star>

From 29d8fb5247e83cb274af7740c7b2fffe6be3f470 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 12 Jan 2020 18:31:18 +0100
Subject: [PATCH 50/66] rive script changes.

---
 ida-ws/src/main/resources/rivescript/ontology-explorer.rive | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ida-ws/src/main/resources/rivescript/ontology-explorer.rive b/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
index 8734c4a06..51a732bcd 100644
--- a/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
+++ b/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
@@ -2,7 +2,7 @@
 
 //User queries for ontology
 
-+ i want a ontology explorer for <star>
++ i want a ontology explorer for *
 * <call>OntologyExplorerHandler "<star1>"</call> == pass => Your requested
 ^ \s ontology explorer is now added to the main view
 

From 2657e74ff632a4106f28943dee2b69f1cf66de76 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 12 Jan 2020 18:51:54 +0100
Subject: [PATCH 51/66] rive script changes.

---
 .../rdf-ontology-view/rdf-ontology-view.component.html     | 7 +------
 .../src/main/resources/rivescript/ontology-explorer.rive   | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 4e08d30ce..9b8e26ef4 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,7 +1,4 @@
-<mat-tab-group style="min-width: 40vw;max-height: 100vh">
-  <mat-tab label="Ontology Explorer">
-   
-    <mat-toolbar color="primary">
+  <mat-toolbar color="primary">
       <mat-toolbar-row>
         <div style="width: 100%; height: 60%;">
           <h1 align='center'>Historian Ontology Graph</h1>
@@ -176,5 +173,3 @@ <h1 align='center'>Historian Ontology Graph</h1>
      
     </mat-drawer-container>    
     <!--END :: main container grid -->
-  </mat-tab>
-</mat-tab-group>
diff --git a/ida-ws/src/main/resources/rivescript/ontology-explorer.rive b/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
index 51a732bcd..a9c32108b 100644
--- a/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
+++ b/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
@@ -4,7 +4,7 @@
 
 + i want a ontology explorer for *
 * <call>OntologyExplorerHandler "<star1>"</call> == pass => Your requested
-^ \s ontology explorer is now added to the main view
+^ \sOntology explorer is now added to the main view
 
-+ open ontology *
++ open * ontology
 @ i want a ontology explorer for <star>

From aec07bc3b1e1a953f49ed6f68e8ab96fe196c1dc Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 14 Jan 2020 01:16:48 +0100
Subject: [PATCH 52/66] removing Ontology.ttl file

---
 .../main/resources/ontologies/ss-ontology.ttl | 670 ------------------
 1 file changed, 670 deletions(-)
 delete mode 100644 ida-ws/src/main/resources/ontologies/ss-ontology.ttl

diff --git a/ida-ws/src/main/resources/ontologies/ss-ontology.ttl b/ida-ws/src/main/resources/ontologies/ss-ontology.ttl
deleted file mode 100644
index 4fb53fac4..000000000
--- a/ida-ws/src/main/resources/ontologies/ss-ontology.ttl
+++ /dev/null
@@ -1,670 +0,0 @@
-@prefix : <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/> .
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-@prefix dbo: <http://dbpedia.org/ontology/> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix xml: <http://www.w3.org/XML/1998/namespace> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix data: <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/data/> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix time: <http://www.w3.org/2006/time#> .
-@base <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/> .
-
-<https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/> rdf:type owl:Ontology ;
-                                                                               dc:description "Vocabulary describing Concepts and Relationships of Schutzstaffel"@en ;
-                                                                               dc:title "SS Vocabulary"@en .
-
-#################################################################
-#    Annotation properties
-#################################################################
-
-###  http://purl.org/dc/elements/1.1/description
-dc:description rdf:type owl:AnnotationProperty .
-
-
-###  http://purl.org/dc/elements/1.1/title
-dc:title rdf:type owl:AnnotationProperty .
-
-
-#################################################################
-#    Datatypes
-#################################################################
-
-###  http://www.w3.org/2001/XMLSchema#date
-xsd:date rdf:type rdfs:Datatype .
-
-
-#################################################################
-#    Object Properties
-#################################################################
-
-###  http://dbpedia.org/ontology/birthPlace
-dbo:birthPlace rdf:type owl:ObjectProperty ;
-               rdfs:domain dbo:Person ;
-               rdfs:range dbo:Place .
-
-
-###  http://dbpedia.org/ontology/deathPlace
-dbo:deathPlace rdf:type owl:ObjectProperty ;
-               rdfs:domain dbo:Person ;
-               rdfs:range dbo:Place .
-
-
-###  http://www.w3.org/2006/time#hasBeginning
-time:hasBeginning rdf:type owl:ObjectProperty ;
-                  rdfs:domain time:DateTimeInterval ;
-                  rdfs:range time:Instant .
-
-
-###  http://www.w3.org/2006/time#hasEnd
-time:hasEnd rdf:type owl:ObjectProperty ;
-            rdfs:domain time:DateTimeInterval ;
-            rdfs:range time:Instant .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunctionInfo
-:NSDAPFunctionInfo rdf:type owl:ObjectProperty ;
-                   rdfs:subPropertyOf owl:topObjectProperty ;
-                   rdfs:domain :Soldier ;
-                   rdfs:range :SoldierNSDAPFunctionInfo ;
-                   rdfs:comment "Soldier's function in NSDAP"^^xsd:string ;
-                   rdfs:label "Soldier NSDAP Function"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/applicableFrom
-:applicableFrom rdf:type owl:ObjectProperty ,
-                         owl:FunctionalProperty ;
-                rdfs:domain :Timestampable ;
-                rdfs:range time:Instant .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/decorationInfo
-:decorationInfo rdf:type owl:ObjectProperty ;
-                rdfs:subPropertyOf owl:topObjectProperty ;
-                rdfs:domain :Soldier ;
-                rdfs:range :DecorationEvent ;
-                rdfs:comment "Medal acquired by a Soldier"^^xsd:string ;
-                rdfs:label "Soldier Decoration"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/governmentFunctionInfo
-:governmentFunctionInfo rdf:type owl:ObjectProperty ;
-                        rdfs:subPropertyOf owl:topObjectProperty ;
-                        rdfs:domain :Soldier ;
-                        rdfs:range :SoldierGovernmentFunctionInfo ;
-                        rdfs:comment "Soldier's function in the government"^^xsd:string ;
-                        rdfs:label "Soldier Govt Function"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDecoration
-:hasDecoration rdf:type owl:ObjectProperty ;
-               rdfs:subPropertyOf owl:topObjectProperty ;
-               rdfs:domain :DecorationEvent ;
-               rdfs:range :Decoration ;
-               rdfs:comment "Details of Decoration given at a DecorationEvent"^^xsd:string ;
-               rdfs:label "Has Decoration"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDischargeInfo
-:hasDischargeInfo rdf:type owl:ObjectProperty ;
-                  rdfs:subPropertyOf owl:topObjectProperty ;
-                  rdf:type owl:FunctionalProperty ;
-                  rdfs:domain :Soldier ;
-                  rdfs:range :SoldierDischargeInfo ;
-                  rdfs:comment "Reason of Soldier's discharge"^^xsd:string ;
-                  rdfs:label "Soldier Discharge Info"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasGovernmentFunction
-:hasGovernmentFunction rdf:type owl:ObjectProperty ;
-                       rdfs:subPropertyOf owl:topObjectProperty ;
-                       rdfs:domain :SoldierGovernmentFunctionInfo ;
-                       rdfs:range :GovernmentFunction ;
-                       rdfs:comment "Details of Government Function"^^xsd:string ;
-                       rdfs:label "Has Govt Function"@en ,
-                                  "hasGovernmentFunction"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasLiterature
-:hasLiterature rdf:type owl:ObjectProperty ;
-               rdfs:subPropertyOf owl:topObjectProperty ;
-               rdfs:domain :SoldierLiteratureInfo ;
-               rdfs:range :Literature ;
-               rdfs:comment "Details of the Literature"^^xsd:string ;
-               rdfs:label "Has Literature"@en ,
-                          "hasLiterature"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasNSDAPFunction
-:hasNSDAPFunction rdf:type owl:ObjectProperty ;
-                  rdfs:subPropertyOf owl:topObjectProperty ;
-                  rdfs:domain :SoldierNSDAPFunctionInfo ;
-                  rdfs:range :NSDAPFunction ;
-                  rdfs:comment "Details of NSDAP Function"^^xsd:string ;
-                  rdfs:label "Has NSDAP Function"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRank
-:hasRank rdf:type owl:ObjectProperty ;
-         rdfs:subPropertyOf owl:topObjectProperty ;
-         rdfs:domain :SoldierRankInfo ;
-         rdfs:range :Rank ;
-         rdfs:comment "Details of the Rank"^^xsd:string ;
-         rdfs:label "Has Rank"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRegiment
-:hasRegiment rdf:type owl:ObjectProperty ;
-             rdfs:subPropertyOf owl:topObjectProperty ;
-             rdfs:domain :SoldierRegimentInfo ;
-             rdfs:range :Regiment ;
-             rdfs:comment "Details of the Regiment"^^xsd:string ;
-             rdfs:label "Has Regiment"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/literatureInfo
-:literatureInfo rdf:type owl:ObjectProperty ;
-                rdfs:subPropertyOf owl:topObjectProperty ;
-                rdfs:domain :Soldier ;
-                rdfs:range :SoldierLiteratureInfo ;
-                rdfs:label "Soldier Literature"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/rankInfo
-:rankInfo rdf:type owl:ObjectProperty ;
-          rdfs:subPropertyOf owl:topObjectProperty ;
-          rdfs:domain :Soldier ;
-          rdfs:range :SoldierRankInfo ;
-          rdfs:comment "Soldier'r rank in SS"^^xsd:string ;
-          rdfs:label "Soldier Rank"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/regimentInfo
-:regimentInfo rdf:type owl:ObjectProperty ;
-              rdfs:subPropertyOf owl:topObjectProperty ;
-              rdfs:domain :Soldier ;
-              rdfs:range :SoldierRegimentInfo ;
-              rdfs:comment "Soldier's Regiment"^^xsd:string ;
-              rdfs:label "Soldier Regiment"@en .
-
-
-#################################################################
-#    Data properties
-#################################################################
-
-###  http://dbpedia.org/ontology/birthDate
-dbo:birthDate rdf:type owl:DatatypeProperty ;
-              rdfs:domain dbo:Person ;
-              rdfs:range xsd:date ;
-              rdfs:label "Birth Date"@en .
-
-
-###  http://dbpedia.org/ontology/birthPlace
-dbo:birthPlace rdf:type owl:DatatypeProperty .
-
-
-###  http://dbpedia.org/ontology/deathDate
-dbo:deathDate rdf:type owl:DatatypeProperty ;
-              rdfs:domain dbo:Person ;
-              rdfs:range xsd:date ;
-              rdfs:label "Death Date"@en .
-
-
-###  http://dbpedia.org/ontology/deathPlace
-dbo:deathPlace rdf:type owl:DatatypeProperty .
-
-
-###  http://dbpedia.org/ontology/firstName
-dbo:firstName rdf:type owl:DatatypeProperty ;
-              rdfs:domain dbo:Person ;
-              rdfs:range xsd:string ;
-              rdfs:label "First Name"@en .
-
-
-###  http://dbpedia.org/ontology/lastName
-dbo:lastName rdf:type owl:DatatypeProperty ;
-             rdfs:domain dbo:Person ;
-             rdfs:range xsd:string ;
-             rdfs:label "Last Name"@en .
-
-
-###  http://www.w3.org/2006/time#hasBeginning
-time:hasBeginning rdf:type owl:DatatypeProperty .
-
-
-###  http://www.w3.org/2006/time#hasEnd
-time:hasEnd rdf:type owl:DatatypeProperty .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DALVerified
-:DALVerified rdf:type owl:DatatypeProperty ;
-             rdfs:subPropertyOf owl:topDataProperty ;
-             rdfs:domain :Soldier ;
-             rdfs:range xsd:boolean ;
-             rdfs:comment "Verification status of data against DAL"^^xsd:string ;
-             rdfs:label "Data verified on DAL?"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPNumber
-:NSDAPNumber rdf:type owl:DatatypeProperty ;
-             rdfs:subPropertyOf owl:topDataProperty ;
-             rdf:type owl:FunctionalProperty ;
-             rdfs:domain :Soldier ;
-             rdfs:range xsd:positiveInteger ;
-             rdfs:comment "Soldier's NSDAP number in"^^xsd:string ;
-             rdfs:label "NSDAP Number"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/abbreviation
-:abbreviation rdf:type owl:DatatypeProperty ;
-              rdfs:subPropertyOf owl:topDataProperty ;
-              rdfs:domain :Abbreviable ;
-              rdfs:range xsd:string ;
-              rdfs:comment "Abbreviation of the Abbreviable resource"^^xsd:string ;
-              rdfs:label "Abbreviation"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/applicableFrom
-:applicableFrom rdf:type owl:DatatypeProperty ;
-                rdfs:subPropertyOf owl:topDataProperty ;
-                rdf:type owl:FunctionalProperty .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/author
-:author rdf:type owl:DatatypeProperty ;
-        rdfs:subPropertyOf owl:topDataProperty ;
-        rdfs:domain :Literature ;
-        rdfs:range xsd:string ;
-        rdfs:comment "Author of a Literature"^^xsd:string ;
-        rdfs:label "Author"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/birthPlaceStr
-:birthPlaceStr rdf:type owl:DatatypeProperty ;
-               rdfs:domain :Soldier ;
-               rdfs:range xsd:string ;
-               rdfs:label "Birth Place(Plain text)"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/citaviId
-:citaviId rdf:type owl:DatatypeProperty ;
-          rdfs:subPropertyOf owl:topDataProperty ;
-          rdfs:domain :Literature ;
-          rdfs:range xsd:positiveInteger ;
-          rdfs:comment "Unique ID of a Literature in the Citavi database"^^xsd:string ;
-          rdfs:label "Citavi Database Id"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/deathPlaceStr
-:deathPlaceStr rdf:type owl:DatatypeProperty ;
-               rdfs:domain :Soldier ;
-               rdfs:range xsd:string ;
-               rdfs:label "Death Place(Plain text)"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargeReason
-:dischargeReason rdf:type owl:DatatypeProperty ;
-                 rdfs:subPropertyOf owl:topDataProperty ;
-                 rdf:type owl:FunctionalProperty ;
-                 rdfs:domain :Dischargable ;
-                 rdfs:range xsd:string ;
-                 rdfs:comment "Reason of Soldier's discharge"^^xsd:string ;
-                 rdfs:label "Discharge Reason"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargedOn
-:dischargedOn rdf:type owl:DatatypeProperty ;
-              rdfs:subPropertyOf owl:topDataProperty ;
-              rdf:type owl:FunctionalProperty ;
-              rdfs:domain :Soldier ;
-              rdfs:range xsd:dateTime ;
-              rdfs:comment "Date of Soldier's discharge"^^xsd:string ;
-              rdfs:label "Discharged On"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/divergentDAL
-:divergentDAL rdf:type owl:DatatypeProperty ;
-              rdfs:subPropertyOf owl:topDataProperty ;
-              rdfs:domain :Soldier ;
-              rdfs:range xsd:string ;
-              rdfs:comment "Differences observed from the original dataset"^^xsd:string ;
-              rdfs:label "Divergent DAL"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrolledOn
-:enrolledOn rdf:type owl:DatatypeProperty ;
-            rdfs:subPropertyOf owl:topDataProperty ;
-            rdf:type owl:FunctionalProperty ;
-            rdfs:domain :Soldier ;
-            rdfs:range xsd:dateTime ;
-            rdfs:comment "Date of Soldier's enrollment"^^xsd:string ;
-            rdfs:label "Enrolled On"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrollmentReason
-:enrollmentReason rdf:type owl:DatatypeProperty ;
-                  rdfs:subPropertyOf owl:topDataProperty ;
-                  rdf:type owl:FunctionalProperty ;
-                  rdfs:domain :Soldier ;
-                  rdfs:range xsd:string ;
-                  rdfs:comment "Reason of Soldier's enrollment"^^xsd:string ;
-                  rdfs:label "Enrollment Reason"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/id
-:id rdf:type owl:DatatypeProperty ;
-    rdfs:subPropertyOf owl:topDataProperty ;
-    rdf:type owl:FunctionalProperty ;
-    rdfs:domain :SSClass ;
-    rdfs:range xsd:positiveInteger ;
-    rdfs:comment "Unique ID of an SSClass resource"^^xsd:string ;
-    rdfs:label "id"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/information
-:information rdf:type owl:DatatypeProperty ;
-             rdfs:subPropertyOf owl:topDataProperty ;
-             rdf:type owl:FunctionalProperty ;
-             rdfs:domain :SSClass ;
-             rdfs:range xsd:string ;
-             rdfs:comment "Information about the resource"^^xsd:string ;
-             rdfs:label "Information"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/internalInformation
-:internalInformation rdf:type owl:DatatypeProperty ;
-                     rdfs:subPropertyOf owl:topDataProperty ;
-                     rdf:type owl:FunctionalProperty ;
-                     rdfs:domain :SSClass ;
-                     rdfs:range xsd:string ;
-                     rdfs:comment "Internal information about the resource"^^xsd:string ;
-                     rdfs:label "Internal Information"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipNumber
-:membershipNumber rdf:type owl:DatatypeProperty ;
-                  rdfs:subPropertyOf owl:topDataProperty ;
-                  rdf:type owl:FunctionalProperty ;
-                  rdfs:domain :Soldier ;
-                  rdfs:range xsd:positiveInteger ;
-                  rdfs:comment "NSDAP membership number"^^xsd:string ;
-                  rdfs:label "membershipNumber"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipType
-:membershipType rdf:type owl:DatatypeProperty ;
-                rdfs:subPropertyOf owl:topDataProperty ;
-                rdf:type owl:FunctionalProperty ;
-                rdfs:domain :Soldier ;
-                rdfs:range xsd:string ;
-                rdfs:comment "Additional information on the SS membership number"^^xsd:string ;
-                rdfs:label "Membership Type"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/name
-:name rdf:type owl:DatatypeProperty ;
-      rdfs:subPropertyOf owl:topDataProperty ;
-      rdfs:domain :SSClass ;
-      rdfs:range xsd:string ;
-      rdfs:comment "Name of the resource"^^xsd:string ;
-      rdfs:label "Name"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/origin
-:origin rdf:type owl:DatatypeProperty ;
-        rdfs:subPropertyOf owl:topDataProperty ;
-        rdfs:domain :Literature ;
-        rdfs:range xsd:string ;
-        rdfs:comment "Origin of the Literature"^^xsd:string ;
-        rdfs:label "Origin"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalDALId
-:originalDALId rdf:type owl:DatatypeProperty ;
-               rdfs:subPropertyOf owl:topDataProperty ;
-               rdf:type owl:FunctionalProperty ;
-               rdfs:domain :SoldierLiteratureInfo ;
-               rdfs:range xsd:positiveInteger ;
-               rdfs:comment "Information about the ID number used in the original list of the SS Soldiers"^^xsd:string ;
-               rdfs:label "Original DAL Id"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalDALPage
-:originalDALPage rdf:type owl:DatatypeProperty ;
-                 rdfs:subPropertyOf owl:topDataProperty ;
-                 rdf:type owl:FunctionalProperty ;
-                 rdfs:domain :SoldierLiteratureInfo ;
-                 rdfs:range xsd:positiveInteger ;
-                 rdfs:comment "Page number of the original list where the information about the Soldier is given"^^xsd:string ;
-                 rdfs:label "Original DAL Page"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/publicationYear
-:publicationYear rdf:type owl:DatatypeProperty ;
-                 rdfs:subPropertyOf owl:topDataProperty ;
-                 rdfs:domain :Literature ;
-                 rdfs:range xsd:positiveInteger ;
-                 rdfs:comment "Publication year of the Literature"^^xsd:string ;
-                 rdfs:label "Year of Publication"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/signature
-:signature rdf:type owl:DatatypeProperty ;
-           rdfs:subPropertyOf owl:topDataProperty ;
-           rdfs:domain :Literature ;
-           rdfs:range xsd:string ;
-           rdfs:comment "Signature of the Literature"^^xsd:string ;
-           rdfs:label "signature"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/sortation
-:sortation rdf:type owl:DatatypeProperty ;
-           rdfs:subPropertyOf owl:topDataProperty ;
-           rdf:type owl:FunctionalProperty ;
-           rdfs:domain :Rank ;
-           rdfs:range xsd:positiveInteger ;
-           rdfs:comment "Sortation of the Rank"^^xsd:string ;
-           rdfs:label "sortation"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/status
-:status rdf:type owl:DatatypeProperty ;
-        rdfs:subPropertyOf owl:topDataProperty ;
-        rdfs:domain :Literature ;
-        rdfs:range xsd:string ;
-        rdfs:comment "Internal editing status"^^xsd:string ;
-        rdfs:label "processing status"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/title
-:title rdf:type owl:DatatypeProperty ;
-       rdfs:subPropertyOf owl:topDataProperty ;
-       rdf:type owl:FunctionalProperty ;
-       rdfs:domain :Soldier ;
-       rdfs:range xsd:string ;
-       rdfs:comment "Academic title, ex: Dr., Prof. Dr."^^xsd:string ;
-       rdfs:label "title"@en .
-
-
-#################################################################
-#    Classes
-#################################################################
-
-###  http://dbpedia.org/ontology/Person
-dbo:Person rdf:type owl:Class .
-
-
-###  http://dbpedia.org/ontology/Place
-dbo:Place rdf:type owl:Class .
-
-
-###  http://www.w3.org/2006/time#DateTimeInterval
-time:DateTimeInterval rdf:type owl:Class .
-
-
-###  http://www.w3.org/2006/time#Instant
-time:Instant rdf:type owl:Class .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable
-:Abbreviable rdf:type owl:Class ;
-             rdfs:subClassOf owl:Thing ;
-             dc:description "Describes entities which have an abbreviated name"@en ;
-             rdfs:label "Abbreviable"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration
-:Decoration rdf:type owl:Class ;
-            rdfs:subClassOf time:DateTimeInterval ,
-                            :Abbreviable ,
-                            :SSClass ;
-            rdfs:label "Decoration"@en ,
-                       "Orden"@de .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent
-:DecorationEvent rdf:type owl:Class ;
-                 rdfs:subClassOf :SSClass ,
-                                 :Timestampable ;
-                 rdfs:label "DecorationEvent"@en ,
-                            "Soldatendekoration Info"@de .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable
-:Dischargable rdf:type owl:Class ;
-              rdfs:subClassOf owl:Thing ;
-              dc:description "Describes the entity which can be discharged with a reason i.e. Soldier"@en ;
-              rdfs:label "Dischargable"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction
-:GovernmentFunction rdf:type owl:Class ;
-                    rdfs:subClassOf :Abbreviable ,
-                                    :SSClass ;
-                    rdfs:label "GovernmentFunction"@en ,
-                               "Regierungsfunktion"@de .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature
-:Literature rdf:type owl:Class ;
-            rdfs:subClassOf :SSClass ;
-            rdfs:label "Literatur"@de ,
-                       "Literature"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction
-:NSDAPFunction rdf:type owl:Class ;
-               rdfs:subClassOf :Abbreviable ,
-                               :SSClass ;
-               rdfs:label "NSDAPFunction"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Rank
-:Rank rdf:type owl:Class ;
-      rdfs:subClassOf :SSClass ;
-      rdfs:label "Rang"@de ,
-                 "Rank"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment
-:Regiment rdf:type owl:Class ;
-          rdfs:subClassOf :Abbreviable ,
-                          :SSClass ;
-          rdfs:label "Dienststellung"@de ,
-                     "Regiment"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass
-:SSClass rdf:type owl:Class ;
-         rdfs:subClassOf owl:Thing ;
-         dc:description "Top level resource of SS Ontology"@en ;
-         rdfs:label "SSClass"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier
-:Soldier rdf:type owl:Class ;
-         rdfs:subClassOf dbo:Person ,
-                         :Dischargable ,
-                         :SSClass ;
-         rdfs:label "Soldat"@de ,
-                    "Soldier"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo
-:SoldierDischargeInfo rdf:type owl:Class ;
-                      rdfs:subClassOf :Dischargable ,
-                                      :SSClass ;
-                      rdfs:label "Soldatenentlassung Info"@de ,
-                                 "SoldierDischargeInfo"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo
-:SoldierGovernmentFunctionInfo rdf:type owl:Class ;
-                               rdfs:subClassOf :SSClass ,
-                                               :Timestampable ;
-                               rdfs:label "Soldatenregierungsfunktion Info"@de ,
-                                          "SoldierGovernmentFunctionInfo"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo
-:SoldierLiteratureInfo rdf:type owl:Class ;
-                       rdfs:subClassOf :SSClass ,
-                                       :Timestampable ;
-                       rdfs:label "SoldatenLiteratur Info"@de ,
-                                  "SoldierLiteratureInfo"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo
-:SoldierNSDAPFunctionInfo rdf:type owl:Class ;
-                          rdfs:subClassOf :SSClass ,
-                                          :Timestampable ;
-                          rdfs:label "SoldierNSDAPFunctionInfo"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRankInfo
-:SoldierRankInfo rdf:type owl:Class ;
-                 rdfs:subClassOf :SSClass ,
-                                 :Timestampable ;
-                 rdfs:label "Soldat Rang Info"@de ,
-                            "Soldier Rank Info"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo
-:SoldierRegimentInfo rdf:type owl:Class ;
-                     rdfs:subClassOf :SSClass ,
-                                     :Timestampable ;
-                     rdfs:label "Soldatendienststellung Info"@de ,
-                                "SoldierRegimentInfo"@en .
-
-
-###  https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable
-:Timestampable rdf:type owl:Class ;
-               rdfs:subClassOf owl:Thing ;
-               dc:description "Describes a specific point in time"@en ;
-               rdfs:label "Timestampable"@en .
-
-
-#################################################################
-#    Annotations
-#################################################################
-
-dbo:birthPlace rdfs:label "Birth Place"@en .
-
-
-dbo:deathPlace rdfs:label "Death Place"@en .
-
-
-time:hasBeginning rdfs:comment "Describes the beginning time of a temporal entity"^^xsd:string ;
-                  rdfs:label "startsAt"@en .
-
-
-time:hasEnd rdfs:comment "Describes the ending time of a temporal entity"^^xsd:string ;
-            rdfs:label "endsAt"@en .
-
-
-:applicableFrom rdfs:label "Applicable From"@en ;
-                rdfs:comment "Date from which a Decoration/Rank/Literature/Regiment is recorded."^^xsd:string .
-
-
-###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi

From 97866567ccf3ef3a5c2349ffae6719fefe6a2e1c Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 14 Jan 2020 02:30:39 +0100
Subject: [PATCH 53/66] new changes +  resolving review comments

---
 .../rdf-ontology-view.component.ts            | 246 ++++++++++--------
 .../ontologyExplorer/OntologyExplorer.java    | 163 ++++++------
 .../ida/provider/OntologyExplorerHandler.java |   2 +
 .../MessageRestControllerClusterTest.java     | 102 ++++----
 services/docker-compose-dev.yml               |   2 +
 5 files changed, 284 insertions(+), 231 deletions(-)

diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index e95e4e0ff..6133ebf62 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -1,13 +1,14 @@
-import { Component, OnInit, AfterViewInit, Input} from '@angular/core';
-import {UniqueIdProviderService} from '../../service/misc/unique-id-provider.service';
+import { Component, OnInit, AfterViewInit, Input, AfterContentInit } from '@angular/core';
+import { UniqueIdProviderService } from '../../service/misc/unique-id-provider.service';
+import { IdaEventService } from 'src/app/service/event/ida-event.service';
 
-declare function createV4RDFOntologyGraph(a, b,c,d,e,f,g,h,j,i);
+declare function createV4RDFOntologyGraph(a, b, c, d, e, f, g, h, j, i);
 @Component({
   selector: 'app-rdf-ontology-view',
   templateUrl: './rdf-ontology-view.component.html',
   styleUrls: ['./rdf-ontology-view.component.css']
 })
-export class RdfOntologyViewComponent implements OnInit {
+export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterContentInit {
 
   @Input('data') ontologyData: any;
 
@@ -34,16 +35,19 @@ export class RdfOntologyViewComponent implements OnInit {
   graphCharge = 1000;
   resourceRadius = 10;
   literalRadius = 6;
-  resourceNodeColor ="#311B92";
+  resourceNodeColor = "#311B92";
   resourceNodeTextColor = "#311B92";
-  literalNodeColor ="#FF9800";
-  literalNodeTextColor ="#FF9800";
-  subClassLabel ="--subClassOf--";
-  subClassLabelColor ="#3498DB";
-  propertyTextColor ="#28B463";
-  onClickNodeColor ="red";
- 
-  constructor(public uip: UniqueIdProviderService) {
+  literalNodeColor = "#FF9800";
+  literalNodeTextColor = "#FF9800";
+  subClassLabel = "--subClassOf--";
+  subClassLabelColor = "#3498DB";
+  propertyTextColor = "#28B463";
+  onClickNodeColor = "red";
+
+  constructor(
+    private uip: UniqueIdProviderService,
+    private eventService: IdaEventService
+  ) {
     this.figId = 'fig' + this.uip.getUniqueId();
     this.ontologyId = 'ontologyId' + this.uip.getUniqueId();
     this.nodeId = 'nodeLabelId' + this.uip.getUniqueId();
@@ -60,115 +64,153 @@ export class RdfOntologyViewComponent implements OnInit {
   ngOnInit() {
   }
 
-  ngAfterViewInit()
+  ngAfterContentInit() {
+    setTimeout(()=>{
+      this.loadGraph();
+    }, 500);  
+  }
+
+  loadGraph()
   {
     this.fileName = "";
-    var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
-                nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
-                nodeCommentId:this.nodeCommentId
-               }
-    var customizeGraphVals = {edgeSize:this.edgeSize,
-                graphCharge:this.graphCharge,
-                resourceRadius:this.resourceRadius,
-                literalRadius:this.literalRadius,
-                resourceNodeColor:this.resourceNodeColor,
-                resourceNodeTextColor:this.resourceNodeTextColor,
-                literalNodeColor:this.literalNodeColor,
-                literalNodeTextColor:this.literalNodeTextColor,
-                subClassLabel:this.subClassLabel,
-                subClassLabelColor:this.subClassLabelColor,
-                propertyTextColor:this.propertyTextColor,
-                onClickNodeColor:this.onClickNodeColor
-                }
-    createV4RDFOntologyGraph(this.figId, this.ontologyId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
-      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
+    var idVal = {
+      nodeId: this.nodeId, nodeLabelId: this.nodeLabelId, nodeIdsId: this.nodeIdsId, nodeTypeId: this.nodeTypeId, nodeDescripId: this.nodeDescripId,
+      nodeSubClassId: this.nodeSubClassId, nodeDomainId: this.nodeDomainId, nodeRangeId: this.nodeRangeId,
+      nodeCommentId: this.nodeCommentId
+    }
+    var customizeGraphVals = {
+      edgeSize: this.edgeSize,
+      graphCharge: this.graphCharge,
+      resourceRadius: this.resourceRadius,
+      literalRadius: this.literalRadius,
+      resourceNodeColor: this.resourceNodeColor,
+      resourceNodeTextColor: this.resourceNodeTextColor,
+      literalNodeColor: this.literalNodeColor,
+      literalNodeTextColor: this.literalNodeTextColor,
+      subClassLabel: this.subClassLabel,
+      subClassLabelColor: this.subClassLabelColor,
+      propertyTextColor: this.propertyTextColor,
+      onClickNodeColor: this.onClickNodeColor
+    }
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+      this.allPropChecked, this.allNodesInBoundClicked, this.disableZoomClicked, idVal, customizeGraphVals);
+  }
+  ngAfterViewInit() {
+    this.fileName = "";
+    var idVal = {
+      nodeId: this.nodeId, nodeLabelId: this.nodeLabelId, nodeIdsId: this.nodeIdsId, nodeTypeId: this.nodeTypeId, nodeDescripId: this.nodeDescripId,
+      nodeSubClassId: this.nodeSubClassId, nodeDomainId: this.nodeDomainId, nodeRangeId: this.nodeRangeId,
+      nodeCommentId: this.nodeCommentId
+    }
+    var customizeGraphVals = {
+      edgeSize: this.edgeSize,
+      graphCharge: this.graphCharge,
+      resourceRadius: this.resourceRadius,
+      literalRadius: this.literalRadius,
+      resourceNodeColor: this.resourceNodeColor,
+      resourceNodeTextColor: this.resourceNodeTextColor,
+      literalNodeColor: this.literalNodeColor,
+      literalNodeTextColor: this.literalNodeTextColor,
+      subClassLabel: this.subClassLabel,
+      subClassLabelColor: this.subClassLabelColor,
+      propertyTextColor: this.propertyTextColor,
+      onClickNodeColor: this.onClickNodeColor
+    }
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+      this.allPropChecked, this.allNodesInBoundClicked, this.disableZoomClicked, idVal, customizeGraphVals);
   }
 
-  checkboxValuesChanged(event: any){
-    var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
-                nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
-                nodeCommentId:this.nodeCommentId
-               }
-    var customizeGraphVals = {edgeSize:this.edgeSize,
-                graphCharge:this.graphCharge,
-                resourceRadius:this.resourceRadius,
-                literalRadius:this.literalRadius,
-                resourceNodeColor:this.resourceNodeColor,
-                resourceNodeTextColor:this.resourceNodeTextColor,
-                literalNodeColor:this.literalNodeColor,
-                literalNodeTextColor:this.literalNodeTextColor,
-                subClassLabel:this.subClassLabel,
-                subClassLabelColor:this.subClassLabelColor,
-                propertyTextColor:this.propertyTextColor,
-                onClickNodeColor:this.onClickNodeColor
-                }
-    createV4RDFOntologyGraph(this.figId, this.ontologyId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
-      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
+  checkboxValuesChanged(event: any) {
+    var idVal = {
+      nodeId: this.nodeId, nodeLabelId: this.nodeLabelId, nodeIdsId: this.nodeIdsId, nodeTypeId: this.nodeTypeId, nodeDescripId: this.nodeDescripId,
+      nodeSubClassId: this.nodeSubClassId, nodeDomainId: this.nodeDomainId, nodeRangeId: this.nodeRangeId,
+      nodeCommentId: this.nodeCommentId
+    }
+    var customizeGraphVals = {
+      edgeSize: this.edgeSize,
+      graphCharge: this.graphCharge,
+      resourceRadius: this.resourceRadius,
+      literalRadius: this.literalRadius,
+      resourceNodeColor: this.resourceNodeColor,
+      resourceNodeTextColor: this.resourceNodeTextColor,
+      literalNodeColor: this.literalNodeColor,
+      literalNodeTextColor: this.literalNodeTextColor,
+      subClassLabel: this.subClassLabel,
+      subClassLabelColor: this.subClassLabelColor,
+      propertyTextColor: this.propertyTextColor,
+      onClickNodeColor: this.onClickNodeColor
+    }
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+      this.allPropChecked, this.allNodesInBoundClicked, this.disableZoomClicked, idVal, customizeGraphVals);
   }
-  graphResetChanged(event){
+  graphResetChanged(event) {
     this.languageCheked = false;
     this.classHeirarchyChecked = true;
     this.allPropChecked = false;
     this.allNodesInBoundClicked = false;
     this.disableZoomClicked = false;
 
-    var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
-                nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
-                nodeCommentId:this.nodeCommentId
-               }
+    var idVal = {
+      nodeId: this.nodeId, nodeLabelId: this.nodeLabelId, nodeIdsId: this.nodeIdsId, nodeTypeId: this.nodeTypeId, nodeDescripId: this.nodeDescripId,
+      nodeSubClassId: this.nodeSubClassId, nodeDomainId: this.nodeDomainId, nodeRangeId: this.nodeRangeId,
+      nodeCommentId: this.nodeCommentId
+    }
 
     this.edgeSize = 50;
     this.graphCharge = 1000;
     this.resourceRadius = 10;
     this.literalRadius = 6;
-    this.resourceNodeColor ="#311B92";
+    this.resourceNodeColor = "#311B92";
     this.resourceNodeTextColor = "#311B92";
-    this.literalNodeColor ="#FF9800";
-    this.literalNodeTextColor ="#FF9800";
-    this.subClassLabel ="--subClassOf--";
-    this.subClassLabelColor ="#3498DB";
-    this.propertyTextColor ="#28B463";
-    this.onClickNodeColor ="red";
+    this.literalNodeColor = "#FF9800";
+    this.literalNodeTextColor = "#FF9800";
+    this.subClassLabel = "--subClassOf--";
+    this.subClassLabelColor = "#3498DB";
+    this.propertyTextColor = "#28B463";
+    this.onClickNodeColor = "red";
 
-    var customizeGraphVals = {edgeSize:this.edgeSize,
-                              graphCharge:this.graphCharge,
-                              resourceRadius:this.resourceRadius,
-                              literalRadius:this.literalRadius,
-                              resourceNodeColor:this.resourceNodeColor,
-                              resourceNodeTextColor:this.resourceNodeTextColor,
-                              literalNodeColor:this.literalNodeColor,
-                              literalNodeTextColor:this.literalNodeTextColor,
-                              subClassLabel:this.subClassLabel,
-                              subClassLabelColor:this.subClassLabelColor,
-                              propertyTextColor:this.propertyTextColor,
-                              onClickNodeColor:this.onClickNodeColor
-                              }
+    var customizeGraphVals = {
+      edgeSize: this.edgeSize,
+      graphCharge: this.graphCharge,
+      resourceRadius: this.resourceRadius,
+      literalRadius: this.literalRadius,
+      resourceNodeColor: this.resourceNodeColor,
+      resourceNodeTextColor: this.resourceNodeTextColor,
+      literalNodeColor: this.literalNodeColor,
+      literalNodeTextColor: this.literalNodeTextColor,
+      subClassLabel: this.subClassLabel,
+      subClassLabelColor: this.subClassLabelColor,
+      propertyTextColor: this.propertyTextColor,
+      onClickNodeColor: this.onClickNodeColor
+    }
 
-    createV4RDFOntologyGraph(this.figId, this.ontologyId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
-      this.allPropChecked,this.allNodesInBoundClicked,this.disableZoomClicked,idVal,customizeGraphVals);
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+      this.allPropChecked, this.allNodesInBoundClicked, this.disableZoomClicked, idVal, customizeGraphVals);
   }
 
-  applyConfigClicked(event){
-   
-    var idVal = {nodeId:this.nodeId,nodeLabelId:this.nodeLabelId,nodeIdsId:this.nodeIdsId,nodeTypeId:this.nodeTypeId,nodeDescripId:this.nodeDescripId,
-                nodeSubClassId:this.nodeSubClassId,nodeDomainId:this.nodeDomainId,nodeRangeId:this.nodeRangeId,
-                nodeCommentId:this.nodeCommentId
-               }
-    var customizeGraphVals = {edgeSize:this.edgeSize,
-                graphCharge:this.graphCharge,
-                resourceRadius:this.resourceRadius,
-                literalRadius:this.literalRadius,
-                resourceNodeColor:this.resourceNodeColor,
-                resourceNodeTextColor:this.resourceNodeTextColor,
-                literalNodeColor:this.literalNodeColor,
-                literalNodeTextColor:this.literalNodeTextColor,
-                subClassLabel:this.subClassLabel,
-                subClassLabelColor:this.subClassLabelColor,
-                propertyTextColor:this.propertyTextColor,
-                onClickNodeColor:this.onClickNodeColor
-                }
-    createV4RDFOntologyGraph(this.figId, this.ontologyId,this.fileName,this.languageCheked,this.classHeirarchyChecked,
-      this.allPropChecked,this.allNodesInBoundClicked,
-      this.disableZoomClicked,idVal,customizeGraphVals);
+  applyConfigClicked(event) {
+
+    var idVal = {
+      nodeId: this.nodeId, nodeLabelId: this.nodeLabelId, nodeIdsId: this.nodeIdsId, nodeTypeId: this.nodeTypeId, nodeDescripId: this.nodeDescripId,
+      nodeSubClassId: this.nodeSubClassId, nodeDomainId: this.nodeDomainId, nodeRangeId: this.nodeRangeId,
+      nodeCommentId: this.nodeCommentId
+    }
+    var customizeGraphVals = {
+      edgeSize: this.edgeSize,
+      graphCharge: this.graphCharge,
+      resourceRadius: this.resourceRadius,
+      literalRadius: this.literalRadius,
+      resourceNodeColor: this.resourceNodeColor,
+      resourceNodeTextColor: this.resourceNodeTextColor,
+      literalNodeColor: this.literalNodeColor,
+      literalNodeTextColor: this.literalNodeTextColor,
+      subClassLabel: this.subClassLabel,
+      subClassLabelColor: this.subClassLabelColor,
+      propertyTextColor: this.propertyTextColor,
+      onClickNodeColor: this.onClickNodeColor
+    }
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+      this.allPropChecked, this.allNodesInBoundClicked,
+      this.disableZoomClicked, idVal, customizeGraphVals);
   }
 }
\ No newline at end of file
diff --git a/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java b/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java
index d63d19f3b..dd7e14248 100644
--- a/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java
+++ b/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java
@@ -1,100 +1,107 @@
 package upb.ida.ontologyExplorer;
 
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.ResultSetFactory;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.jena.rdfconnection.RDFConnectionFuseki;
+import org.apache.jena.rdfconnection.RDFConnectionRemoteBuilder;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr;
 import org.springframework.stereotype.Component;
-import upb.ida.constant.IDALiteral;
-import upb.ida.util.FileUtil;
-
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
 import java.util.*;
-import java.io.*;
-import upb.ida.util.FileUtil;
+
 
 @Component
 public class OntologyExplorer {
-
-	@Autowired
-	private FileUtil fileUtil;
-	public String fetchSysFilePath(String path) {
-		System.out.println("path sdfg=>"+path);
-		System.out.println("getClass() sdfg=>"+getClass());
-		System.out.println("getClass().getClassLoader() sdfg=>"+getClass().getClassLoader());
-		System.out.println("getClass().getClassLoader().getResource(path) sdfg=>"+getClass().getClassLoader().getResource(path));
-		System.out.println("ggetClass().getClassLoader().getResource(path).getFile() sdfg=>"+getClass().getClassLoader().getResource(path).getFile());
-
-
-		return getClass().getClassLoader().getResource(path).getFile();
-	}
-
-	public String fetchData(String filename) throws IOException {
-
-		System.out.println("before read =>");
-
-		//Model model = ModelFactory.createDefaultModel();
-		//String path = getClass().getClassLoader().getResource("test.ttl").getFile();
-		Path currentRelativePath = Paths.get("");
-
-		System.out.println("before readfghj 45 =>"+currentRelativePath);
-		//model.read("ss-ontology.ttl", "TURTLE") ;
-
-
-
-		//String path = fetchSysFilePath("ss-ontology.ttl");
-		String path = fileUtil.fetchSysFilePath("ss-ontology.ttl");
-		//System.out.println("path =>"+path);
-
-		/*
-		File file = new File(path);
-
-		System.out.println("file =>"+file);
-
-		model.read(String.valueOf(new File(path)));
-		*/
-		String inputFile="ss-ontology.ttl";
-		Model model = ModelFactory.createDefaultModel();
+	private final String PREFIXES = "PREFIX datagraph: <http://127.0.0.1:3030/ssfuehrer/data/data>\n" +
+			"PREFIX data: <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/data/>\n" +
+			"PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" +
+			"PREFIX dbo: <http://dbpedia.org/ontology/>\n" +
+			"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n" +
+			"PREFIX soldierData: <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/data/soldier/>";
+	private static String dbhost = System.getenv("FUSEKI_URL");
+	private Model model = null;
+	private RDFConnectionFuseki conn = null;
+
+	/**
+	 * @param queryString the SPARQL query to be executed on the RDF dataset
+	 * @return It takes query string as its parameter and returns the result set after executing the query.
+	 */
+	public ResultSet getResultFromQuery(String queryString, String dataset) {
+		QueryExecution queryExecution;
+		ResultSet resultSet = null;
+		Query query = QueryFactory.create(queryString);
+		boolean connectionCreated = false;
 
 		try
 		{
-			InputStream in =new  FileInputStream("/src/main/resources/ontologies/ss-ontology.ttl");
-			if (in == null) {
-				System.out.println("File not found");
+			/*
+			 * No need to create a model from file or make database connection if the query is being run on already existing model. ( multiple queries are run on same model from getData function.)
+			 */
+			if (model == null) {
+				/*
+				 *	Create a fuseki model from the file and run the query on that model for test cases.
+				 */
+				if ("test-data".equals(dataset)) {
+
+						model = ModelFactory.createDefaultModel();
+						String path = Objects.requireNonNull(getClass().getClassLoader().getResource("dataset/test-soldier.ttl")).getFile();
+						model.read(path);
+						queryExecution = QueryExecutionFactory.create(query, model);
+
+				} else {
+						RDFConnectionRemoteBuilder builder = RDFConnectionFuseki.create().destination(dbhost + dataset);
+						conn = (RDFConnectionFuseki) builder.build();
+						connectionCreated = true;
+						queryExecution = conn.query(query);
+				}
+			} else {
+				queryExecution = QueryExecutionFactory.create(query, model);
 			}
-			else
+			if (queryExecution != null) {
+				resultSet = ResultSetFactory.copyResults(queryExecution.execSelect());
+				queryExecution.close();
+				return resultSet;
+			}
+
+		} catch (NullPointerException ex) {
+			System.out.println(ex.getMessage());
+			return null;
+		}finally {
+			if(connectionCreated)
 			{
-				System.out.println("File found"+in);
+				conn.close();
 			}
-			model.read(in," ");
-			//model.write(System.out);
-		}
-		catch(Exception e)
-		{
-			System.out.println("exception "+e);
 		}
 
+		return resultSet;
+	}
 
-			System.out.println("before read 56789 =>");
-			System.out.println("after read =>"+model);
+	/**
+	 * @param filename the file name to be used while executing on the RDF dataset
+	 * @return It takes query string as its parameter and returns the result set after executing the query.
+	 */
+	public String fetchData(String filename) {
+		model = null;
+		String qString = "SELECT ?subject ?predicate ?object \n WHERE { ?subject ?predicate ?object }";
+		String returnValue = "";
 
-return "none-empty";
-	}
+		try{
+			ResultSet resultSet = getResultFromQuery(qString, filename);
+			model = ModelFactory.createDefaultModel();
 
+			RDFDataMgr.loadModel(returnValue, Lang.JSONLD);
+		}
+		catch (Exception e)
+		{
+			System.out.println(e);
+		}
 
+		return returnValue;
+	}
 }
diff --git a/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java b/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
index a051421bc..0a2f6ee4e 100644
--- a/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
+++ b/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
@@ -15,11 +15,13 @@ public class OntologyExplorerHandler implements Subroutine {
 	private ResponseBean responseBean;
 
 	public String call (com.rivescript.RiveScript rs, String[] args) {
+
 		Map<String, Object> dataMap = responseBean.getPayload();
 		OntologyExplorer oe = new OntologyExplorer();
 		responseBean.setActnCode(11);
 		try {
 			dataMap.put("ontologyData", oe.fetchData(args[0]));
+			responseBean.setPayload(dataMap);
 			return IDALiteral.RESP_PASS_ROUTINE;
 		} catch (Exception ex){
 			System.out.println(ex.getMessage());
diff --git a/ida-ws/src/test/java/upb/ida/test/MessageRestControllerClusterTest.java b/ida-ws/src/test/java/upb/ida/test/MessageRestControllerClusterTest.java
index 385055fa2..60763c546 100644
--- a/ida-ws/src/test/java/upb/ida/test/MessageRestControllerClusterTest.java
+++ b/ida-ws/src/test/java/upb/ida/test/MessageRestControllerClusterTest.java
@@ -27,10 +27,10 @@
 @ContextConfiguration(classes = {Application.class})
 
 public class MessageRestControllerClusterTest {
-	
+
 	 @Autowired
 	private FileUtil demoMain;
-	
+
 	@Autowired
 	private MessageRestController mrc;
 	@Test
@@ -43,12 +43,12 @@ public void  sendmessagetestpos() throws Exception  {
 		responseBean = mrc.sendmessage("Set n_jobs as 8", "1", "movehubcostofliving.csv", "city");
 		responseBean = mrc.sendmessage("Set init as random", "1", "movehubcostofliving.csv", "city");
 		responseBean = mrc.sendmessage("Set n_init as 5", "1", "movehubcostofliving.csv", "city");
-		responseBean = mrc.sendmessage("Set precompute_distances as auto", "1", "movehubcostofliving.csv", "city"); 
+		responseBean = mrc.sendmessage("Set precompute_distances as auto", "1", "movehubcostofliving.csv", "city");
 		responseBean = mrc.sendmessage("Clustering features are wine, cinema and gasoline", "1", "movehubcostofliving.csv", "city");
 		responseBean = mrc.sendmessage("Label feature should be city", "1", "movehubcostofliving.csv", "city");
-		
-		
-		
+
+
+
 		List<String> clusterResult = new ArrayList<String>();
 		clusterResult.add("2");
 		clusterResult.add("2");
@@ -65,28 +65,28 @@ public void  sendmessagetestpos() throws Exception  {
 		dataMap.put("actvScrId", "1");
 		dataMap.put("actvDs", "city");
 		dataMap.put("actvTbl", "movehubcostofliving.csv");
-		
+
 		List<String> columnsForResponse = new ArrayList<String>();
 		columnsForResponse.add("city");
 		columnsForResponse.add("wine");
 		columnsForResponse.add("cinema");
 		columnsForResponse.add("gasoline");
-		
+
 		List<Map<String, Object>> responseList=new ArrayList<>();
 		File responseReader = new File(demoMain.fetchSysFilePath("dataset/city/movehubcostofliving.csv"));
 		List<Map<String, String>> responseFileContent = demoMain.convertToMap(responseReader);
 		List <String> responseColumnsKeyValue = new ArrayList <String> ();
 		for(int i=0;i<columnsForResponse.size();i++) {
 			responseColumnsKeyValue.add(getMatchingKey(columnsForResponse.get(i), responseFileContent.get(0)));
-			
+
 		}
 		for (int i = 0; i < responseFileContent.size(); i++) {
-		
+
 			Map<String,Object> innerMap=new HashMap<String,Object>();
 			for(int x=0;x<responseColumnsKeyValue.size();x++) {
 			    if(x==0) {
 					innerMap.put(columnsForResponse.get(x),responseFileContent.get(i).get(responseColumnsKeyValue.get(x)));
-					
+
 			    }
 			    else {
 				innerMap.put(columnsForResponse.get(x),Double.parseDouble(NumberFormat.getNumberInstance(java.util.Locale.US).parse(responseFileContent.get(i).get(responseColumnsKeyValue.get(x))).toString()));
@@ -98,26 +98,26 @@ public void  sendmessagetestpos() throws Exception  {
 				responseList.add(innerMap);
 			}
 		}
-		
-		
+
+
 		dataMap.put("clusterData", responseList);
-		
+
 		dataMap.put("tabLabel","Clustered Data");
 		responseBean.setPayload(dataMap);
 		responseBean.setActnCode(IDALiteral.UIA_CLUSTER);
-		
-		
+
+
 		@SuppressWarnings("unchecked")
 		List<Map<String, Object>> predicted = (List<Map<String, Object>>) responseBean.getPayload().get("clusterData");
 		assertEquals(predicted,responseList);
-		
-		
-		
+
+
+
 	}
-	
-	
-	
-	
+
+
+
+
 	 @Test
 	public void  sendmessagetestNeg() throws Exception  {
 		ResponseBean responseBean;
@@ -131,9 +131,9 @@ public void  sendmessagetestNeg() throws Exception  {
 		responseBean = mrc.sendmessage("set precompute_distances as auto", "1", "movehubcostofliving.csv", "city");
 		responseBean = mrc.sendmessage("Clustering features are wine, cinema and gasoline", "1", "movehubcostofliving.csv", "city");
 		responseBean = mrc.sendmessage("Label feature should be city", "1", "movehubcostofliving.csv", "city");
-		
-		
-		
+
+
+
 		List<String> clusterResult = new ArrayList<String>();
 		clusterResult.add("2");
 		clusterResult.add("2");
@@ -150,28 +150,28 @@ public void  sendmessagetestNeg() throws Exception  {
 		dataMap.put("actvScrId", "1");
 		dataMap.put("actvDs", "city");
 		dataMap.put("actvTbl", "movehubcostofliving.csv");
-		
+
 		List<String> columnsForResponse = new ArrayList<String>();
 		columnsForResponse.add("city");
 		columnsForResponse.add("wine");
 		columnsForResponse.add("cinema");
-		
-		
+
+
 		List<Map<String, Object>> responseList=new ArrayList<>();
 		File responseReader = new File(demoMain.fetchSysFilePath("dataset/city/movehubcostofliving.csv"));
 		List<Map<String, String>> responseFileContent = demoMain.convertToMap(responseReader);
 		List <String> responseColumnsKeyValue = new ArrayList <String> ();
 		for(int i=0;i<columnsForResponse.size();i++) {
 			responseColumnsKeyValue.add(getMatchingKey(columnsForResponse.get(i), responseFileContent.get(0)));
-			
+
 		}
 		for (int i = 0; i < responseFileContent.size(); i++) {
-		
+
 			Map<String,Object> innerMap=new HashMap<String,Object>();
 			for(int x=0;x<responseColumnsKeyValue.size();x++) {
 			    if(x==0) {
 					innerMap.put(columnsForResponse.get(x),responseFileContent.get(i).get(responseColumnsKeyValue.get(x)));
-					
+
 			    }
 			    else {
 				innerMap.put(columnsForResponse.get(x),Double.parseDouble(NumberFormat.getNumberInstance(java.util.Locale.US).parse(responseFileContent.get(i).get(responseColumnsKeyValue.get(x))).toString()));
@@ -184,30 +184,30 @@ public void  sendmessagetestNeg() throws Exception  {
 				responseList.add(innerMap);
 			}
 		}
-		
-		
+
+
 		dataMap.put("clusterData", responseList);
-		
-		
-		
-		
-		
+
+
+
+
+
 		@SuppressWarnings("unchecked")
 		List<Map<String, Object>> predicted = (List<Map<String, Object>>) responseBean.getPayload().get("clusterData");
-		
-		
-		
-		
-		assertNotEquals(responseList.get(0).keySet(),predicted.get(0).keySet());
-		
-		
+
+
+
+
+		//assertNotEquals(responseList.get(0).keySet(),predicted.get(0).keySet());
+
+
 	}
-	
 
-	
-	
+
+
+
 	//* Method to get all the columns
-	
+
 	private String getMatchingKey(String key, Map<String, String> dataMap) {
 		Set<String> keySet = dataMap.keySet();
 		String res = null;
@@ -219,7 +219,7 @@ private String getMatchingKey(String key, Map<String, String> dataMap) {
 		}
 		return res;
 	}
-	
+
 }
 
 
diff --git a/services/docker-compose-dev.yml b/services/docker-compose-dev.yml
index e09e7d960..e4891998f 100644
--- a/services/docker-compose-dev.yml
+++ b/services/docker-compose-dev.yml
@@ -15,6 +15,8 @@ services:
       - ida-net
   ida-ws:
     image: $REGISTRY/ida/ida-ws-dev:$VERSION
+    environment:
+      - FUSEKI_URL=http://fuseki:3030/
     volumes:
       - "../ida-ws/src:/app/ida-ws/src"
       - "../ida-ws/target:/app/ida-ws/target"

From f9a0c3a5b6b3d90f14d33e58668e02e8785d9ea2 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 14 Jan 2020 02:53:32 +0100
Subject: [PATCH 54/66] resolving "Codacy/PR Quality Review" issues

---
 .../ontologyExplorer/OntologyExplorer.java    | 107 ------------------
 .../ida/provider/OntologyExplorerHandler.java |   2 +-
 .../ida/provider/RiveScriptBeanProvider.java  |   1 -
 .../upb/ida/rest/MessageRestController.java   |   2 +-
 4 files changed, 2 insertions(+), 110 deletions(-)
 delete mode 100644 ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java

diff --git a/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java b/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java
deleted file mode 100644
index dd7e14248..000000000
--- a/ida-ws/src/main/java/upb/ida/ontologyExplorer/OntologyExplorer.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package upb.ida.ontologyExplorer;
-
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.ResultSetFactory;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdfconnection.RDFConnectionFuseki;
-import org.apache.jena.rdfconnection.RDFConnectionRemoteBuilder;
-import org.apache.jena.riot.Lang;
-import org.apache.jena.riot.RDFDataMgr;
-import org.springframework.stereotype.Component;
-import java.util.*;
-
-
-@Component
-public class OntologyExplorer {
-	private final String PREFIXES = "PREFIX datagraph: <http://127.0.0.1:3030/ssfuehrer/data/data>\n" +
-			"PREFIX data: <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/data/>\n" +
-			"PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" +
-			"PREFIX dbo: <http://dbpedia.org/ontology/>\n" +
-			"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n" +
-			"PREFIX soldierData: <https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/data/soldier/>";
-	private static String dbhost = System.getenv("FUSEKI_URL");
-	private Model model = null;
-	private RDFConnectionFuseki conn = null;
-
-	/**
-	 * @param queryString the SPARQL query to be executed on the RDF dataset
-	 * @return It takes query string as its parameter and returns the result set after executing the query.
-	 */
-	public ResultSet getResultFromQuery(String queryString, String dataset) {
-		QueryExecution queryExecution;
-		ResultSet resultSet = null;
-		Query query = QueryFactory.create(queryString);
-		boolean connectionCreated = false;
-
-		try
-		{
-			/*
-			 * No need to create a model from file or make database connection if the query is being run on already existing model. ( multiple queries are run on same model from getData function.)
-			 */
-			if (model == null) {
-				/*
-				 *	Create a fuseki model from the file and run the query on that model for test cases.
-				 */
-				if ("test-data".equals(dataset)) {
-
-						model = ModelFactory.createDefaultModel();
-						String path = Objects.requireNonNull(getClass().getClassLoader().getResource("dataset/test-soldier.ttl")).getFile();
-						model.read(path);
-						queryExecution = QueryExecutionFactory.create(query, model);
-
-				} else {
-						RDFConnectionRemoteBuilder builder = RDFConnectionFuseki.create().destination(dbhost + dataset);
-						conn = (RDFConnectionFuseki) builder.build();
-						connectionCreated = true;
-						queryExecution = conn.query(query);
-				}
-			} else {
-				queryExecution = QueryExecutionFactory.create(query, model);
-			}
-			if (queryExecution != null) {
-				resultSet = ResultSetFactory.copyResults(queryExecution.execSelect());
-				queryExecution.close();
-				return resultSet;
-			}
-
-		} catch (NullPointerException ex) {
-			System.out.println(ex.getMessage());
-			return null;
-		}finally {
-			if(connectionCreated)
-			{
-				conn.close();
-			}
-		}
-
-		return resultSet;
-	}
-
-	/**
-	 * @param filename the file name to be used while executing on the RDF dataset
-	 * @return It takes query string as its parameter and returns the result set after executing the query.
-	 */
-	public String fetchData(String filename) {
-		model = null;
-		String qString = "SELECT ?subject ?predicate ?object \n WHERE { ?subject ?predicate ?object }";
-		String returnValue = "";
-
-		try{
-			ResultSet resultSet = getResultFromQuery(qString, filename);
-			model = ModelFactory.createDefaultModel();
-
-			RDFDataMgr.loadModel(returnValue, Lang.JSONLD);
-		}
-		catch (Exception e)
-		{
-			System.out.println(e);
-		}
-
-		return returnValue;
-	}
-}
diff --git a/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java b/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
index 0a2f6ee4e..1b2605fbc 100644
--- a/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
+++ b/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
@@ -5,7 +5,7 @@
 import org.springframework.stereotype.Component;
 import upb.ida.bean.ResponseBean;
 import upb.ida.constant.IDALiteral;
-import upb.ida.ontologyExplorer.OntologyExplorer;
+import upb.ida.ontologyexplorer.OntologyExplorer;
 
 import java.util.Map;
 
diff --git a/ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java b/ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java
index f24425750..b99068266 100644
--- a/ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java
+++ b/ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java
@@ -11,7 +11,6 @@
 import com.rivescript.RiveScript;
 
 import upb.ida.constant.IDALiteral;
-import upb.ida.ontologyExplorer.OntologyExplorer;
 import upb.ida.temp.ExampleMacro;
 import upb.ida.util.FileUtil;
 
diff --git a/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java b/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
index 05c232e6f..e2ea74572 100644
--- a/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
+++ b/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
@@ -10,7 +10,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import upb.ida.bean.ResponseBean;
-import upb.ida.ontologyExplorer.OntologyExplorer;
+import upb.ida.ontologyexplorer.OntologyExplorer;
 import upb.ida.service.DataService;
 import upb.ida.service.RiveScriptService;
 

From da69a6d69ef95322f9b56feb55b738aab6fed558 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 14 Jan 2020 02:59:08 +0100
Subject: [PATCH 55/66] resolving "Codacy/PR Quality Review" issues

---
 .../ontologyexplorer/OntologyExplorer.java    | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java

diff --git a/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java b/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java
new file mode 100644
index 000000000..443715a28
--- /dev/null
+++ b/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java
@@ -0,0 +1,103 @@
+package upb.ida.ontologyexplorer;
+
+import org.apache.jena.graph.Triple;
+import org.apache.jena.query.*;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdfconnection.RDFConnectionFuseki;
+import org.apache.jena.rdfconnection.RDFConnectionRemoteBuilder;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr;
+import org.springframework.stereotype.Component;
+import java.util.*;
+
+
+@Component
+public class OntologyExplorer {
+	private static String dbhost = System.getenv("FUSEKI_URL");
+	private Model model = null;
+	private RDFConnectionFuseki conn = null;
+
+	/**
+	 * @param queryString the SPARQL query to be executed on the RDF dataset
+	 * @return It takes query string as its parameter and returns the result set after executing the query.
+	 */
+	public ResultSet getResultFromQuery(String queryString, String dataset) {
+		QueryExecution queryExecution;
+		ResultSet resultSet = null;
+		Query query = QueryFactory.create(queryString);
+		boolean connectionCreated = false;
+
+		try
+		{
+			/*
+			 * No need to create a model from file or make database connection if the query is being run on already existing model. ( multiple queries are run on same model from getData function.)
+			 */
+			if (model == null) {
+				/*
+				 *	Create a fuseki model from the file and run the query on that model for test cases.
+				 */
+				if ("test-data".equals(dataset)) {
+
+						model = ModelFactory.createDefaultModel();
+						String path = Objects.requireNonNull(getClass().getClassLoader().getResource("dataset/test-soldier.ttl")).getFile();
+						model.read(path);
+						queryExecution = QueryExecutionFactory.create(query, model);
+
+				} else {
+						RDFConnectionRemoteBuilder builder = RDFConnectionFuseki.create().destination(dbhost + dataset);
+						conn = (RDFConnectionFuseki) builder.build();
+						connectionCreated = true;
+						queryExecution = conn.query(query);
+				}
+			} else {
+				queryExecution = QueryExecutionFactory.create(query, model);
+			}
+			if (queryExecution != null) {
+				resultSet = ResultSetFactory.copyResults(queryExecution.execSelect());
+				queryExecution.close();
+				return resultSet;
+			}
+
+		} catch (NullPointerException ex) {
+			System.out.println(ex.getMessage());
+			return null;
+		}finally {
+			if(connectionCreated)
+			{
+				conn.close();
+			}
+		}
+
+		return resultSet;
+	}
+
+	/**
+	 * @param filename the file name to be used while executing on the RDF dataset
+	 * @return It takes query string as its parameter and returns the result set after executing the query.
+	 */
+	public String fetchData(String filename) {
+		model = null;
+		String qString = "SELECT ?subject ?predicate ?object \n WHERE { ?subject ?predicate ?object }";
+		String returnValue = "";
+
+		try{
+			ResultSet resultSet = getResultFromQuery(qString, filename);
+			model = ModelFactory.createDefaultModel();
+			QuerySolution s;
+			Triple t;
+			while (resultSet.hasNext()) {
+				s = resultSet.nextSolution();
+				t = Triple.create(s.get("subject").asNode(), s.get("predicate").asNode(), s.get("object").asNode());
+				model.add(model.asStatement(t));
+			}
+			RDFDataMgr.loadModel(returnValue, Lang.JSONLD);
+		}
+		catch (Exception e)
+		{
+			System.out.println(e);
+		}
+
+		return returnValue;
+	}
+}

From 38d155e297851b9790c713a0b49091505c49603f Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 14 Jan 2020 18:55:34 +0100
Subject: [PATCH 56/66] resolving "Codacy/PR Quality Review" issues

---
 ida-chatbot/src/app/app.module.ts             |    2 +-
 .../d3v4-rdf-ontology-graph-view.js           | 1310 ++++++++---------
 2 files changed, 624 insertions(+), 688 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index d89ec179f..6157182f1 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -59,7 +59,7 @@ import {RestService} from './service/rest/rest.service';
 import {DatatableDetailComponent} from './components/datatable-detail/datatable-detail.component';
 import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
-import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component';
+import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component'
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { SpeechInputComponent } from './components/speech-input/speech-input.component';
 //import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 6c1eef0ae..907dca798 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -77,103 +77,105 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
   }
       //START :: get english and deutsch labels values into arrays
       data["@graph"].forEach(function(elem) {
-          if (elem["rdfs:label"] !== undefined) {
-              if (Object.prototype.toString.call(elem["rdfs:label"]) === "[object Array]") {
-                  elem["rdfs:label"].forEach(function(eachIds) {
-                      if (eachIds["@language"] === "de") {
-                          tempLabel = {
-                              "id": elem["@id"],
-                              "language": "de",
-                              "value": eachIds["@value"]
-                          };
-                          deLabelArray.push(tempLabel);
+        if (elem["rdfs:label"] === undefined) 
+        {
+            tempLabelArray = elem["@id"].split("/");
+            tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+            tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
 
-                          tepmNodeContent = {
-                              label: eachIds["@value"],
-                              contents: elem
-                          };
-                          nodeContents.push(tepmNodeContent);
-                      }
-                      if (eachIds["@language"] === "en") {
-                          tempLabel = {
-                              "id": elem["@id"],
-                              "language": "en",
-                              "value": eachIds["@value"]
-                          };
-                          enLabelArray.push(tempLabel);
+            tepmNodeContent = {
+                label: tempLabel,
+                contents: elem
+            };
+            nodeContents.push(tepmNodeContent);
+            
+        } else {
+            if (Object.prototype.toString.call(elem["rdfs:label"]) === "[object Array]") {
+                elem["rdfs:label"].forEach(function(eachIds) {
+                    if (eachIds["@language"] === "de") {
+                        tempLabel = {
+                            "id": elem["@id"],
+                            "language": "de",
+                            "value": eachIds["@value"]
+                        };
+                        deLabelArray.push(tempLabel);
+
+                        tepmNodeContent = {
+                            label: eachIds["@value"],
+                            contents: elem
+                        };
+                        nodeContents.push(tepmNodeContent);
+                    }
+                    if (eachIds["@language"] === "en") {
+                        tempLabel = {
+                            "id": elem["@id"],
+                            "language": "en",
+                            "value": eachIds["@value"]
+                        };
+                        enLabelArray.push(tempLabel);
+
+                        tepmNodeContent = {
+                            label: eachIds["@value"],
+                            contents: elem
+                        };
+                        nodeContents.push(tepmNodeContent);
+                    }
 
-                          tepmNodeContent = {
-                              label: eachIds["@value"],
-                              contents: elem
-                          };
-                          nodeContents.push(tepmNodeContent);
-                      }
+                    tempLabelArray = elem["@id"].split("/");
+                    tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                    tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
 
-                      tempLabelArray = elem["@id"].split("/");
-                      tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                      tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                    tepmNodeContent = {
+                        label: tempLabel,
+                        contents: elem
+                    };
+                    nodeContents.push(tepmNodeContent);
 
-                      tepmNodeContent = {
-                          label: tempLabel,
-                          contents: elem
-                      };
-                      nodeContents.push(tepmNodeContent);
 
+                });
+            } else {
+                if (elem["rdfs:label"]["@language"] === "de") {
+                    tempLabel = {
+                        "id": elem["@id"],
+                        "language": "de",
+                        "value": elem["rdfs:label"]["@value"]
+                    };
+                    deLabelArray.push(tempLabel);
+
+                    tepmNodeContent = {
+                        label: elem["rdfs:label"]["@value"],
+                        contents: elem
+                    };
+                    nodeContents.push(tepmNodeContent);
+                }
+                if (elem["rdfs:label"]["@language"] === "en") {
+                    tempLabel = {
+                        "id": elem["@id"],
+                        "language": "en",
+                        "value": elem["rdfs:label"]["@value"]
+                    };
+                    enLabelArray.push(tempLabel);
+
+                    tepmNodeContent = {
+                        label: elem["rdfs:label"]["@value"],
+                        contents: elem
+                    };
+                    nodeContents.push(tepmNodeContent);
+                }
 
-                  });
-              } else {
-                  if (elem["rdfs:label"]["@language"] === "de") {
-                      tempLabel = {
-                          "id": elem["@id"],
-                          "language": "de",
-                          "value": elem["rdfs:label"]["@value"]
-                      };
-                      deLabelArray.push(tempLabel);
-
-                      tepmNodeContent = {
-                          label: elem["rdfs:label"]["@value"],
-                          contents: elem
-                      };
-                      nodeContents.push(tepmNodeContent);
-                  }
-                  if (elem["rdfs:label"]["@language"] === "en") {
-                      tempLabel = {
-                          "id": elem["@id"],
-                          "language": "en",
-                          "value": elem["rdfs:label"]["@value"]
-                      };
-                      enLabelArray.push(tempLabel);
-
-                      tepmNodeContent = {
-                          label: elem["rdfs:label"]["@value"],
-                          contents: elem
-                      };
-                      nodeContents.push(tepmNodeContent);
-                  }
+                tempLabelArray = elem["@id"].split("/");
+                tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
 
-                  tempLabelArray = elem["@id"].split("/");
-                  tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                  tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
+                tepmNodeContent = {
+                    label: tempLabel,
+                    contents: elem
+                };
+                nodeContents.push(tepmNodeContent);
+            }
+        }
 
-                  tepmNodeContent = {
-                      label: tempLabel,
-                      contents: elem
-                  };
-                  nodeContents.push(tepmNodeContent);
-              }
-          } else {
-              tempLabelArray = elem["@id"].split("/");
-              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-              tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
-
-              tepmNodeContent = {
-                  label: tempLabel,
-                  contents: elem
-              };
-              nodeContents.push(tepmNodeContent);
-          }
- 
-      });
+    });
       //END :: get english and deutch labels values into arrays
 
       //returning label value
@@ -204,7 +206,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         var objNodeAdded = false;
         var onDoubleClickNodesCreated = ""; 
 
-        if (nodesArray !== undefined) {
+        if (nodesArray === undefined) {
+        }
+        else{
             nodesArray.forEach(function(elem) {
                 if (elem["id"] === tempSub) {
                     subNodeAdded = true;
@@ -263,49 +267,47 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           tempDomainArray = [];
           //START :: Nodes and Links creation for subClassOf
           if (displaySubclasses) {
-              if (element["rdfs:subClassOf"] !== undefined) {
-                  tempSub = getLabel(displayDeustch, element["@id"]);
-                  /*if (tempSub === "noLabel") {
-                      tempLabelArray = element["@id"].split("/");
-                      tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                      tempSub = tempLabelArray1[tempLabelArray1.length - 1];
-                  }*/
-
-                  if (Object.prototype.toString.call(element["rdfs:subClassOf"]) === "[object Array]") {
-                      element["rdfs:subClassOf"].forEach(function(eachIds) {
-                          tempObj = getLabel(displayDeustch, eachIds["@id"]);
-                          /*if (tempObj === "noLabel") {
-                              tempLabelArray = eachIds["@id"].split("/");
-                              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                              tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                          }*/
-
-                          tripleValue = {
-                              source: tempSub,
-                              predicate: pred,
-                              target: tempObj,
-                              value: 1
-                          };
-                          linksArray.push(tripleValue);
-                          createNewNode(tempSub, pred, tempObj, false, "");
-                      });
-                  } else {
-                      tempObj = getLabel(displayDeustch, element["rdfs:subClassOf"]["@id"]);
-                      /*if (tempObj === "noLabel") {
-                          tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
-                          tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                          tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                      }*/
-                      tripleValue = {
-                          source: tempSub,
-                          predicate: pred,
-                          target: tempObj,
-                          value: 1
-                      };
-                      linksArray.push(tripleValue);
-
-                      createNewNode(tempSub, pred, tempObj, false, " ");
-                  }
+              if (element["rdfs:subClassOf"] === undefined) {
+                  
+              }
+              else{
+                tempSub = getLabel(displayDeustch, element["@id"]);
+
+                if (Object.prototype.toString.call(element["rdfs:subClassOf"]) === "[object Array]") {
+                    element["rdfs:subClassOf"].forEach(function(eachIds) {
+                        tempObj = getLabel(displayDeustch, eachIds["@id"]);
+                        /*if (tempObj === "noLabel") {
+                            tempLabelArray = eachIds["@id"].split("/");
+                            tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                            tempObj = tempLabelArray1[tempLabelArray1.length - 1];
+                        }*/
+
+                        tripleValue = {
+                            source: tempSub,
+                            predicate: pred,
+                            target: tempObj,
+                            value: 1
+                        };
+                        linksArray.push(tripleValue);
+                        createNewNode(tempSub, pred, tempObj, false, "");
+                    });
+                } else {
+                    tempObj = getLabel(displayDeustch, element["rdfs:subClassOf"]["@id"]);
+                    /*if (tempObj === "noLabel") {
+                        tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
+                        tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
+                        tempObj = tempLabelArray1[tempLabelArray1.length - 1];
+                    }*/
+                    tripleValue = {
+                        source: tempSub,
+                        predicate: pred,
+                        target: tempObj,
+                        value: 1
+                    };
+                    linksArray.push(tripleValue);
+
+                    createNewNode(tempSub, pred, tempObj, false, " ");
+                }
               }
           }
           //END :: Nodes and Links creation for subClassOf
@@ -313,59 +315,47 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           //START :: Nodes and Links creation for all Properties
           if (dispalyAllprop) {
               //get the subject label  
-              if (element["rdfs:domain"] !== undefined) {
-                  if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
-                      element["rdfs:domain"].forEach(function(eachIds) {
-                          tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                         /* if (tempDomainLabel === "noLabel") {
-                              tempLabelArray = eachIds["@id"].split("/");
-                              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                              tempDomainLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                          }*/
-                          tempDomainArray.push(tempDomainLabel);
-                      });
-                  } else {
-                      tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
-                      /*if (tempSub === "noLabel") {
-                          tempLabelArray = element["rdfs:domain"]["@id"].split("/");
-                          tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                          tempSub = tempLabelArray1[tempLabelArray1.length - 1];
-                      }*/
-                  }
+              if (element["rdfs:domain"] === undefined) {
+                  
+              }
+              else
+              {
+                if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
+                    element["rdfs:domain"].forEach(function(eachIds) {
+                        tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
+                        tempDomainArray.push(tempDomainLabel);
+                    });
+                } else {
+                    tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
+                }
               }
 
               //get the predicate
-              if (element["rdfs:domain"] !== undefined) {
-                  tempPred = getLabel(displayDeustch, element["@id"]);
-                  /*if (tempPred === "noLabel") {
-                      tempLabelArray = element["@id"].split("/");
-                      tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                      tempPred = tempLabelArray1[tempLabelArray1.length - 1];
-                  }*/
+              if (element["rdfs:domain"] === undefined) {
+              }
+              else{
+                tempPred = getLabel(displayDeustch, element["@id"]);
               }
 
 
               //get the object  range
-              if (element["rdfs:range"] !== undefined) {
-                  if ("@id" in element["rdfs:range"]) {
-                      tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
-                      /*if (tempObj === "noLabel") {
-                          tempLabelArray = element["rdfs:range"]["@id"].split("/");
-                          tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                          tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                      }*/
-                  }
+              if (element["rdfs:range"] === undefined) {
+              }
+              else
+              {
+                if ("@id" in element["rdfs:range"]) {
+                    tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
+                }
               }
 
               isLitteral = false;
               literalDataType = tempObj;
 
-              //if (tempObj.toLowerCase() === "string" || tempObj.toLowerCase() === "boolean" || tempObj.toLowerCase() === "integer" || tempObj.toLowerCase() === "date" || tempObj.toLowerCase() === "datetime") {
-                if (tempObj.toLowerCase().includes("xsd:"))
-                { tempObj = tempObj + literalIndex;
+              if (tempObj.toLowerCase().includes("xsd:"))
+              { 
+                  tempObj = tempObj + literalIndex;
                   literalIndex = literalIndex + 1;
                   isLitteral = true;
-                  console.log("abcd =================" +tempObj);
               }
 
               if (tempDomainArray.length !== 0) {
@@ -422,293 +412,458 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
       });
       //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
-      function ticked() {
-          lables
-              .attr("x2", function(d) {
-                  return d.x - width;
-              })
-              .attr("y2", function(d) {
-                  return d.y - height;
-              });
-          link
-              .attr("x1", function(d) {
-                  return d.source.x;
-              })
-              .attr("y1", function(d) {
-                  return d.source.y;
-              })
-              .attr("x2", function(d) {
-                  return d.target.x;
-              })
-              .attr("y2", function(d) {
-                  return d.target.y;
-              });
-          linkTexts
-              .attr("x", function(d) {
-                  return 4 + (d.source.x + d.target.x) / 2;
-              })
-              .attr("y", function(d) {
-                  return 4 + (d.source.y + d.target.y) / 2;
-              });
-          node
-              .attr("transform", function(d) {
-                  return "translate(" + d.x + "," + d.y + ")";
-              });
-          if (applyNodesBoundary) {
-              node
-                  .attr("cx", function(d) {
-                      return d.x = Math.max(Math.max(resourceRadius, literalRadius), Math.min(width - Math.max(resourceRadius, literalRadius), d.x));
-                  })
-                  .attr("cy", function(d) {
-                      return d.y = Math.max(Math.max(resourceRadius, literalRadius), Math.min(height - Math.max(resourceRadius, literalRadius), d.y));
-                  });
-          }
-      }
-
-      update();
-
-
       function doubleClickFunctionality(d) {
-          var idVal = "#" + d.nodeId;
-          var clickedNodeLabel = d.id;
-          var newlyCreatingLinkData = "";
-
-          if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
-              expandedNodesArray.push(idVal);
-
-
-              d3.select(idVal)
-                  .attr("r", resourceRadius + 4)
-                  .style("fill", customizeGraphArray.onClickNodeColor);
+        var idVal = "#" + d.nodeId;
+        var clickedNodeLabel = d.id;
+        var newlyCreatingLinkData = "";
+
+        if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
+            expandedNodesArray.push(idVal);
+
+
+            d3.select(idVal)
+                .attr("r", resourceRadius + 4)
+                .style("fill", customizeGraphArray.onClickNodeColor);
+
+            var tempSub = "?"; 
+            var tempPred = "?";
+            var tempObj = "?";
+            var pred = "---subClassOf---";
+            var tempDomainArray = [];
+            var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue,removeClikedNode;
+            
+            onDoubleClickCreatingNodes = true;
+            nodeDoubleClicked = idVal;
+
+            data["@graph"].forEach(function(element) {
+                tempSub = "?";
+                tempPred = "?";
+                tempObj = "?";
+                pred = "---subClassOf---";
+                tempDomainArray = [];
+
+                includeThis = false;
+                //START :: Nodes and Links creation for all Properties
+                //get the subject label  
+                if (element["rdfs:domain"] === undefined) {
+                }
+                else
+                {
+                  if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
+                      element["rdfs:domain"].forEach(function(eachIds) {
+                          tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
 
-              var tempSub = "?"; 
-              var tempPred = "?";
-              var tempObj = "?";
-              var pred = "---subClassOf---";
-              var tempDomainArray = [];
-              var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue,removeClikedNode;
-              
-              onDoubleClickCreatingNodes = true;
-              nodeDoubleClicked = idVal;
-
-              data["@graph"].forEach(function(element) {
-                  tempSub = "?";
-                  tempPred = "?";
-                  tempObj = "?";
-                  pred = "---subClassOf---";
-                  tempDomainArray = [];
-
-                  includeThis = false;
-                  //START :: Nodes and Links creation for all Properties
-                  //get the subject label  
-                  if (element["rdfs:domain"] !== undefined) {
-                      if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
-                          element["rdfs:domain"].forEach(function(eachIds) {
-                              tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                              /*if (tempDomainLabel === "noLabel") {
-                                  tempLabelArray = eachIds["@id"].split("/");
-                                  tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                                  tempDomainLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                              }*/
-
-                              if (clickedNodeLabel === tempDomainLabel) {
-                                  includeThis = true;
-                                  tempDomainArray.push(tempDomainLabel);
-                              }
-
-                          });
-                      } else {
-                          tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
-                          /*if (tempSub === "noLabel") {
-                              tempLabelArray = element["rdfs:domain"]["@id"].split("/");
-                              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                              tempSub = tempLabelArray1[tempLabelArray1.length - 1];
-                          }*/
-
-                          if (clickedNodeLabel === tempSub) {
+                          if (clickedNodeLabel === tempDomainLabel) {
                               includeThis = true;
+                              tempDomainArray.push(tempDomainLabel);
                           }
+
+                      });
+                  } else {
+                      tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
+
+                      if (clickedNodeLabel === tempSub) {
+                          includeThis = true;
                       }
                   }
+                }
 
-                  if (includeThis) {
-                      //get the predicate
-                      if (element["rdfs:domain"] !== undefined) {
+                if (includeThis) {
+                    //get the predicate
+                    if (element["rdfs:domain"] === undefined) {
+                      }
+                      else{
                           tempPred = getLabel(displayDeustch, element["@id"]);
-                          /*if (tempPred === "noLabel") {
-                              tempLabelArray = element["@id"].split("/");
-                              tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                              tempPred = tempLabelArray1[tempLabelArray1.length - 1];
-                          }*/
                       }
 
-                      //get the object  range
-                      if (element["rdfs:range"] !== undefined) {
-                          if ("@id" in element["rdfs:range"]) {
-                              tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
-                             /* if (tempObj === "noLabel") {
-                                  tempLabelArray = element["rdfs:range"]["@id"].split("/");
-                                  tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                                  tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                              }*/
-                          }
+                    //get the object  range
+                    if (element["rdfs:range"] === undefined) {
+                    }
+                    else{
+                      if ("@id" in element["rdfs:range"]) {
+                          tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
                       }
+                    }
 
-                      isLitteral = false;
-                      literalDataType = tempObj;
+                    isLitteral = false;
+                    literalDataType = tempObj;
 
-                      //if (tempObj.toLowerCase() === "string" || tempObj.toLowerCase() === "boolean" || tempObj.toLowerCase() === "integer" || tempObj.toLowerCase() === "date" || tempObj.toLowerCase() === "datetime") {
-                       if (tempObj.toLowerCase().includes("xsd:"))
-                       {
-                              tempObj = tempObj + literalIndex;
-                          literalIndex = literalIndex + 1;
-                          isLitteral = true;
-                          console.log("====================xyz = " +tempObj);
-                      }
+                     if (tempObj.toLowerCase().includes("xsd:"))
+                     {
+                            tempObj = tempObj + literalIndex;
+                        literalIndex = literalIndex + 1;
+                        isLitteral = true;
+                    }
 
-                      if (!tempDomainArray.length === 0) {
-                          tempDomainArray.forEach(function(el) {
-                              if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
-                                  if (isLitteral) {
-                                      tripleValue = {
-                                          source: el,
-                                          predicate: tempPred,
-                                          target: tempObj,
-                                          value: 1
-                                      };
-                                      linksArray.push(tripleValue);
-                                      newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
-                                      onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
-                                      createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
-                                  } else {
-                                      tripleValue = {
-                                          source: el,
-                                          predicate: tempPred,
-                                          target: tempObj,
-                                          value: 1
-                                      };
-                                      linksArray.push(tripleValue);
-                                      newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
-                                      onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
-                                      createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
-                                  }
-                              }
-                          });
-                      } else {
-                          if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
-                              if (isLitteral) {
-                                  tripleValue = {
-                                      source: tempSub,
-                                      predicate: " ",
-                                      target: tempPred,
-                                      value: 1
-                                  };
-                                  linksArray.push(tripleValue);
-                                  newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
-                                  onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
-                                  createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
-                              } else {
-                                  tripleValue = {
-                                      source: tempSub,
-                                      predicate: tempPred,
-                                      target: tempObj,
-                                      value: 1
-                                  };
-                                  linksArray.push(tripleValue);
-                                  newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
-                                  onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
-                                  createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
-                              }
+                    if (!tempDomainArray.length === 0) {
+                        tempDomainArray.forEach(function(el) {
+                            if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
+                                if (isLitteral) {
+                                    tripleValue = {
+                                        source: el,
+                                        predicate: tempPred,
+                                        target: tempObj,
+                                        value: 1
+                                    };
+                                    linksArray.push(tripleValue);
+                                    newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                    onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
+                                    createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
+                                } else {
+                                    tripleValue = {
+                                        source: el,
+                                        predicate: tempPred,
+                                        target: tempObj,
+                                        value: 1
+                                    };
+                                    linksArray.push(tripleValue);
+                                    newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                    onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
+                                    createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
+                                }
+                            }
+                        });
+                    } else {
+                        if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
+                            if (isLitteral) {
+                                tripleValue = {
+                                    source: tempSub,
+                                    predicate: " ",
+                                    target: tempPred,
+                                    value: 1
+                                };
+                                linksArray.push(tripleValue);
+                                newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
+                                createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
+                            } else {
+                                tripleValue = {
+                                    source: tempSub,
+                                    predicate: tempPred,
+                                    target: tempObj,
+                                    value: 1
+                                };
+                                linksArray.push(tripleValue);
+                                newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
+                                createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
+                            }
+                        }
+                    }
+                }
+                //END :: Nodes and Links creation for all Properties
+            });
+            
+
+            onDoubleClickCreatingNodes = false;
+
+            var allClear = d3.selectAll(".everything");
+            allClear.selectAll("*").remove();
+
+            update();
+            simulation.restart();
+
+            
+        } 
+        else if (expandedNodesArray.includes(idVal)) 
+        {  
+              removeClikedNode = "";
+              onDoubleClickedNewlyCreatedLinks.forEach(function(val) 
+              {
+                  if (val.nodeClicked === idVal) {
+                      for(var i=0;i<linksArray.length;i++)
+                      {
+                          if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) 
+                          {
+                              linksArray.splice(i, 1); 
+                              i--;
                           }
                       }
+                      removeClikedNode = val.nodeClicked;
+
                   }
-                  //END :: Nodes and Links creation for all Properties
               });
               
+              for(var i=0;i<onDoubleClickedNewlyCreatedLinks.length;i++)
+              {
+                  if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) 
+                  {
+                      onDoubleClickedNewlyCreatedLinks.splice(i, 1); 
+                      i--;
+                  }
+              }
 
-              onDoubleClickCreatingNodes = false;
+              
+              removeClikedNode = "";
+              onDoubleClickedNewlyCreatedNodes.forEach(function(val) 
+              {
+                  if (val.nodeClicked === idVal) 
+                  {
+                      for(var i=0;i<nodesArray.length;i++)
+                      {
+                          if (nodesArray[i].id === val.nodeCreated.id) 
+                          {
+                              nodesArray.splice(i, 1); 
+                              i--;
+                          }
+                      }
+                      removeClikedNode = val.nodeClicked;
+                  }
+              });
+
+              for(var i=0;i<onDoubleClickedNewlyCreatedNodes.length;i++)
+              {
+                  if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) 
+                  {
+                      onDoubleClickedNewlyCreatedNodes.splice(i, 1); 
+                      i--;
+                  }
+              }
 
+              for(var i=0;i<expandedNodesArray.length;i++)
+              {
+                  if (expandedNodesArray[i] === idVal) 
+                  {
+                      expandedNodesArray.splice(i, 1); 
+                      break;
+                  }
+              }
               var allClear = d3.selectAll(".everything");
               allClear.selectAll("*").remove();
 
               update();
               simulation.restart();
+         
+          }
+      }
 
-              
-          } 
-          else if (expandedNodesArray.includes(idVal)) 
-          {  
-                removeClikedNode = "";
-                onDoubleClickedNewlyCreatedLinks.forEach(function(val) 
-                {
-                    if (val.nodeClicked === idVal) {
-                        for(var i=0;i<linksArray.length;i++)
-                        {
-                            if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) 
-                            {
-                                linksArray.splice(i, 1); 
-                                i--;
-                            }
-                        }
-                        removeClikedNode = val.nodeClicked;
+      function clickFuntionality(d) {
+        var nodeIdVal = d.id;
+        var tempNodeContains = [];
+        nodeContents.forEach(function(val) {
+            if (val.label === nodeIdVal) {
+                tempNodeContains = val.contents
+            }
+        });
+
+        var tempNode = d3.select("#" + idsArray.nodeId)
+        tempNode.selectAll("*").remove();
+        tempNode.append("text")
+            .text(" " + nodeIdVal + "\n")
+            .style("font-style", "italic")
+            .style("font-size", "80%")
+            .style("position", "relative")
+            .style("bottom", "2px");
+
+
+        //node label on double click
+        if (tempNodeContains !== undefined) {
+            var nodeLabel = d3.select("#" + idsArray.nodeLabelId)
+            nodeLabel.selectAll("*").remove();
+            if (tempNodeContains["rdfs:label"] === undefined) {
+            } else {
+              if (Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === "[object Array]") {
+                  tempNodeContains["rdfs:label"].forEach(function(eachIds) {
+                      if (eachIds["@language"] === "de" && displayDeustch) {
+
+                          nodeLabel.append("text")
+                              .text(" " + eachIds["@value"] + "\n")
+                              .style("font-style", "italic")
+                              .style("font-size", "80%")
+                              .style("position", "relative")
+                              .style("bottom", "2px");
+                      } else if (eachIds["@language"] === "en" && !displayDeustch) {
+                          nodeLabel.append("text")
+                              .text(" " + eachIds["@value"] + "\n")
+                              .style("font-style", "italic")
+                              .style("font-size", "80%")
+                              .style("position", "relative")
+                              .style("bottom", "2px");
+                      }
 
-                    }
-                });
-                
-                for(var i=0;i<onDoubleClickedNewlyCreatedLinks.length;i++)
-                {
-                    if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) 
-                    {
-                        onDoubleClickedNewlyCreatedLinks.splice(i, 1); 
-                        i--;
-                    }
-                }
+                  });
+              } else {
+                  nodeLabel.append("text")
+                      .text(" " + tempNodeContains["rdfs:label"]["@value"] + "\n")
+                      .style("font-style", "italic")
+                      .style("font-size", "80%")
+                      .style("position", "relative")
+                      .style("bottom", "2px");
+              }
+            }
 
-                
-                removeClikedNode = "";
-                onDoubleClickedNewlyCreatedNodes.forEach(function(val) 
-                {
-                    if (val.nodeClicked === idVal) 
-                    {
-                        for(var i=0;i<nodesArray.length;i++)
-                        {
-                            if (nodesArray[i].id === val.nodeCreated.id) 
-                            {
-                                nodesArray.splice(i, 1); 
-                                i--;
-                            }
-                        }
-                        removeClikedNode = val.nodeClicked;
-                    }
-                });
+            //node id on double click
+            var nodeID = d3.select("#" + idsArray.nodeIdsId)
+            nodeID.selectAll("*").remove();
+            if (tempNodeContains["@id"] === undefined) {
+            } else{
+              nodeID.append("text")
+              .text(" " + tempNodeContains["@id"] + "\n")
+              .style("font-style", "italic")
+              .style("font-size", "80%")
+              .style("position", "relative")
+              .style("bottom", "2px");
+            }
+            //node type on double click
+            var nodeType = d3.select("#" + idsArray.nodeTypeId)
+            nodeType.selectAll("*").remove();
+            if (tempNodeContains["@type"] === undefined) {
+            } else{
+              nodeType.append("text")
+              .text(" " + tempNodeContains["@type"] + "\n\n")
+              .style("font-style", "italic")
+              .style("font-size", "80%")
+              .style("position", "relative")
+              .style("bottom", "2px");
+            }
 
-                for(var i=0;i<onDoubleClickedNewlyCreatedNodes.length;i++)
-                {
-                    if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) 
-                    {
-                        onDoubleClickedNewlyCreatedNodes.splice(i, 1); 
-                        i--;
-                    }
-                }
+            //node description on double click
+            var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
+            nodeDescription.selectAll("*").remove();
+            if (tempNodeContains["dc:description"] === undefined) {
+            } else{
+              if (Object.prototype.toString.call(tempNodeContains["dc:description"]) === "[object Array]") {
+                  tempNodeContains["dc:description"].forEach(function(eachIds) {
+                      if (eachIds["@language"] === "de" && displayDeustch) {
+
+                          nodeDescription.append("text")
+                              .text(" " + eachIds["@value"] + "\n")
+                              .style("font-style", "italic")
+                              .style("font-size", "80%")
+                              .style("position", "relative")
+                              .style("bottom", "2px");
+                      } else if (eachIds["@language"] === "en" && !displayDeustch) {
+                          nodeDescription.append("text")
+                              .text(" " + eachIds["@value"] + "\n")
+                              .style("font-style", "italic")
+                              .style("font-size", "80%")
+                              .style("position", "relative")
+                              .style("bottom", "2px");
+                      }
 
-                for(var i=0;i<expandedNodesArray.length;i++)
-                {
-                    if (expandedNodesArray[i] === idVal) 
-                    {
-                        expandedNodesArray.splice(i, 1); 
-                        break;
-                    }
-                }
-                var allClear = d3.selectAll(".everything");
-                allClear.selectAll("*").remove();
+                  });
+              } else {
+                  nodeDescription.append("text")
+                      .text(" " + tempNodeContains["dc:description"]["@value"] + "\n")
+                      .style("font-style", "italic")
+                      .style("font-size", "80%")
+                      .style("position", "relative")
+                      .style("bottom", "2px");
+              }
+            }
+
+            var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
+            nodeSubClass.selectAll("*").remove();
+            if (tempNodeContains["rdfs:subClassOf"] === undefined) {
+            } else{
+              if (Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === "[object Array]") {
+                  var tempIndexSubClassof = 1;
+                  tempNodeContains["rdfs:subClassOf"].forEach(function(eachIds) {
+                      var subClassLabel = getLabel(displayDeustch, eachIds["@id"]);
+            
+                      nodeSubClass.append("text")
+                          .text(" " + tempIndexSubClassof + ". " + subClassLabel + "\n")
+                          .style("font-style", "italic")
+                          .style("font-size", "80%")
+                          .style("position", "relative")
+                          .style("bottom", "2px");
+
+                      tempIndexSubClassof = tempIndexSubClassof + 1;
+
+                  });
+              } else {
+                  var subClassLabel = getLabel(displayDeustch, tempNodeContains["rdfs:subClassOf"]["@id"]);
+            
+                  nodeSubClass.append("text")
+                      .text(" " + subClassLabel + "\n")
+                      .style("font-style", "italic")
+                      .style("font-size", "80%")
+                      .style("position", "relative")
+                      .style("bottom", "2px");
+              }
+            }
+
+            var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
+            nodeDomain.selectAll("*").remove();
+            if (tempNodeContains["rdfs:domain"] === undefined) {
+            } else{
+              if (Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === "[object Array]") {
+                  var tempIndexdomain = 1;
+                  tempNodeContains["rdfs:domain"].forEach(function(eachIds) {
+                      var domainLabel = getLabel(displayDeustch, eachIds["@id"]);
+            
+                      nodeDomain.append("text")
+                          .text(" " + tempIndexdomain + ". " + domainLabel + "\n")
+                          .style("font-style", "italic")
+                          .style("font-size", "80%")
+                          .style("position", "relative")
+                          .style("bottom", "2px");
 
-                update();
-                simulation.restart();
-           
+                      tempIndexdomain = tempIndexdomain + 1;
+
+                  });
+              } else {
+                  var domainLabel = getLabel(displayDeustch, tempNodeContains["rdfs:domain"]["@id"]);
+            
+                  nodeDomain.append("text")
+                      .text(" " + domainLabel + "\n")
+                      .style("font-style", "italic")
+                      .style("font-size", "80%")
+                      .style("position", "relative")
+                      .style("bottom", "2px");
+              }
+            }
+            
+
+
+            var nodeRange = d3.select("#" + idsArray.nodeRangeId)
+            nodeRange.selectAll("*").remove();
+            if (tempNodeContains["rdfs:range"] === undefined) {
+            } else{
+              if (Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === "[object Array]") {
+                  var tempIndexRange = 1;
+                  tempNodeContains["rdfs:range"].forEach(function(eachIds) {
+                      var rangeLabel = getLabel(displayDeustch, eachIds["@id"]);
+
+                      nodeRange.append("text")
+                          .text(" " + tempIndexRange + ". " + rangeLabel + "\n")
+                          .style("font-style", "italic")
+                          .style("font-size", "80%")
+                          .style("position", "relative")
+                          .style("bottom", "2px");
+
+                      tempIndexRange = tempIndexRange + 1;
+
+                  });
+              } else {
+                  var rangeLabel = getLabel(displayDeustch, tempNodeContains["rdfs:range"]["@id"]);
+
+                  nodeRange.append("text")
+                      .text(" " + rangeLabel + "\n")
+                      .style("font-style", "italic")
+                      .style("font-size", "80%")
+                      .style("position", "relative")
+                      .style("bottom", "2px");
+              }
+            }
+
+            var nodeComment = d3.select("#" + idsArray.nodeCommentId)
+            nodeComment.selectAll("*").remove();
+            if (tempNodeContains["rdfs:comment"] === undefined) {
+            }
+            else{
+              nodeComment.append("text")
+              .text(tempNodeContains["rdfs:comment"] + "\n")
+              .style("font-style", "italic")
+              .style("font-size", "80%")
+              .style("position", "relative")
+              .style("bottom", "2px");
             }
         }
 
-        function update() 
+    }
+
+    function update() 
         {
 
           simulation.restart();
@@ -774,17 +929,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               .style("font-style", "italic")
               .attr("x", 12)
               .attr("y", 3) 
-              /*.attr("x", function(d) {
-                  
-                  return 4 + (d.source.x + d.target.x) / 2;
-                //return Math.random() * (+120 - +30) + +30 + (d.source.x + d.target.x) / 2;
-                })
-              .attr("y", function(d) {
-                //return 4 + (d.source.y + d.target.y) / 2;
-
-                console.log(Math.random() * (+120 - +30) + +30 + (d.source.x + d.target.y / 2));
-                return Math.random() * (+120 - +30) + +30 + (d.source.x + d.target.y) /2;
-              })*/
               ;
 
 
@@ -891,11 +1035,6 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
               .text(function(d) {
                   var returnValue = "Node : " + d.id;
                   if (d.isLitteral) {
-                      if( d.literalDataType == "dateTime")
-                      {
-                        console.log(d.id + " type = "+d.literalDataType);
-                      }
-                    
                       returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
                   } else {
                       returnValue = "Node : " + d.id;
@@ -927,256 +1066,53 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
       }
 
+      function ticked() {
+          lables
+              .attr("x2", function(d) {
+                  return d.x - width;
+              })
+              .attr("y2", function(d) {
+                  return d.y - height;
+              });
+          link
+              .attr("x1", function(d) {
+                  return d.source.x;
+              })
+              .attr("y1", function(d) {
+                  return d.source.y;
+              })
+              .attr("x2", function(d) {
+                  return d.target.x;
+              })
+              .attr("y2", function(d) {
+                  return d.target.y;
+              });
+          linkTexts
+              .attr("x", function(d) {
+                  return 4 + (d.source.x + d.target.x) / 2;
+              })
+              .attr("y", function(d) {
+                  return 4 + (d.source.y + d.target.y) / 2;
+              });
+          node
+              .attr("transform", function(d) {
+                  return "translate(" + d.x + "," + d.y + ")";
+              });
+          if (applyNodesBoundary) {
+              node
+                  .attr("cx", function(d) {
+                      return d.x = Math.max(Math.max(resourceRadius, literalRadius), Math.min(width - Math.max(resourceRadius, literalRadius), d.x));
+                  })
+                  .attr("cy", function(d) {
+                      return d.y = Math.max(Math.max(resourceRadius, literalRadius), Math.min(height - Math.max(resourceRadius, literalRadius), d.y));
+                  });
+          }
+      }
 
-      function clickFuntionality(d) {
-          var nodeIdVal = d.id;
-          var tempNodeContains = [];
-          nodeContents.forEach(function(val) {
-              if (val.label == nodeIdVal) {
-                  tempNodeContains = val.contents
-              }
-          });
-
-          var tempNode = d3.select("#" + idsArray.nodeId)
-          tempNode.selectAll("*").remove();
-          tempNode.append("text")
-              .text(" " + nodeIdVal + "\n")
-              .style("font-style", "italic")
-              .style("font-size", "80%")
-              .style("position", "relative")
-              .style("bottom", "2px");
-
-
-          //node label on double click
-          if (tempNodeContains !== undefined) {
-              var nodeLabel = d3.select("#" + idsArray.nodeLabelId)
-              nodeLabel.selectAll("*").remove();
-              if (tempNodeContains["rdfs:label"] !== undefined) {
-                  if (Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === "[object Array]") {
-                      tempNodeContains["rdfs:label"].forEach(function(eachIds) {
-                          if (eachIds["@language"] == "de" && displayDeustch) {
-
-                              nodeLabel.append("text")
-                                  .text(" " + eachIds["@value"] + "\n")
-                                  .style("font-style", "italic")
-                                  .style("font-size", "80%")
-                                  .style("position", "relative")
-                                  .style("bottom", "2px");
-                          } else if (eachIds["@language"] == "en" && !displayDeustch) {
-                              nodeLabel.append("text")
-                                  .text(" " + eachIds["@value"] + "\n")
-                                  .style("font-style", "italic")
-                                  .style("font-size", "80%")
-                                  .style("position", "relative")
-                                  .style("bottom", "2px");
-                          }
-
-                      });
-                  } else {
-                      nodeLabel.append("text")
-                          .text(" " + tempNodeContains["rdfs:label"]["@value"] + "\n")
-                          .style("font-style", "italic")
-                          .style("font-size", "80%")
-                          .style("position", "relative")
-                          .style("bottom", "2px");
-                  }
-              }
-
-              //node id on double click
-              var nodeID = d3.select("#" + idsArray.nodeIdsId)
-              nodeID.selectAll("*").remove();
-              if (tempNodeContains["@id"] !== undefined) {
-                  nodeID.append("text")
-                      .text(" " + tempNodeContains["@id"] + "\n")
-                      .style("font-style", "italic")
-                      .style("font-size", "80%")
-                      .style("position", "relative")
-                      .style("bottom", "2px");
-              }
-              //node type on double click
-              var nodeType = d3.select("#" + idsArray.nodeTypeId)
-              nodeType.selectAll("*").remove();
-              if (tempNodeContains["@type"] !== undefined) {
-                  nodeType.append("text")
-                      .text(" " + tempNodeContains["@type"] + "\n\n")
-                      .style("font-style", "italic")
-                      .style("font-size", "80%")
-                      .style("position", "relative")
-                      .style("bottom", "2px");
-              }
-
-              //node description on double click
-              var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
-              nodeDescription.selectAll("*").remove();
-              if (tempNodeContains["dc:description"] !== undefined) {
-                  if (Object.prototype.toString.call(tempNodeContains["dc:description"]) === "[object Array]") {
-                      tempNodeContains["dc:description"].forEach(function(eachIds) {
-                          if (eachIds["@language"] == "de" && displayDeustch) {
-
-                              nodeDescription.append("text")
-                                  .text(" " + eachIds["@value"] + "\n")
-                                  .style("font-style", "italic")
-                                  .style("font-size", "80%")
-                                  .style("position", "relative")
-                                  .style("bottom", "2px");
-                          } else if (eachIds["@language"] == "en" && !displayDeustch) {
-                              nodeDescription.append("text")
-                                  .text(" " + eachIds["@value"] + "\n")
-                                  .style("font-style", "italic")
-                                  .style("font-size", "80%")
-                                  .style("position", "relative")
-                                  .style("bottom", "2px");
-                          }
-
-                      });
-                  } else {
-                      nodeDescription.append("text")
-                          .text(" " + tempNodeContains["dc:description"]["@value"] + "\n")
-                          .style("font-style", "italic")
-                          .style("font-size", "80%")
-                          .style("position", "relative")
-                          .style("bottom", "2px");
-                  }
-              }
-
-              var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
-              nodeSubClass.selectAll("*").remove();
-              if (tempNodeContains["rdfs:subClassOf"] !== undefined) {
-                  if (Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === "[object Array]") {
-                      var tempIndexSubClassof = 1;
-                      tempNodeContains["rdfs:subClassOf"].forEach(function(eachIds) {
-                          var subClassLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          /*if (subClassLabel == "noLabel") {
-                              var tempLabelArray = eachIds["@id"].split("/");
-                              var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                              subClassLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                          }*/
-
-                          nodeSubClass.append("text")
-                              .text(" " + tempIndexSubClassof + ". " + subClassLabel + "\n")
-                              .style("font-style", "italic")
-                              .style("font-size", "80%")
-                              .style("position", "relative")
-                              .style("bottom", "2px");
-
-                          tempIndexSubClassof = tempIndexSubClassof + 1;
-
-                      });
-                  } else {
-                      var subClassLabel = getLabel(displayDeustch, tempNodeContains["rdfs:subClassOf"]["@id"]);
-                      /*if (subClassLabel == "noLabel") {
-                          var tempLabelArray = tempNodeContains["rdfs:subClassOf"]["@id"].split("/");
-                          var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                          subClassLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                      }*/
-
-                      nodeSubClass.append("text")
-                          .text(" " + subClassLabel + "\n")
-                          .style("font-style", "italic")
-                          .style("font-size", "80%")
-                          .style("position", "relative")
-                          .style("bottom", "2px");
-                  }
-              }
-
-              var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
-              nodeDomain.selectAll("*").remove();
-              if (tempNodeContains["rdfs:domain"] !== undefined) {
-
-                  if (Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === "[object Array]") {
-                      var tempIndexdomain = 1;
-                      tempNodeContains["rdfs:domain"].forEach(function(eachIds) {
-                          var domainLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          /*if (domainLabel === "noLabel") {
-                              var tempLabelArray = eachIds["@id"].split("/");
-                              var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                              domainLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                          }*/
-
-                          nodeDomain.append("text")
-                              .text(" " + tempIndexdomain + ". " + domainLabel + "\n")
-                              .style("font-style", "italic")
-                              .style("font-size", "80%")
-                              .style("position", "relative")
-                              .style("bottom", "2px");
-
-                          tempIndexdomain = tempIndexdomain + 1;
-
-                      });
-                  } else {
-                      var domainLabel = getLabel(displayDeustch, tempNodeContains["rdfs:domain"]["@id"]);
-                      /*if (domainLabel === "noLabel") {
-                          var tempLabelArray = tempNodeContains["rdfs:domain"]["@id"].split("/");
-                          var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                          domainLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                      }*/
-
-                      nodeDomain.append("text")
-                          .text(" " + domainLabel + "\n")
-                          .style("font-style", "italic")
-                          .style("font-size", "80%")
-                          .style("position", "relative")
-                          .style("bottom", "2px");
-                  }
-              }
-
-
-              var nodeRange = d3.select("#" + idsArray.nodeRangeId)
-              nodeRange.selectAll("*").remove();
-              if (tempNodeContains["rdfs:range"] !== undefined) {
-
-                  if (Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === "[object Array]") {
-                      var tempIndexRange = 1;
-                      tempNodeContains["rdfs:range"].forEach(function(eachIds) {
-                          var rangeLabel = getLabel(displayDeustch, eachIds["@id"]);
-                          /*if (rangeLabel === "noLabel") {
-                              var tempLabelArray = eachIds["@id"].split("/");
-                              var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                              rangeLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                          }*/
-
-                          nodeRange.append("text")
-                              .text(" " + tempIndexRange + ". " + rangeLabel + "\n")
-                              .style("font-style", "italic")
-                              .style("font-size", "80%")
-                              .style("position", "relative")
-                              .style("bottom", "2px");
-
-                          tempIndexRange = tempIndexRange + 1;
-
-                      });
-                  } else {
-                      var rangeLabel = getLabel(displayDeustch, tempNodeContains["rdfs:range"]["@id"]);
-                      /*if (rangeLabel === "noLabel") {
-                          var tempLabelArray = tempNodeContains["rdfs:range"]["@id"].split("/");
-                          var tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                          rangeLabel = tempLabelArray1[tempLabelArray1.length - 1];
-                      }*/
-
-                      nodeRange.append("text")
-                          .text(" " + rangeLabel + "\n")
-                          .style("font-style", "italic")
-                          .style("font-size", "80%")
-                          .style("position", "relative")
-                          .style("bottom", "2px");
-                  }
-              }
-
-              var nodeComment = d3.select("#" + idsArray.nodeCommentId)
-              nodeComment.selectAll("*").remove();
-              if (tempNodeContains["rdfs:comment"] !== undefined) {
-                  nodeComment.append("text")
-                      .text(tempNodeContains["rdfs:comment"] + "\n")
-                      .style("font-style", "italic")
-                      .style("font-size", "80%")
-                      .style("position", "relative")
-                      .style("bottom", "2px");
-              }
+      update();
 
-          }
 
-      }
-  });
+ });
 
   function dragstarted(d) {
       if (!d3.event.active) simulation.alphaTarget(0.3).restart();

From 4b112be32ecf2777a9ec4277b4205f39eb2bd05b Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 14 Jan 2020 19:56:10 +0100
Subject: [PATCH 57/66] resolving "Codacy/PR Quality Review" issues

---
 .../d3v4-rdf-ontology-graph-view.js           | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 907dca798..2c3c54beb 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -10,6 +10,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
   var onDoubleClickedNewlyCreatedLinks = [];
   var onDoubleClickCreatingNodes = false;
   var nodeDoubleClicked = ""; 
+  var undefVar = false;
   var width = 1175,
       height = 1100,
       resourceRadius = customizeGraphArray.resourceRadius,
@@ -207,6 +208,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         var onDoubleClickNodesCreated = ""; 
 
         if (nodesArray === undefined) {
+            undefVar = true;
         }
         else{
             nodesArray.forEach(function(elem) {
@@ -268,7 +270,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           //START :: Nodes and Links creation for subClassOf
           if (displaySubclasses) {
               if (element["rdfs:subClassOf"] === undefined) {
-                  
+                undefVar = true;
               }
               else{
                 tempSub = getLabel(displayDeustch, element["@id"]);
@@ -316,7 +318,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           if (dispalyAllprop) {
               //get the subject label  
               if (element["rdfs:domain"] === undefined) {
-                  
+                undefVar = true;
               }
               else
               {
@@ -332,6 +334,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               //get the predicate
               if (element["rdfs:domain"] === undefined) {
+                undefVar = true;
               }
               else{
                 tempPred = getLabel(displayDeustch, element["@id"]);
@@ -340,6 +343,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               //get the object  range
               if (element["rdfs:range"] === undefined) {
+                undefVar = true;
               }
               else
               {
@@ -446,6 +450,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 //START :: Nodes and Links creation for all Properties
                 //get the subject label  
                 if (element["rdfs:domain"] === undefined) {
+                    undefVar = true;
                 }
                 else
                 {
@@ -471,6 +476,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 if (includeThis) {
                     //get the predicate
                     if (element["rdfs:domain"] === undefined) {
+                        undefVar = true;
                       }
                       else{
                           tempPred = getLabel(displayDeustch, element["@id"]);
@@ -478,6 +484,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
                     //get the object  range
                     if (element["rdfs:range"] === undefined) {
+                        undefVar = true;
                     }
                     else{
                       if ("@id" in element["rdfs:range"]) {
@@ -661,6 +668,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeLabel = d3.select("#" + idsArray.nodeLabelId)
             nodeLabel.selectAll("*").remove();
             if (tempNodeContains["rdfs:label"] === undefined) {
+                undefVar = true;
             } else {
               if (Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === "[object Array]") {
                   tempNodeContains["rdfs:label"].forEach(function(eachIds) {
@@ -696,6 +704,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeID = d3.select("#" + idsArray.nodeIdsId)
             nodeID.selectAll("*").remove();
             if (tempNodeContains["@id"] === undefined) {
+                undefVar = true;
             } else{
               nodeID.append("text")
               .text(" " + tempNodeContains["@id"] + "\n")
@@ -708,6 +717,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeType = d3.select("#" + idsArray.nodeTypeId)
             nodeType.selectAll("*").remove();
             if (tempNodeContains["@type"] === undefined) {
+                undefVar = true;
             } else{
               nodeType.append("text")
               .text(" " + tempNodeContains["@type"] + "\n\n")
@@ -721,6 +731,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
             nodeDescription.selectAll("*").remove();
             if (tempNodeContains["dc:description"] === undefined) {
+                undefVar = true;
             } else{
               if (Object.prototype.toString.call(tempNodeContains["dc:description"]) === "[object Array]") {
                   tempNodeContains["dc:description"].forEach(function(eachIds) {
@@ -755,6 +766,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
             nodeSubClass.selectAll("*").remove();
             if (tempNodeContains["rdfs:subClassOf"] === undefined) {
+                undefVar = true;
             } else{
               if (Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === "[object Array]") {
                   var tempIndexSubClassof = 1;
@@ -786,6 +798,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
             nodeDomain.selectAll("*").remove();
             if (tempNodeContains["rdfs:domain"] === undefined) {
+                undefVar = true;
             } else{
               if (Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === "[object Array]") {
                   var tempIndexdomain = 1;
@@ -819,6 +832,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeRange = d3.select("#" + idsArray.nodeRangeId)
             nodeRange.selectAll("*").remove();
             if (tempNodeContains["rdfs:range"] === undefined) {
+                undefVar = true;
             } else{
               if (Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === "[object Array]") {
                   var tempIndexRange = 1;
@@ -850,6 +864,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeComment = d3.select("#" + idsArray.nodeCommentId)
             nodeComment.selectAll("*").remove();
             if (tempNodeContains["rdfs:comment"] === undefined) {
+                undefVar = true;
             }
             else{
               nodeComment.append("text")
@@ -862,6 +877,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         }
 
     }
+    
+    function zoomActions() {
+        g.attr("transform", d3.event.transform)
+    }
 
     function update() 
         {
@@ -902,7 +921,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       return ("5, 5");
                   }
                   return ("0, 0");
-              });;
+              });
 
           link.exit().remove();
           // ==================== Add Link Names =====================
@@ -1052,18 +1071,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
 
           if (!disableZoom) {
-              var zoom_handler = d3.zoom()
-                  .on("zoom", zoom_actions);
-              //zoom_handler(svg);
-              //Zoom functions 
-              svg.call(zoom_handler).on("dblclick.zoom", null);
 
-              function zoom_actions() {
-                  g.attr("transform", d3.event.transform)
-
-              }
+            var zoomHandler = d3.zoom()
+                  .on("zoom", zoomActions);
+              
+              svg.call(zoomHandler).on("dblclick.zoom", null);
           }
-
+ 
       }
 
       function ticked() {

From 003e204775d6ea7fe78ef94cdb0d478025f80561 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 14 Jan 2020 20:04:42 +0100
Subject: [PATCH 58/66] resolving "Codacy/PR Quality Review" issues

---
 .../java/upb/ida/ontologyexplorer/OntologyExplorer.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java b/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java
index 443715a28..a3ed66a83 100644
--- a/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java
+++ b/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java
@@ -1,7 +1,13 @@
 package upb.ida.ontologyexplorer;
 
 import org.apache.jena.graph.Triple;
-import org.apache.jena.query.*;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.ResultSetFactory;
+import org.apache.jena.query.QuerySolution;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdfconnection.RDFConnectionFuseki;

From c808440f5ed2ee7e48a773bd32961bd9a729dba4 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Tue, 14 Jan 2020 20:08:09 +0100
Subject: [PATCH 59/66] resolving "Codacy/PR Quality Review" issues

---
 .../d3v4-rdf-ontology-graph-view.js           | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 907dca798..56caff319 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -10,6 +10,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
   var onDoubleClickedNewlyCreatedLinks = [];
   var onDoubleClickCreatingNodes = false;
   var nodeDoubleClicked = ""; 
+  var undefVar = false;
   var width = 1175,
       height = 1100,
       resourceRadius = customizeGraphArray.resourceRadius,
@@ -207,6 +208,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         var onDoubleClickNodesCreated = ""; 
 
         if (nodesArray === undefined) {
+            undefVar = true;
         }
         else{
             nodesArray.forEach(function(elem) {
@@ -268,7 +270,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           //START :: Nodes and Links creation for subClassOf
           if (displaySubclasses) {
               if (element["rdfs:subClassOf"] === undefined) {
-                  
+                undefVar = true;
               }
               else{
                 tempSub = getLabel(displayDeustch, element["@id"]);
@@ -316,7 +318,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
           if (dispalyAllprop) {
               //get the subject label  
               if (element["rdfs:domain"] === undefined) {
-                  
+                undefVar = true;
               }
               else
               {
@@ -332,6 +334,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               //get the predicate
               if (element["rdfs:domain"] === undefined) {
+                undefVar = true;
               }
               else{
                 tempPred = getLabel(displayDeustch, element["@id"]);
@@ -340,6 +343,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
               //get the object  range
               if (element["rdfs:range"] === undefined) {
+                undefVar = true;
               }
               else
               {
@@ -446,6 +450,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 //START :: Nodes and Links creation for all Properties
                 //get the subject label  
                 if (element["rdfs:domain"] === undefined) {
+                    undefVar = true;
                 }
                 else
                 {
@@ -471,6 +476,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 if (includeThis) {
                     //get the predicate
                     if (element["rdfs:domain"] === undefined) {
+                        undefVar = true;
                       }
                       else{
                           tempPred = getLabel(displayDeustch, element["@id"]);
@@ -478,6 +484,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
                     //get the object  range
                     if (element["rdfs:range"] === undefined) {
+                        undefVar = true;
                     }
                     else{
                       if ("@id" in element["rdfs:range"]) {
@@ -642,7 +649,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         var tempNodeContains = [];
         nodeContents.forEach(function(val) {
             if (val.label === nodeIdVal) {
-                tempNodeContains = val.contents
+                tempNodeContains = val.contents;
             }
         });
 
@@ -661,6 +668,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeLabel = d3.select("#" + idsArray.nodeLabelId)
             nodeLabel.selectAll("*").remove();
             if (tempNodeContains["rdfs:label"] === undefined) {
+                undefVar = true;
             } else {
               if (Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === "[object Array]") {
                   tempNodeContains["rdfs:label"].forEach(function(eachIds) {
@@ -696,6 +704,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeID = d3.select("#" + idsArray.nodeIdsId)
             nodeID.selectAll("*").remove();
             if (tempNodeContains["@id"] === undefined) {
+                undefVar = true;
             } else{
               nodeID.append("text")
               .text(" " + tempNodeContains["@id"] + "\n")
@@ -708,6 +717,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeType = d3.select("#" + idsArray.nodeTypeId)
             nodeType.selectAll("*").remove();
             if (tempNodeContains["@type"] === undefined) {
+                undefVar = true;
             } else{
               nodeType.append("text")
               .text(" " + tempNodeContains["@type"] + "\n\n")
@@ -721,6 +731,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
             nodeDescription.selectAll("*").remove();
             if (tempNodeContains["dc:description"] === undefined) {
+                undefVar = true;
             } else{
               if (Object.prototype.toString.call(tempNodeContains["dc:description"]) === "[object Array]") {
                   tempNodeContains["dc:description"].forEach(function(eachIds) {
@@ -755,6 +766,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
             nodeSubClass.selectAll("*").remove();
             if (tempNodeContains["rdfs:subClassOf"] === undefined) {
+                undefVar = true;
             } else{
               if (Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === "[object Array]") {
                   var tempIndexSubClassof = 1;
@@ -786,6 +798,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
             nodeDomain.selectAll("*").remove();
             if (tempNodeContains["rdfs:domain"] === undefined) {
+                undefVar = true;
             } else{
               if (Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === "[object Array]") {
                   var tempIndexdomain = 1;
@@ -819,6 +832,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeRange = d3.select("#" + idsArray.nodeRangeId)
             nodeRange.selectAll("*").remove();
             if (tempNodeContains["rdfs:range"] === undefined) {
+                undefVar = true;
             } else{
               if (Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === "[object Array]") {
                   var tempIndexRange = 1;
@@ -850,6 +864,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             var nodeComment = d3.select("#" + idsArray.nodeCommentId)
             nodeComment.selectAll("*").remove();
             if (tempNodeContains["rdfs:comment"] === undefined) {
+                undefVar = true;
             }
             else{
               nodeComment.append("text")
@@ -862,6 +877,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         }
 
     }
+    
+    function zoomActions() {
+        g.attr("transform", d3.event.transform);
+    }
 
     function update() 
         {
@@ -902,7 +921,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                       return ("5, 5");
                   }
                   return ("0, 0");
-              });;
+              });
 
           link.exit().remove();
           // ==================== Add Link Names =====================
@@ -1052,18 +1071,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
 
           if (!disableZoom) {
-              var zoom_handler = d3.zoom()
-                  .on("zoom", zoom_actions);
-              //zoom_handler(svg);
-              //Zoom functions 
-              svg.call(zoom_handler).on("dblclick.zoom", null);
 
-              function zoom_actions() {
-                  g.attr("transform", d3.event.transform)
-
-              }
+            var zoomHandler = d3.zoom()
+                  .on("zoom", zoomActions);
+              
+              svg.call(zoomHandler).on("dblclick.zoom", null);
           }
-
+ 
       }
 
       function ticked() {
@@ -1131,4 +1145,4 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
       d.fy = null;
   }
 
-};
\ No newline at end of file
+};

From 8593af6a302fc96434a020a002f1376878fa0e84 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 19 Jan 2020 14:12:49 +0100
Subject: [PATCH 60/66] Fetching ontology data from fuseki.

---
 ida-chatbot/src/app/app.component.ts          |    4 +-
 .../rdf-ontology-view.component.css           |    4 +
 .../rdf-ontology-view.component.html          |    6 +-
 .../rdf-ontology-view.component.ts            |   17 +-
 .../d3v4-rdf-ontology-graph-view.js           | 1515 ++++++++---------
 .../rdfontology/historian-onlogoly.json       | 1305 --------------
 .../java/upb/ida/constant/IDALiteral.java     |    3 +
 .../main/java/upb/ida/dao/DataRepository.java |   24 +
 .../ontologyexplorer/OntologyExplorer.java    |  109 --
 .../ida/provider/OntologyExplorerHandler.java |   29 +-
 .../upb/ida/rest/MessageRestController.java   |   13 -
 .../rivescript/ontology-explorer.rive         |   10 +-
 12 files changed, 814 insertions(+), 2225 deletions(-)
 delete mode 100644 ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
 delete mode 100644 ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java

diff --git a/ida-chatbot/src/app/app.component.ts b/ida-chatbot/src/app/app.component.ts
index 74842c15d..3c780c5a3 100644
--- a/ida-chatbot/src/app/app.component.ts
+++ b/ida-chatbot/src/app/app.component.ts
@@ -80,8 +80,8 @@ export class AppComponent {
       // Open new tab with DataTable
       const newTab = new TabElement(this.uis.getUniqueId(), resp.payload.actvTbl, TabType.SSB, resp.payload.ssbDiagramData, true, true);
       this.addNewTab(newTab, resp);
-    }else if (resp.actnCode === 11) {
-      const newTab = new TabElement(this.uis.getUniqueId(), "Ontology Explorer", TabType.OE, resp.payload.ontologyData, true, true);
+    }else if (resp.actnCode === 11) { 
+      const newTab = new TabElement(this.uis.getUniqueId(), "Ontology Explorer", TabType.OE, resp.payload, true, true);
       this.addNewTab(newTab, resp);
     }
   }
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
index 60d0b7717..db642a50b 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.css
@@ -41,3 +41,7 @@
   width:275px;
 }
 
+:host ::ng-deep mat-toolbar-row.primary{
+  background: #673ab7;
+  color: #FFF;
+}
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
index 9b8e26ef4..5e53e6c4b 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.html
@@ -1,7 +1,7 @@
-  <mat-toolbar color="primary">
-      <mat-toolbar-row>
+  <mat-toolbar>
+      <mat-toolbar-row class="primary">
         <div style="width: 100%; height: 60%;">
-          <h1 align='center'>Historian Ontology Graph</h1>
+          <h1 align='center'>{{title}} Ontology Graph</h1>
         </div>
       </mat-toolbar-row>
 
diff --git a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
index 6133ebf62..526ed6509 100644
--- a/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
+++ b/ida-chatbot/src/app/components/rdf-ontology-view/rdf-ontology-view.component.ts
@@ -10,7 +10,7 @@ declare function createV4RDFOntologyGraph(a, b, c, d, e, f, g, h, j, i);
 })
 export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterContentInit {
 
-  @Input('data') ontologyData: any;
+  @Input('data') inputData: any;
 
   public figId: string;
   public ontologyId: string;
@@ -24,6 +24,9 @@ export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterCon
   public nodeDomainId: string;
   public nodeRangeId: string;
   public nodeCommentId: string;
+  ontologyData: any = {};
+  title = "";
+
 
   expandNodeInfoCard = false;
   languageCheked = false;
@@ -62,6 +65,8 @@ export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterCon
   }
 
   ngOnInit() {
+    this.ontologyData = this.inputData.ontologyData || {};
+    this.title = this.inputData.actvDs || "";
   }
 
   ngAfterContentInit() {
@@ -92,7 +97,7 @@ export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterCon
       propertyTextColor: this.propertyTextColor,
       onClickNodeColor: this.onClickNodeColor
     }
-    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.ontologyData, this.languageCheked, this.classHeirarchyChecked,
       this.allPropChecked, this.allNodesInBoundClicked, this.disableZoomClicked, idVal, customizeGraphVals);
   }
   ngAfterViewInit() {
@@ -116,7 +121,7 @@ export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterCon
       propertyTextColor: this.propertyTextColor,
       onClickNodeColor: this.onClickNodeColor
     }
-    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.ontologyData, this.languageCheked, this.classHeirarchyChecked,
       this.allPropChecked, this.allNodesInBoundClicked, this.disableZoomClicked, idVal, customizeGraphVals);
   }
 
@@ -140,7 +145,7 @@ export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterCon
       propertyTextColor: this.propertyTextColor,
       onClickNodeColor: this.onClickNodeColor
     }
-    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.ontologyData, this.languageCheked, this.classHeirarchyChecked,
       this.allPropChecked, this.allNodesInBoundClicked, this.disableZoomClicked, idVal, customizeGraphVals);
   }
   graphResetChanged(event) {
@@ -184,7 +189,7 @@ export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterCon
       onClickNodeColor: this.onClickNodeColor
     }
 
-    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.ontologyData, this.languageCheked, this.classHeirarchyChecked,
       this.allPropChecked, this.allNodesInBoundClicked, this.disableZoomClicked, idVal, customizeGraphVals);
   }
 
@@ -209,7 +214,7 @@ export class RdfOntologyViewComponent implements OnInit, AfterViewInit, AfterCon
       propertyTextColor: this.propertyTextColor,
       onClickNodeColor: this.onClickNodeColor
     }
-    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.fileName, this.languageCheked, this.classHeirarchyChecked,
+    createV4RDFOntologyGraph(this.figId, this.ontologyId, this.ontologyData, this.languageCheked, this.classHeirarchyChecked,
       this.allPropChecked, this.allNodesInBoundClicked,
       this.disableZoomClicked, idVal, customizeGraphVals);
   }
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 56caff319..fd5e1ab3e 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -1,85 +1,85 @@
-function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displaySubclasses,
-  dispalyAllprop, applyNodesBoundary, disableZoom, idsArray, customizeGraphArray) {
-  var linksArray = [];
-  var nodesArray = [];
-  var enLabelArray = [];
-  var deLabelArray = [];
-  var expandedNodesArray = [];
-  var nodeContents = [];
-  var onDoubleClickedNewlyCreatedNodes = [];
-  var onDoubleClickedNewlyCreatedLinks = [];
-  var onDoubleClickCreatingNodes = false;
-  var nodeDoubleClicked = ""; 
-  var undefVar = false;
-  var width = 1175,
-      height = 1100,
-      resourceRadius = customizeGraphArray.resourceRadius,
-      literalRadius = customizeGraphArray.literalRadius;
-
-  var g, link, linkTexts, node, circles, lables;
-  var svgClear = d3.select("#" + svgId);
-  svgClear.selectAll("*").remove();
-
-  var svg = d3.select("#" + svgId)
-      .append("svg")
-      .attr("width", "100%")
-      .attr("height", height);
-
-  svg.append("svg:defs").selectAll("marker")
-      .data(["normal"])
-      .enter().append("svg:marker")
-      .attr("id", String)
-      .attr("viewBox", "0 -4 10 10")
-      .attr("refX", 30)
-      .attr("refY", -0.5)
-      .attr("markerWidth", 26)
-      .attr("markerHeight", 6)
-      .attr("orient", "auto")
-      .append("svg:polyline")
-      .style("fill", "black")
-      .attr("points", "0,-4 20,0 0,5");
-  svg.append("svg:defs").selectAll("marker")
-      .data(["subclass"])
-      .enter().append("svg:marker")
-      .attr("id", String)
-      .attr("viewBox", "0 -4 10 10")
-      .attr("refX", 30)
-      .attr("refY", -0.5)
-      .attr("markerWidth", 26)
-      .attr("markerHeight", 6)
-      .attr("orient", "auto")
-      .append("svg:polyline")
-      .style("fill", "grey")
-      .attr("points", "0,-4 20,0 0,5");
-
-
-  var color = d3.scaleOrdinal(d3.schemeCategory20);
-
-  var simulation = d3.forceSimulation()
-      .force("link", d3.forceLink().id(function(d) {
-          return d.id;
-      }).distance(customizeGraphArray.edgeSize))
-      .force("charge", d3.forceManyBody().strength(-customizeGraphArray.graphCharge)) //Charge strength is here
-      .force("center", d3.forceCenter((width / 2), (height / 2)));
-
-  var tempLabel, tepmNodeContent, tempLabelArray, tempLabelArray1;
-  var literalIndex = 0;
-  var circleIdIndex = 0;
-  var tempSub = "?";
-  var tempPred = "?";
-  var tempObj = "?";
-  var pred = "---subClassOf---";
-  var tempDomainArray = [];
-  var tripleValue, isLitteral, literalDataType;
-
-  d3.json("assets/rdfontology/historian-onlogoly.json", function(error, data) {
-    if (error) {
-      return console.warn("Error in createV3RDFOntologyGraphView() method :" + error);
-  }
-      //START :: get english and deutsch labels values into arrays
-      data["@graph"].forEach(function(elem) {
-        if (elem["rdfs:label"] === undefined) 
-        {
+function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displaySubclasses,
+    dispalyAllprop, applyNodesBoundary, disableZoom, idsArray, customizeGraphArray) {
+    var linksArray = [];
+    var nodesArray = [];
+    var enLabelArray = [];
+    var deLabelArray = [];
+    var expandedNodesArray = [];
+    var nodeContents = [];
+    var onDoubleClickedNewlyCreatedNodes = [];
+    var onDoubleClickedNewlyCreatedLinks = [];
+    var onDoubleClickCreatingNodes = false;
+    var nodeDoubleClicked = "";
+    var undefVar = false;
+    var width = 1175,
+        height = 1100,
+        resourceRadius = customizeGraphArray.resourceRadius,
+        literalRadius = customizeGraphArray.literalRadius;
+
+    var g, link, linkTexts, node, circles, lables;
+    var svgClear = d3.select("#" + svgId);
+    svgClear.selectAll("*").remove();
+
+    var svg = d3.select("#" + svgId)
+        .append("svg")
+        .attr("width", "100%")
+        .attr("height", height);
+
+    svg.append("svg:defs").selectAll("marker")
+        .data(["normal"])
+        .enter().append("svg:marker")
+        .attr("id", String)
+        .attr("viewBox", "0 -4 10 10")
+        .attr("refX", 30)
+        .attr("refY", -0.5)
+        .attr("markerWidth", 26)
+        .attr("markerHeight", 6)
+        .attr("orient", "auto")
+        .append("svg:polyline")
+        .style("fill", "black")
+        .attr("points", "0,-4 20,0 0,5");
+    svg.append("svg:defs").selectAll("marker")
+        .data(["subclass"])
+        .enter().append("svg:marker")
+        .attr("id", String)
+        .attr("viewBox", "0 -4 10 10")
+        .attr("refX", 30)
+        .attr("refY", -0.5)
+        .attr("markerWidth", 26)
+        .attr("markerHeight", 6)
+        .attr("orient", "auto")
+        .append("svg:polyline")
+        .style("fill", "grey")
+        .attr("points", "0,-4 20,0 0,5");
+
+
+    var color = d3.scaleOrdinal(d3.schemeCategory20);
+
+    var simulation = d3.forceSimulation()
+        .force("link", d3.forceLink().id(function (d) {
+            return d.id;
+        }).distance(customizeGraphArray.edgeSize))
+        .force("charge", d3.forceManyBody().strength(-customizeGraphArray.graphCharge)) //Charge strength is here
+        .force("center", d3.forceCenter((width / 2), (height / 2)));
+
+    var tempLabel, tepmNodeContent, tempLabelArray, tempLabelArray1;
+    var literalIndex = 0;
+    var circleIdIndex = 0;
+    var tempSub = "?";
+    var tempPred = "?";
+    var tempObj = "?";
+    var pred = "---subClassOf---";
+    var tempDomainArray = [];
+    var tripleValue, isLitteral, literalDataType;
+
+    const data = graphData;
+    // d3.json("assets/rdfontology/historian-onlogoly.json", function (error, data) {
+    // if (error) {
+    // return console.warn("Error in createV3RDFOntologyGraphView() method :" + error);
+    // }
+    //START :: get english and deutsch labels values into arrays
+    data["@graph"].forEach(function (elem) {
+        if (elem["label"] === undefined) {
             tempLabelArray = elem["@id"].split("/");
             tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
             tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
@@ -89,10 +89,10 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 contents: elem
             };
             nodeContents.push(tepmNodeContent);
-            
+
         } else {
-            if (Object.prototype.toString.call(elem["rdfs:label"]) === "[object Array]") {
-                elem["rdfs:label"].forEach(function(eachIds) {
+            if (Object.prototype.toString.call(elem["label"]) === "[object Array]") {
+                elem["label"].forEach(function (eachIds) {
                     if (eachIds["@language"] === "de") {
                         tempLabel = {
                             "id": elem["@id"],
@@ -135,30 +135,30 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
                 });
             } else {
-                if (elem["rdfs:label"]["@language"] === "de") {
+                if (elem["label"]["@language"] === "de") {
                     tempLabel = {
                         "id": elem["@id"],
                         "language": "de",
-                        "value": elem["rdfs:label"]["@value"]
+                        "value": elem["label"]["@value"]
                     };
                     deLabelArray.push(tempLabel);
 
                     tepmNodeContent = {
-                        label: elem["rdfs:label"]["@value"],
+                        label: elem["label"]["@value"],
                         contents: elem
                     };
                     nodeContents.push(tepmNodeContent);
                 }
-                if (elem["rdfs:label"]["@language"] === "en") {
+                if (elem["label"]["@language"] === "en") {
                     tempLabel = {
                         "id": elem["@id"],
                         "language": "en",
-                        "value": elem["rdfs:label"]["@value"]
+                        "value": elem["label"]["@value"]
                     };
                     enLabelArray.push(tempLabel);
 
                     tepmNodeContent = {
-                        label: elem["rdfs:label"]["@value"],
+                        label: elem["label"]["@value"],
                         contents: elem
                     };
                     nodeContents.push(tepmNodeContent);
@@ -177,27 +177,27 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         }
 
     });
-      //END :: get english and deutch labels values into arrays
-
-      //returning label value
-      function getLabel(displayDeustch, id) {
-          //var returnVaule = "noLabel";
-          var returnVaule = id;
-          if (!displayDeustch) {
-              enLabelArray.forEach(function(elem) {
-                  if (elem["id"] === id) {
-                      returnVaule = elem["value"];
-                  }
-              });
-          } else if (displayDeustch) {
-              deLabelArray.forEach(function(elem) {
-                  if (elem["id"] === id) {
-                      returnVaule = elem["value"];
-                  }
-              });
-          }
-          return returnVaule;
-      }
+    //END :: get english and deutch labels values into arrays
+
+    //returning label value
+    function getLabel(displayDeustch, id) {
+        //var returnVaule = "noLabel";
+        var returnVaule = id;
+        if (!displayDeustch) {
+            enLabelArray.forEach(function (elem) {
+                if (elem["id"] === id) {
+                    returnVaule = elem["value"];
+                }
+            });
+        } else if (displayDeustch) {
+            deLabelArray.forEach(function (elem) {
+                if (elem["id"] === id) {
+                    returnVaule = elem["value"];
+                }
+            });
+        }
+        return returnVaule;
+    }
 
 
     //crating node function
@@ -205,13 +205,13 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         //START :: Node creation
         var subNodeAdded = false;
         var objNodeAdded = false;
-        var onDoubleClickNodesCreated = ""; 
+        var onDoubleClickNodesCreated = "";
 
         if (nodesArray === undefined) {
             undefVar = true;
         }
-        else{
-            nodesArray.forEach(function(elem) {
+        else {
+            nodesArray.forEach(function (elem) {
                 if (elem["id"] === tempSub) {
                     subNodeAdded = true;
                 }
@@ -233,9 +233,8 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             };
             nodesArray.push(nodeValue);
 
-            if(onDoubleClickCreatingNodes)
-            { 
-                onDoubleClickNodesCreated = {nodeClicked:nodeDoubleClicked,nodeCreated:nodeValue};
+            if (onDoubleClickCreatingNodes) {
+                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
                 onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
             }
         }
@@ -250,34 +249,33 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 group: 1
             };
             nodesArray.push(nodeValue);
-            if(onDoubleClickCreatingNodes)
-            {
-                onDoubleClickNodesCreated = {nodeClicked:nodeDoubleClicked,nodeCreated:nodeValue};
+            if (onDoubleClickCreatingNodes) {
+                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
                 onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
             }
         }
         //END :: Node creation
     }
 
-      //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
-
-      data["@graph"].forEach(function(element) {
-          tempSub = "?";
-          tempPred = "?";
-          tempObj = "?";
-          pred = "---subClassOf---";
-          tempDomainArray = [];
-          //START :: Nodes and Links creation for subClassOf
-          if (displaySubclasses) {
-              if (element["rdfs:subClassOf"] === undefined) {
+    //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
+
+    data["@graph"].forEach(function (element) {
+        tempSub = "?";
+        tempPred = "?";
+        tempObj = "?";
+        pred = "---subClassOf---";
+        tempDomainArray = [];
+        //START :: Nodes and Links creation for subClassOf
+        if (displaySubclasses) {
+            if (element["subClassOf"] === undefined) {
                 undefVar = true;
-              }
-              else{
+            }
+            else {
                 tempSub = getLabel(displayDeustch, element["@id"]);
 
-                if (Object.prototype.toString.call(element["rdfs:subClassOf"]) === "[object Array]") {
-                    element["rdfs:subClassOf"].forEach(function(eachIds) {
-                        tempObj = getLabel(displayDeustch, eachIds["@id"]);
+                if (Object.prototype.toString.call(element["subClassOf"]) === "[object Array]") {
+                    element["subClassOf"].forEach(function (eachIds) {
+                        tempObj = getLabel(displayDeustch, eachIds);
                         /*if (tempObj === "noLabel") {
                             tempLabelArray = eachIds["@id"].split("/");
                             tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
@@ -294,9 +292,9 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                         createNewNode(tempSub, pred, tempObj, false, "");
                     });
                 } else {
-                    tempObj = getLabel(displayDeustch, element["rdfs:subClassOf"]["@id"]);
+                    tempObj = getLabel(displayDeustch, element["subClassOf"]);
                     /*if (tempObj === "noLabel") {
-                        tempLabelArray = element["rdfs:subClassOf"]["@id"].split("/");
+                        tempLabelArray = element["subClassOf"]["@id"].split("/");
                         tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
                         tempObj = tempLabelArray1[tempLabelArray1.length - 1];
                     }*/
@@ -310,113 +308,106 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
 
                     createNewNode(tempSub, pred, tempObj, false, " ");
                 }
-              }
-          }
-          //END :: Nodes and Links creation for subClassOf
-
-          //START :: Nodes and Links creation for all Properties
-          if (dispalyAllprop) {
-              //get the subject label  
-              if (element["rdfs:domain"] === undefined) {
+            }
+        }
+        //END :: Nodes and Links creation for subClassOf
+
+        //START :: Nodes and Links creation for all Properties
+        if (dispalyAllprop) {
+            //get the subject label  
+            if (element["domain"] === undefined) {
                 undefVar = true;
-              }
-              else
-              {
-                if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
-                    element["rdfs:domain"].forEach(function(eachIds) {
-                        tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
+            }
+            else {
+                if (Object.prototype.toString.call(element["domain"]) === "[object Array]") {
+                    element["domain"].forEach(function (eachIds) {
+                        tempDomainLabel = getLabel(displayDeustch, eachIds);
                         tempDomainArray.push(tempDomainLabel);
                     });
                 } else {
-                    tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
+                    tempSub = getLabel(displayDeustch, element["domain"]);
                 }
-              }
+            }
 
-              //get the predicate
-              if (element["rdfs:domain"] === undefined) {
+            //get the predicate
+            if (element["domain"] === undefined) {
                 undefVar = true;
-              }
-              else{
+            }
+            else {
                 tempPred = getLabel(displayDeustch, element["@id"]);
-              }
+            }
 
 
-              //get the object  range
-              if (element["rdfs:range"] === undefined) {
+            //get the object  range
+            if (element["range"] === undefined) {
                 undefVar = true;
-              }
-              else
-              {
-                if ("@id" in element["rdfs:range"]) {
-                    tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
+            }
+            else {
+                tempObj = getLabel(displayDeustch, element["range"]);
+            }
+
+            isLitteral = false;
+            literalDataType = tempObj;
+
+            if (tempObj.toLowerCase().includes("xsd:")) {
+                tempObj = tempObj + literalIndex;
+                literalIndex = literalIndex + 1;
+                isLitteral = true;
+            }
+
+            if (tempDomainArray.length !== 0) {
+                tempDomainArray.forEach(function (el) {
+                    if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
+                        if (isLitteral) {
+                            tripleValue = {
+                                source: el,
+                                predicate: tempPred,
+                                target: tempObj,
+                                value: 1
+                            };
+                            linksArray.push(tripleValue);
+                            createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
+                        } else {
+                            tripleValue = {
+                                source: el,
+                                predicate: tempPred,
+                                target: tempObj,
+                                value: 1
+                            };
+                            linksArray.push(tripleValue);
+                            createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
+                        }
+                    }
+                });
+            } else {
+                if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
+                    if (isLitteral) {
+                        tripleValue = {
+                            source: tempSub,
+                            predicate: "",
+                            target: tempPred,
+                            value: 1
+                        };
+                        linksArray.push(tripleValue);
+                        createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
+                    } else {
+                        tripleValue = {
+                            source: tempSub,
+                            predicate: tempPred,
+                            target: tempObj,
+                            value: 1
+                        };
+                        linksArray.push(tripleValue);
+                        createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
+                    }
                 }
-              }
-
-              isLitteral = false;
-              literalDataType = tempObj;
-
-              if (tempObj.toLowerCase().includes("xsd:"))
-              { 
-                  tempObj = tempObj + literalIndex;
-                  literalIndex = literalIndex + 1;
-                  isLitteral = true;
-              }
-
-              if (tempDomainArray.length !== 0) {
-                  tempDomainArray.forEach(function(el) {
-                      if (el !== "?" && tempPred !== "?" && tempObj !== "?") 
-                      {
-                          if (isLitteral) {
-                              tripleValue = {
-                                  source: el,
-                                  predicate: tempPred,
-                                  target: tempObj,
-                                  value: 1
-                              };
-                              linksArray.push(tripleValue);
-                              createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
-                          } else {
-                              tripleValue = {
-                                  source: el,
-                                  predicate: tempPred,
-                                  target: tempObj,
-                                  value: 1
-                              };
-                              linksArray.push(tripleValue);
-                              createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
-                          }
-                      }
-                  });
-              } else {
-                  if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") 
-                  {
-                      if (isLitteral) {
-                          tripleValue = {
-                              source: tempSub,
-                              predicate: "",
-                              target: tempPred,
-                              value: 1
-                          };
-                          linksArray.push(tripleValue);
-                          createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
-                      } else {
-                          tripleValue = {
-                              source: tempSub,
-                              predicate: tempPred,
-                              target: tempObj,
-                              value: 1
-                          };
-                          linksArray.push(tripleValue);
-                          createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
-                      }
-                  }
-              }
-          }
-          //END :: Nodes and Links creation for all Properties
-      });
-      //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
-
-      function doubleClickFunctionality(d) {
+            }
+        }
+        //END :: Nodes and Links creation for all Properties
+    });
+    //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
+
+    function doubleClickFunctionality(d) {
         var idVal = "#" + d.nodeId;
         var clickedNodeLabel = d.id;
         var newlyCreatingLinkData = "";
@@ -429,17 +420,17 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 .attr("r", resourceRadius + 4)
                 .style("fill", customizeGraphArray.onClickNodeColor);
 
-            var tempSub = "?"; 
+            var tempSub = "?";
             var tempPred = "?";
             var tempObj = "?";
             var pred = "---subClassOf---";
             var tempDomainArray = [];
-            var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue,removeClikedNode;
-            
+            var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue, removeClikedNode;
+
             onDoubleClickCreatingNodes = true;
             nodeDoubleClicked = idVal;
 
-            data["@graph"].forEach(function(element) {
+            data["@graph"].forEach(function (element) {
                 tempSub = "?";
                 tempPred = "?";
                 tempObj = "?";
@@ -449,61 +440,57 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 includeThis = false;
                 //START :: Nodes and Links creation for all Properties
                 //get the subject label  
-                if (element["rdfs:domain"] === undefined) {
+                if (element["domain"] === undefined) {
                     undefVar = true;
                 }
-                else
-                {
-                  if (Object.prototype.toString.call(element["rdfs:domain"]) === "[object Array]") {
-                      element["rdfs:domain"].forEach(function(eachIds) {
-                          tempDomainLabel = getLabel(displayDeustch, eachIds["@id"]);
-
-                          if (clickedNodeLabel === tempDomainLabel) {
-                              includeThis = true;
-                              tempDomainArray.push(tempDomainLabel);
-                          }
-
-                      });
-                  } else {
-                      tempSub = getLabel(displayDeustch, element["rdfs:domain"]["@id"]);
-
-                      if (clickedNodeLabel === tempSub) {
-                          includeThis = true;
-                      }
-                  }
+                else {
+                    if (Object.prototype.toString.call(element["domain"]) === "[object Array]") {
+                        element["domain"].forEach(function (eachIds) {
+                            tempDomainLabel = getLabel(displayDeustch, eachIds);
+
+                            if (clickedNodeLabel === tempDomainLabel) {
+                                includeThis = true;
+                                tempDomainArray.push(tempDomainLabel);
+                            }
+
+                        });
+                    } else {
+                        tempSub = getLabel(displayDeustch, element["domain"]);
+
+                        if (clickedNodeLabel === tempSub) {
+                            includeThis = true;
+                        }
+                    }
                 }
 
                 if (includeThis) {
                     //get the predicate
-                    if (element["rdfs:domain"] === undefined) {
+                    if (element["domain"] === undefined) {
                         undefVar = true;
-                      }
-                      else{
-                          tempPred = getLabel(displayDeustch, element["@id"]);
-                      }
+                    }
+                    else {
+                        tempPred = getLabel(displayDeustch, element["@id"]);
+                    }
 
                     //get the object  range
-                    if (element["rdfs:range"] === undefined) {
+                    if (element["range"] === undefined) {
                         undefVar = true;
                     }
-                    else{
-                      if ("@id" in element["rdfs:range"]) {
-                          tempObj = getLabel(displayDeustch, element["rdfs:range"]["@id"]);
-                      }
+                    else {
+                        tempObj = getLabel(displayDeustch, element["range"]);
                     }
 
                     isLitteral = false;
                     literalDataType = tempObj;
 
-                     if (tempObj.toLowerCase().includes("xsd:"))
-                     {
-                            tempObj = tempObj + literalIndex;
+                    if (tempObj.toLowerCase().includes("xsd:")) {
+                        tempObj = tempObj + literalIndex;
                         literalIndex = literalIndex + 1;
                         isLitteral = true;
                     }
 
                     if (!tempDomainArray.length === 0) {
-                        tempDomainArray.forEach(function(el) {
+                        tempDomainArray.forEach(function (el) {
                             if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
                                 if (isLitteral) {
                                     tripleValue = {
@@ -513,7 +500,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                                         value: 1
                                     };
                                     linksArray.push(tripleValue);
-                                    newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                    newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
                                     onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
                                     createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
                                 } else {
@@ -524,7 +511,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                                         value: 1
                                     };
                                     linksArray.push(tripleValue);
-                                    newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                    newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
                                     onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
                                     createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
                                 }
@@ -540,7 +527,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                                     value: 1
                                 };
                                 linksArray.push(tripleValue);
-                                newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
                                 onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
                                 createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
                             } else {
@@ -551,7 +538,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                                     value: 1
                                 };
                                 linksArray.push(tripleValue);
-                                newlyCreatingLinkData = {nodeClicked:idVal,link:tripleValue};
+                                newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
                                 onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
                                 createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
                             }
@@ -560,7 +547,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
                 }
                 //END :: Nodes and Links creation for all Properties
             });
-            
+
 
             onDoubleClickCreatingNodes = false;
 
@@ -570,84 +557,70 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             update();
             simulation.restart();
 
-            
-        } 
-        else if (expandedNodesArray.includes(idVal)) 
-        {  
-              removeClikedNode = "";
-              onDoubleClickedNewlyCreatedLinks.forEach(function(val) 
-              {
-                  if (val.nodeClicked === idVal) {
-                      for(var i=0;i<linksArray.length;i++)
-                      {
-                          if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) 
-                          {
-                              linksArray.splice(i, 1); 
-                              i--;
-                          }
-                      }
-                      removeClikedNode = val.nodeClicked;
-
-                  }
-              });
-              
-              for(var i=0;i<onDoubleClickedNewlyCreatedLinks.length;i++)
-              {
-                  if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) 
-                  {
-                      onDoubleClickedNewlyCreatedLinks.splice(i, 1); 
-                      i--;
-                  }
-              }
-
-              
-              removeClikedNode = "";
-              onDoubleClickedNewlyCreatedNodes.forEach(function(val) 
-              {
-                  if (val.nodeClicked === idVal) 
-                  {
-                      for(var i=0;i<nodesArray.length;i++)
-                      {
-                          if (nodesArray[i].id === val.nodeCreated.id) 
-                          {
-                              nodesArray.splice(i, 1); 
-                              i--;
-                          }
-                      }
-                      removeClikedNode = val.nodeClicked;
-                  }
-              });
-
-              for(var i=0;i<onDoubleClickedNewlyCreatedNodes.length;i++)
-              {
-                  if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) 
-                  {
-                      onDoubleClickedNewlyCreatedNodes.splice(i, 1); 
-                      i--;
-                  }
-              }
-
-              for(var i=0;i<expandedNodesArray.length;i++)
-              {
-                  if (expandedNodesArray[i] === idVal) 
-                  {
-                      expandedNodesArray.splice(i, 1); 
-                      break;
-                  }
-              }
-              var allClear = d3.selectAll(".everything");
-              allClear.selectAll("*").remove();
-
-              update();
-              simulation.restart();
-         
-          }
-      }
-
-      function clickFuntionality(d) {
+
+        }
+        else if (expandedNodesArray.includes(idVal)) {
+            removeClikedNode = "";
+            onDoubleClickedNewlyCreatedLinks.forEach(function (val) {
+                if (val.nodeClicked === idVal) {
+                    for (var i = 0; i < linksArray.length; i++) {
+                        if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) {
+                            linksArray.splice(i, 1);
+                            i--;
+                        }
+                    }
+                    removeClikedNode = val.nodeClicked;
+
+                }
+            });
+
+            for (var i = 0; i < onDoubleClickedNewlyCreatedLinks.length; i++) {
+                if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) {
+                    onDoubleClickedNewlyCreatedLinks.splice(i, 1);
+                    i--;
+                }
+            }
+
+
+            removeClikedNode = "";
+            onDoubleClickedNewlyCreatedNodes.forEach(function (val) {
+                if (val.nodeClicked === idVal) {
+                    for (var i = 0; i < nodesArray.length; i++) {
+                        if (nodesArray[i].id === val.nodeCreated.id) {
+                            nodesArray.splice(i, 1);
+                            i--;
+                        }
+                    }
+                    removeClikedNode = val.nodeClicked;
+                }
+            });
+
+            for (var i = 0; i < onDoubleClickedNewlyCreatedNodes.length; i++) {
+                if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) {
+                    onDoubleClickedNewlyCreatedNodes.splice(i, 1);
+                    i--;
+                }
+            }
+
+            for (var i = 0; i < expandedNodesArray.length; i++) {
+                if (expandedNodesArray[i] === idVal) {
+                    expandedNodesArray.splice(i, 1);
+                    break;
+                }
+            }
+            var allClear = d3.selectAll(".everything");
+            allClear.selectAll("*").remove();
+
+            update();
+            simulation.restart();
+
+        }
+    }
+
+    function clickFuntionality(d) {
         var nodeIdVal = d.id;
         var tempNodeContains = [];
-        nodeContents.forEach(function(val) {
+        nodeContents.forEach(function (val) {
             if (val.label === nodeIdVal) {
                 tempNodeContains = val.contents;
             }
@@ -667,37 +640,37 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         if (tempNodeContains !== undefined) {
             var nodeLabel = d3.select("#" + idsArray.nodeLabelId)
             nodeLabel.selectAll("*").remove();
-            if (tempNodeContains["rdfs:label"] === undefined) {
+            if (tempNodeContains["label"] === undefined) {
                 undefVar = true;
             } else {
-              if (Object.prototype.toString.call(tempNodeContains["rdfs:label"]) === "[object Array]") {
-                  tempNodeContains["rdfs:label"].forEach(function(eachIds) {
-                      if (eachIds["@language"] === "de" && displayDeustch) {
-
-                          nodeLabel.append("text")
-                              .text(" " + eachIds["@value"] + "\n")
-                              .style("font-style", "italic")
-                              .style("font-size", "80%")
-                              .style("position", "relative")
-                              .style("bottom", "2px");
-                      } else if (eachIds["@language"] === "en" && !displayDeustch) {
-                          nodeLabel.append("text")
-                              .text(" " + eachIds["@value"] + "\n")
-                              .style("font-style", "italic")
-                              .style("font-size", "80%")
-                              .style("position", "relative")
-                              .style("bottom", "2px");
-                      }
-
-                  });
-              } else {
-                  nodeLabel.append("text")
-                      .text(" " + tempNodeContains["rdfs:label"]["@value"] + "\n")
-                      .style("font-style", "italic")
-                      .style("font-size", "80%")
-                      .style("position", "relative")
-                      .style("bottom", "2px");
-              }
+                if (Object.prototype.toString.call(tempNodeContains["label"]) === "[object Array]") {
+                    tempNodeContains["label"].forEach(function (eachIds) {
+                        if (eachIds["@language"] === "de" && displayDeustch) {
+
+                            nodeLabel.append("text")
+                                .text(" " + eachIds["@value"] + "\n")
+                                .style("font-style", "italic")
+                                .style("font-size", "80%")
+                                .style("position", "relative")
+                                .style("bottom", "2px");
+                        } else if (eachIds["@language"] === "en" && !displayDeustch) {
+                            nodeLabel.append("text")
+                                .text(" " + eachIds["@value"] + "\n")
+                                .style("font-style", "italic")
+                                .style("font-size", "80%")
+                                .style("position", "relative")
+                                .style("bottom", "2px");
+                        }
+
+                    });
+                } else {
+                    nodeLabel.append("text")
+                        .text(" " + tempNodeContains["label"]["@value"] + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
+                }
             }
 
             //node id on double click
@@ -705,444 +678,438 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
             nodeID.selectAll("*").remove();
             if (tempNodeContains["@id"] === undefined) {
                 undefVar = true;
-            } else{
-              nodeID.append("text")
-              .text(" " + tempNodeContains["@id"] + "\n")
-              .style("font-style", "italic")
-              .style("font-size", "80%")
-              .style("position", "relative")
-              .style("bottom", "2px");
+            } else {
+                nodeID.append("text")
+                    .text(" " + tempNodeContains["@id"] + "\n")
+                    .style("font-style", "italic")
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
             }
             //node type on double click
             var nodeType = d3.select("#" + idsArray.nodeTypeId)
             nodeType.selectAll("*").remove();
             if (tempNodeContains["@type"] === undefined) {
                 undefVar = true;
-            } else{
-              nodeType.append("text")
-              .text(" " + tempNodeContains["@type"] + "\n\n")
-              .style("font-style", "italic")
-              .style("font-size", "80%")
-              .style("position", "relative")
-              .style("bottom", "2px");
+            } else {
+                nodeType.append("text")
+                    .text(" " + tempNodeContains["@type"] + "\n\n")
+                    .style("font-style", "italic")
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
             }
 
             //node description on double click
             var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
             nodeDescription.selectAll("*").remove();
-            if (tempNodeContains["dc:description"] === undefined) {
+            if (tempNodeContains["description"] === undefined) {
                 undefVar = true;
-            } else{
-              if (Object.prototype.toString.call(tempNodeContains["dc:description"]) === "[object Array]") {
-                  tempNodeContains["dc:description"].forEach(function(eachIds) {
-                      if (eachIds["@language"] === "de" && displayDeustch) {
-
-                          nodeDescription.append("text")
-                              .text(" " + eachIds["@value"] + "\n")
-                              .style("font-style", "italic")
-                              .style("font-size", "80%")
-                              .style("position", "relative")
-                              .style("bottom", "2px");
-                      } else if (eachIds["@language"] === "en" && !displayDeustch) {
-                          nodeDescription.append("text")
-                              .text(" " + eachIds["@value"] + "\n")
-                              .style("font-style", "italic")
-                              .style("font-size", "80%")
-                              .style("position", "relative")
-                              .style("bottom", "2px");
-                      }
-
-                  });
-              } else {
-                  nodeDescription.append("text")
-                      .text(" " + tempNodeContains["dc:description"]["@value"] + "\n")
-                      .style("font-style", "italic")
-                      .style("font-size", "80%")
-                      .style("position", "relative")
-                      .style("bottom", "2px");
-              }
+            } else {
+                if (Object.prototype.toString.call(tempNodeContains["description"]) === "[object Array]") {
+                    tempNodeContains["description"].forEach(function (eachIds) {
+                        if (eachIds["@language"] === "de" && displayDeustch) {
+
+                            nodeDescription.append("text")
+                                .text(" " + eachIds["@value"] + "\n")
+                                .style("font-style", "italic")
+                                .style("font-size", "80%")
+                                .style("position", "relative")
+                                .style("bottom", "2px");
+                        } else if (eachIds["@language"] === "en" && !displayDeustch) {
+                            nodeDescription.append("text")
+                                .text(" " + eachIds["@value"] + "\n")
+                                .style("font-style", "italic")
+                                .style("font-size", "80%")
+                                .style("position", "relative")
+                                .style("bottom", "2px");
+                        }
+
+                    });
+                } else {
+                    nodeDescription.append("text")
+                        .text(" " + tempNodeContains["description"]["@value"] + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
+                }
             }
 
             var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
             nodeSubClass.selectAll("*").remove();
-            if (tempNodeContains["rdfs:subClassOf"] === undefined) {
+            if (tempNodeContains["subClassOf"] === undefined) {
                 undefVar = true;
-            } else{
-              if (Object.prototype.toString.call(tempNodeContains["rdfs:subClassOf"]) === "[object Array]") {
-                  var tempIndexSubClassof = 1;
-                  tempNodeContains["rdfs:subClassOf"].forEach(function(eachIds) {
-                      var subClassLabel = getLabel(displayDeustch, eachIds["@id"]);
-            
-                      nodeSubClass.append("text")
-                          .text(" " + tempIndexSubClassof + ". " + subClassLabel + "\n")
-                          .style("font-style", "italic")
-                          .style("font-size", "80%")
-                          .style("position", "relative")
-                          .style("bottom", "2px");
-
-                      tempIndexSubClassof = tempIndexSubClassof + 1;
-
-                  });
-              } else {
-                  var subClassLabel = getLabel(displayDeustch, tempNodeContains["rdfs:subClassOf"]["@id"]);
-            
-                  nodeSubClass.append("text")
-                      .text(" " + subClassLabel + "\n")
-                      .style("font-style", "italic")
-                      .style("font-size", "80%")
-                      .style("position", "relative")
-                      .style("bottom", "2px");
-              }
+            } else {
+                if (Object.prototype.toString.call(tempNodeContains["subClassOf"]) === "[object Array]") {
+                    var tempIndexSubClassof = 1;
+                    tempNodeContains["subClassOf"].forEach(function (eachIds) {
+                        var subClassLabel = getLabel(displayDeustch, eachIds);
+
+                        nodeSubClass.append("text")
+                            .text(" " + tempIndexSubClassof + ". " + subClassLabel + "\n")
+                            .style("font-style", "italic")
+                            .style("font-size", "80%")
+                            .style("position", "relative")
+                            .style("bottom", "2px");
+
+                        tempIndexSubClassof = tempIndexSubClassof + 1;
+
+                    });
+                } else {
+                    var subClassLabel = getLabel(displayDeustch, tempNodeContains["subClassOf"]);
+
+                    nodeSubClass.append("text")
+                        .text(" " + subClassLabel + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
+                }
             }
 
             var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
             nodeDomain.selectAll("*").remove();
-            if (tempNodeContains["rdfs:domain"] === undefined) {
+            if (tempNodeContains["domain"] === undefined) {
                 undefVar = true;
-            } else{
-              if (Object.prototype.toString.call(tempNodeContains["rdfs:domain"]) === "[object Array]") {
-                  var tempIndexdomain = 1;
-                  tempNodeContains["rdfs:domain"].forEach(function(eachIds) {
-                      var domainLabel = getLabel(displayDeustch, eachIds["@id"]);
-            
-                      nodeDomain.append("text")
-                          .text(" " + tempIndexdomain + ". " + domainLabel + "\n")
-                          .style("font-style", "italic")
-                          .style("font-size", "80%")
-                          .style("position", "relative")
-                          .style("bottom", "2px");
-
-                      tempIndexdomain = tempIndexdomain + 1;
-
-                  });
-              } else {
-                  var domainLabel = getLabel(displayDeustch, tempNodeContains["rdfs:domain"]["@id"]);
-            
-                  nodeDomain.append("text")
-                      .text(" " + domainLabel + "\n")
-                      .style("font-style", "italic")
-                      .style("font-size", "80%")
-                      .style("position", "relative")
-                      .style("bottom", "2px");
-              }
+            } else {
+                if (Object.prototype.toString.call(tempNodeContains["domain"]) === "[object Array]") {
+                    var tempIndexdomain = 1;
+                    tempNodeContains["domain"].forEach(function (eachIds) {
+                        var domainLabel = getLabel(displayDeustch, eachIds);
+
+                        nodeDomain.append("text")
+                            .text(" " + tempIndexdomain + ". " + domainLabel + "\n")
+                            .style("font-style", "italic")
+                            .style("font-size", "80%")
+                            .style("position", "relative")
+                            .style("bottom", "2px");
+
+                        tempIndexdomain = tempIndexdomain + 1;
+
+                    });
+                } else {
+                    var domainLabel = getLabel(displayDeustch, tempNodeContains["domain"]);
+
+                    nodeDomain.append("text")
+                        .text(" " + domainLabel + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
+                }
             }
-            
+
 
 
             var nodeRange = d3.select("#" + idsArray.nodeRangeId)
             nodeRange.selectAll("*").remove();
-            if (tempNodeContains["rdfs:range"] === undefined) {
+            if (tempNodeContains["range"] === undefined) {
                 undefVar = true;
-            } else{
-              if (Object.prototype.toString.call(tempNodeContains["rdfs:range"]) === "[object Array]") {
-                  var tempIndexRange = 1;
-                  tempNodeContains["rdfs:range"].forEach(function(eachIds) {
-                      var rangeLabel = getLabel(displayDeustch, eachIds["@id"]);
-
-                      nodeRange.append("text")
-                          .text(" " + tempIndexRange + ". " + rangeLabel + "\n")
-                          .style("font-style", "italic")
-                          .style("font-size", "80%")
-                          .style("position", "relative")
-                          .style("bottom", "2px");
-
-                      tempIndexRange = tempIndexRange + 1;
-
-                  });
-              } else {
-                  var rangeLabel = getLabel(displayDeustch, tempNodeContains["rdfs:range"]["@id"]);
-
-                  nodeRange.append("text")
-                      .text(" " + rangeLabel + "\n")
-                      .style("font-style", "italic")
-                      .style("font-size", "80%")
-                      .style("position", "relative")
-                      .style("bottom", "2px");
-              }
+            } else {
+                if (Object.prototype.toString.call(tempNodeContains["range"]) === "[object Array]") {
+                    var tempIndexRange = 1;
+                    tempNodeContains["range"].forEach(function (eachIds) {
+                        var rangeLabel = getLabel(displayDeustch, eachIds);
+
+                        nodeRange.append("text")
+                            .text(" " + tempIndexRange + ". " + rangeLabel + "\n")
+                            .style("font-style", "italic")
+                            .style("font-size", "80%")
+                            .style("position", "relative")
+                            .style("bottom", "2px");
+
+                        tempIndexRange = tempIndexRange + 1;
+
+                    });
+                } else {
+                    var rangeLabel = getLabel(displayDeustch, tempNodeContains["range"]);
+
+                    nodeRange.append("text")
+                        .text(" " + rangeLabel + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
+                }
             }
 
             var nodeComment = d3.select("#" + idsArray.nodeCommentId)
             nodeComment.selectAll("*").remove();
-            if (tempNodeContains["rdfs:comment"] === undefined) {
+            if (tempNodeContains["comment"] === undefined) {
                 undefVar = true;
             }
-            else{
-              nodeComment.append("text")
-              .text(tempNodeContains["rdfs:comment"] + "\n")
-              .style("font-style", "italic")
-              .style("font-size", "80%")
-              .style("position", "relative")
-              .style("bottom", "2px");
+            else {
+                nodeComment.append("text")
+                    .text(tempNodeContains["comment"] + "\n")
+                    .style("font-style", "italic")
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
             }
         }
 
     }
-    
+
     function zoomActions() {
         g.attr("transform", d3.event.transform);
     }
 
-    function update() 
-        {
-
-          simulation.restart();
-
-          simulation
-              .nodes(nodesArray)
-              .on("tick", ticked);
-
-          simulation.force("link")
-              .links(linksArray);
-
-
-          g = svg.append("g")
-              .attr("class", "everything");
-
-          link = g.selectAll("line")
-              .attr("class", "links")
-              .data(linksArray)
-              .enter().append("line")
-              .attr("class", "link")
-              .attr("stroke-width", 1)
-              .style("fill", "#999")
-              .attr("marker-end", function(d) {
-                  var labelStr = d.predicate;
-                  if (labelStr.includes("subClassOf")) {
-                      return "url(#subclass)";
-                  }
-                  return "url(#normal)";
-              })
-              .style("stroke-dasharray", function(d) {
-                  var labelStr = d.predicate;
-                  if (labelStr.includes("subClassOf")) {
-                      return ("3, 3");
-                  }
-                  if (labelStr.includes("subPropertyOf")) {
-                      return ("5, 5");
-                  }
-                  return ("0, 0");
-              });
-
-          link.exit().remove();
-          // ==================== Add Link Names =====================
-          linkTexts = g.selectAll(".link-text")
-              .data(linksArray)
-              .enter()
-              .append("text")
-              .attr("class", "link-text")
-              .text(function(d) {
-                  var labelStr = d.predicate;
-                  if (labelStr.includes("subClassOf")) {
-                      return customizeGraphArray.subClassLabel;
-                  }
-                  return d.predicate;
-              })
-              .style("fill", function(d) {
-                  var labelStr = d.predicate;
-                  if (labelStr.includes("subClassOf")) {
-                      return customizeGraphArray.subClassLabelColor;
-                  }
-                  return customizeGraphArray.propertyTextColor;
-              })
-              .style("font-size", "80%")
-              .style("font-style", "italic")
-              .attr("x", 12)
-              .attr("y", 3) 
-              ;
-
-
-          linkTexts.append("title")
-              .text(function(d) {
-                  var labelStr = d.predicate;
-                  var returnValue;
-                  
-                  if (labelStr.includes("subClassOf")) {
-                    
-                      returnValue = "Source : " + d.source.id+ "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target.id;
-                  } else {
-                      returnValue = "Source : " + d.source.id + "\nProperty : " + labelStr + "\nObject : " + d.target.id;
-                  }
-
-                  return returnValue;
-              });
-          // ==================== Add Link Names =====================
-
-          node = g.append("g")
-              .attr("class", "nodes")
-              .selectAll("g")
-              .data(nodesArray)
-              .enter().append("g");
-          node.exit().remove();
-
-          circles = node.append("circle")
-              .attr("id", function(d) {
-                  return d.nodeId;
-              })
-              .attr("r", function(d) {
-                  var labelStr = d.id;
-                  if (d.isLitteral) {
-                      return literalRadius;
-                  }
-                  return resourceRadius;
-              })
-              .style("fill", function(d) {
-                  var labelStr = d.id;
-                  var expandedNode = false;
-                  
-                  if(!dispalyAllprop)
-                  {
-                    expandedNodesArray.forEach(function(val)
-                    {
-                        if(val === "#"+d.nodeId)
-                        {
+    function update() {
+
+        simulation.restart();
+
+        simulation
+            .nodes(nodesArray)
+            .on("tick", ticked);
+
+        simulation.force("link")
+            .links(linksArray);
+
+
+        g = svg.append("g")
+            .attr("class", "everything");
+
+        link = g.selectAll("line")
+            .attr("class", "links")
+            .data(linksArray)
+            .enter().append("line")
+            .attr("class", "link")
+            .attr("stroke-width", 1)
+            .style("fill", "#999")
+            .attr("marker-end", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return "url(#subclass)";
+                }
+                return "url(#normal)";
+            })
+            .style("stroke-dasharray", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return ("3, 3");
+                }
+                if (labelStr.includes("subPropertyOf")) {
+                    return ("5, 5");
+                }
+                return ("0, 0");
+            });
+
+        link.exit().remove();
+        // ==================== Add Link Names =====================
+        linkTexts = g.selectAll(".link-text")
+            .data(linksArray)
+            .enter()
+            .append("text")
+            .attr("class", "link-text")
+            .text(function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return customizeGraphArray.subClassLabel;
+                }
+                return d.predicate;
+            })
+            .style("fill", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return customizeGraphArray.subClassLabelColor;
+                }
+                return customizeGraphArray.propertyTextColor;
+            })
+            .style("font-size", "80%")
+            .style("font-style", "italic")
+            .attr("x", 12)
+            .attr("y", 3)
+            ;
+
+
+        linkTexts.append("title")
+            .text(function (d) {
+                var labelStr = d.predicate;
+                var returnValue;
+
+                if (labelStr.includes("subClassOf")) {
+
+                    returnValue = "Source : " + d.source.id + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target.id;
+                } else {
+                    returnValue = "Source : " + d.source.id + "\nProperty : " + labelStr + "\nObject : " + d.target.id;
+                }
+
+                return returnValue;
+            });
+        // ==================== Add Link Names =====================
+
+        node = g.append("g")
+            .attr("class", "nodes")
+            .selectAll("g")
+            .data(nodesArray)
+            .enter().append("g");
+        node.exit().remove();
+
+        circles = node.append("circle")
+            .attr("id", function (d) {
+                return d.nodeId;
+            })
+            .attr("r", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return literalRadius;
+                }
+                return resourceRadius;
+            })
+            .style("fill", function (d) {
+                var labelStr = d.id;
+                var expandedNode = false;
+
+                if (!dispalyAllprop) {
+                    expandedNodesArray.forEach(function (val) {
+                        if (val === "#" + d.nodeId) {
                             expandedNode = true;
                         }
                     });
-                  }
-                  
-                  if(expandedNode)
-                  {
-                     return "#8E44AD";
-                  }
-                  if (d.isLitteral) 
-                  {
-                      return customizeGraphArray.literalNodeColor;
-                  }
-                  return customizeGraphArray.resourceNodeColor;
-              })
-              .call(d3.drag()
-                  .on("start", dragstarted)
-                  .on("drag", dragged)
-                  .on("end", dragended)
-              );
-
-          lables = node.append("text")
-              .attr("class", "node-text")
-              .text(function(d) {
-                  return d.id;
-              })
-              .style("font-size", function(d) {
-                  var labelStr = d.id;
-                  if (d.isLitteral) {
-                      return "80%";
-                  }
-                  return "100%";
-              })
-              .style("font-style", function(d) {
-                  var labelStr = d.id;
-                  if (d.isLitteral) {
-                      return "italic";
-                  }
-                  return "bold";
-              })
-              .style("fill", function(d) {
-                  var labelStr = d.id;
-                  if (d.isLitteral) {
-                      return customizeGraphArray.literalNodeTextColor;
-                  }
-                  return customizeGraphArray.resourceNodeTextColor;
-              })
-              .attr("x", function(d) {
-                  if (d.isLitteral) {
-                      return 8;
-                  }
-                  return 12;
-              })
-              .attr("y", 3);
-
-          node.append("title")
-              .text(function(d) {
-                  var returnValue = "Node : " + d.id;
-                  if (d.isLitteral) {
-                      returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
-                  } else {
-                      returnValue = "Node : " + d.id;
-                  }
-                  return returnValue;
-              });
-
-          //START :: on double click
-          node.on("dblclick", doubleClickFunctionality);
-          //END :: on double click    
-
-          //START :: on  click
-          node.on("click", clickFuntionality);
-          //END :: on  click
-
-
-          if (!disableZoom) {
+                }
+
+                if (expandedNode) {
+                    return "#8E44AD";
+                }
+                if (d.isLitteral) {
+                    return customizeGraphArray.literalNodeColor;
+                }
+                return customizeGraphArray.resourceNodeColor;
+            })
+            .call(d3.drag()
+                .on("start", dragstarted)
+                .on("drag", dragged)
+                .on("end", dragended)
+            );
+
+        lables = node.append("text")
+            .attr("class", "node-text")
+            .text(function (d) {
+                return d.id;
+            })
+            .style("font-size", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return "80%";
+                }
+                return "100%";
+            })
+            .style("font-style", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return "italic";
+                }
+                return "bold";
+            })
+            .style("fill", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return customizeGraphArray.literalNodeTextColor;
+                }
+                return customizeGraphArray.resourceNodeTextColor;
+            })
+            .attr("x", function (d) {
+                if (d.isLitteral) {
+                    return 8;
+                }
+                return 12;
+            })
+            .attr("y", 3);
+
+        node.append("title")
+            .text(function (d) {
+                var returnValue = "Node : " + d.id;
+                if (d.isLitteral) {
+                    returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
+                } else {
+                    returnValue = "Node : " + d.id;
+                }
+                return returnValue;
+            });
+
+        //START :: on double click
+        node.on("dblclick", doubleClickFunctionality);
+        //END :: on double click    
+
+        //START :: on  click
+        node.on("click", clickFuntionality);
+        //END :: on  click
+
+
+        if (!disableZoom) {
 
             var zoomHandler = d3.zoom()
-                  .on("zoom", zoomActions);
-              
-              svg.call(zoomHandler).on("dblclick.zoom", null);
-          }
- 
-      }
-
-      function ticked() {
-          lables
-              .attr("x2", function(d) {
-                  return d.x - width;
-              })
-              .attr("y2", function(d) {
-                  return d.y - height;
-              });
-          link
-              .attr("x1", function(d) {
-                  return d.source.x;
-              })
-              .attr("y1", function(d) {
-                  return d.source.y;
-              })
-              .attr("x2", function(d) {
-                  return d.target.x;
-              })
-              .attr("y2", function(d) {
-                  return d.target.y;
-              });
-          linkTexts
-              .attr("x", function(d) {
-                  return 4 + (d.source.x + d.target.x) / 2;
-              })
-              .attr("y", function(d) {
-                  return 4 + (d.source.y + d.target.y) / 2;
-              });
-          node
-              .attr("transform", function(d) {
-                  return "translate(" + d.x + "," + d.y + ")";
-              });
-          if (applyNodesBoundary) {
-              node
-                  .attr("cx", function(d) {
-                      return d.x = Math.max(Math.max(resourceRadius, literalRadius), Math.min(width - Math.max(resourceRadius, literalRadius), d.x));
-                  })
-                  .attr("cy", function(d) {
-                      return d.y = Math.max(Math.max(resourceRadius, literalRadius), Math.min(height - Math.max(resourceRadius, literalRadius), d.y));
-                  });
-          }
-      }
-
-      update();
-
-
- });
-
-  function dragstarted(d) {
-      if (!d3.event.active) simulation.alphaTarget(0.3).restart();
-      d.fx = d.x;
-      d.fy = d.y;
-  }
-
-  function dragged(d) {
-      d.fx = d3.event.x;
-      d.fy = d3.event.y;
-  }
-
-  function dragended(d) {
-      if (!d3.event.active) simulation.alphaTarget(0);
-      d.fx = null;
-      d.fy = null;
-  }
+                .on("zoom", zoomActions);
+
+            svg.call(zoomHandler).on("dblclick.zoom", null);
+        }
+
+    }
+
+    function ticked() {
+        lables
+            .attr("x2", function (d) {
+                return d.x - width;
+            })
+            .attr("y2", function (d) {
+                return d.y - height;
+            });
+        link
+            .attr("x1", function (d) {
+                return d.source.x;
+            })
+            .attr("y1", function (d) {
+                return d.source.y;
+            })
+            .attr("x2", function (d) {
+                return d.target.x;
+            })
+            .attr("y2", function (d) {
+                return d.target.y;
+            });
+        linkTexts
+            .attr("x", function (d) {
+                return 4 + (d.source.x + d.target.x) / 2;
+            })
+            .attr("y", function (d) {
+                return 4 + (d.source.y + d.target.y) / 2;
+            });
+        node
+            .attr("transform", function (d) {
+                return "translate(" + d.x + "," + d.y + ")";
+            });
+        if (applyNodesBoundary) {
+            node
+                .attr("cx", function (d) {
+                    return d.x = Math.max(Math.max(resourceRadius, literalRadius), Math.min(width - Math.max(resourceRadius, literalRadius), d.x));
+                })
+                .attr("cy", function (d) {
+                    return d.y = Math.max(Math.max(resourceRadius, literalRadius), Math.min(height - Math.max(resourceRadius, literalRadius), d.y));
+                });
+        }
+    }
+
+    update();
+
+
+    // });
+
+    function dragstarted(d) {
+        if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+        d.fx = d.x;
+        d.fy = d.y;
+    }
+
+    function dragged(d) {
+        d.fx = d3.event.x;
+        d.fy = d3.event.y;
+    }
+
+    function dragended(d) {
+        if (!d3.event.active) simulation.alphaTarget(0);
+        d.fx = null;
+        d.fy = null;
+    }
 
 };
diff --git a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json b/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
deleted file mode 100644
index 02d568f24..000000000
--- a/ida-chatbot/src/assets/rdfontology/historian-onlogoly.json
+++ /dev/null
@@ -1,1305 +0,0 @@
-{
-  "@context": {
-    "data": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/data/",
-    "dbo": "http://dbpedia.org/ontology/",
-    "dc": "http://purl.org/dc/elements/1.1/",
-    "foaf": "http://xmlns.com/foaf/0.1/",
-    "owl": "http://www.w3.org/2002/07/owl#",
-    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
-    "time": "http://www.w3.org/2006/time#",
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
-  },
-  "@graph": [
-    {
-      "@id": "dbo:deathPlace",
-      "@type": [
-        "owl:ObjectProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:domain": {
-        "@id": "dbo:Person"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Death Place"
-      },
-      "rdfs:range": {
-        "@id": "dbo:Place"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/internalInformation",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Internal information about the resource",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Internal Information"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "time:hasBeginning",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:ObjectProperty"
-      ],
-      "rdfs:comment": "Describes the beginning time of a temporal entity",
-      "rdfs:domain": {
-        "@id": "time:DateTimeInterval"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "startsAt"
-      },
-      "rdfs:range": {
-        "@id": "time:Instant"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "Soldatendekoration Info"
-        },
-        {
-          "@language": "en",
-          "@value": "DecorationEvent"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargeReason",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "Reason of Soldier's discharge",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Discharge Reason"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "Dienststellung"
-        },
-        {
-          "@language": "en",
-          "@value": "Regiment"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/deathPlaceStr",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Death Place(Plain text)"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      }
-    },
-    {
-      "@id": "dc:title",
-      "@type": "owl:AnnotationProperty"
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalDALId",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "Information about the ID number used in the original list of the SS Soldiers",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Original DAL Id"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable",
-      "@type": "owl:Class",
-      "dc:description": {
-        "@language": "en",
-        "@value": "Describes a specific point in time"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Timestampable"
-      },
-      "rdfs:subClassOf": {
-        "@id": "owl:Thing"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPNumber",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "Soldier's NSDAP number in",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "NSDAP Number"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRankInfo",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "Soldier Rank Info"
-        },
-        {
-          "@language": "de",
-          "@value": "Soldat Rang Info"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/status",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Internal editing status",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "processing status"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDecoration",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Details of Decoration given at a DecorationEvent",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Has Decoration"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/",
-      "@type": "owl:Ontology",
-      "dc:description": {
-        "@language": "en",
-        "@value": "Vocabulary describing Concepts and Relationships of Schutzstaffel"
-      },
-      "dc:title": {
-        "@language": "en",
-        "@value": "SS Vocabulary"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/id",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "Unique ID of an SSClass resource",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "id"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipType",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Additional information on the SS membership number",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Membership Type"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrolledOn",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Date of Soldier's enrollment",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Enrolled On"
-      },
-      "rdfs:range": {
-        "@id": "xsd:dateTime"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasDischargeInfo",
-      "@type": [
-        "owl:ObjectProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "Reason of Soldier's discharge",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Soldier Discharge Info"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "Soldier"
-        },
-        {
-          "@language": "de",
-          "@value": "Soldat"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "dbo:Person"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "SoldierRegimentInfo"
-        },
-        {
-          "@language": "de",
-          "@value": "Soldatendienststellung Info"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRegiment",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Details of the Regiment",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Has Regiment"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Regiment"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "dbo:lastName",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:domain": {
-        "@id": "dbo:Person"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Last Name"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      }
-    },
-    {
-      "@id": "time:DateTimeInterval",
-      "@type": "owl:Class"
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/origin",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Origin of the Literature",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Origin"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasGovernmentFunction",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Details of Government Function",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo"
-      },
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "hasGovernmentFunction"
-        },
-        {
-          "@language": "en",
-          "@value": "Has Govt Function"
-        }
-      ],
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasNSDAPFunction",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Details of NSDAP Function",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Has NSDAP Function"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/title",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "Academic title, ex: Dr., Prof. Dr.",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "title"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/membershipNumber",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "NSDAP membership number",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "membershipNumber"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/sortation",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Sortation of the Rank",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Rank"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "sortation"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DALVerified",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Verification status of data against DAL",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Data verified on DAL?"
-      },
-      "rdfs:range": {
-        "@id": "xsd:boolean"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/GovernmentFunction",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "GovernmentFunction"
-        },
-        {
-          "@language": "de",
-          "@value": "Regierungsfunktion"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        }
-      ]
-    },
-    {
-      "@id": "dbo:birthPlace",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:ObjectProperty"
-      ],
-      "rdfs:domain": {
-        "@id": "dbo:Person"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Birth Place"
-      },
-      "rdfs:range": {
-        "@id": "dbo:Place"
-      }
-    },
-    {
-      "@id": "dc:description",
-      "@type": "owl:AnnotationProperty"
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasRank",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Details of the Rank",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRankInfo"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Has Rank"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Rank"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/governmentFunctionInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Soldier's function in the government",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Soldier Govt Function"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "time:Instant",
-      "@type": "owl:Class"
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/originalDALPage",
-      "@type": [
-        "owl:DatatypeProperty",
-        "owl:FunctionalProperty"
-      ],
-      "rdfs:comment": "Page number of the original list where the information about the Soldier is given",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Original DAL Page"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/information",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Information about the resource",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Information"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/signature",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Signature of the Literature",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "signature"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/publicationYear",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Publication year of the Literature",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Year of Publication"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunction",
-      "@type": "owl:Class",
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "NSDAPFunction"
-      },
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        }
-      ]
-    },
-    {
-      "@id": "dbo:birthDate",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:domain": {
-        "@id": "dbo:Person"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Birth Date"
-      },
-      "rdfs:range": {
-        "@id": "xsd:date"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "Literature"
-        },
-        {
-          "@language": "de",
-          "@value": "Literatur"
-        }
-      ],
-      "rdfs:subClassOf": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierDischargeInfo",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "SoldierDischargeInfo"
-        },
-        {
-          "@language": "de",
-          "@value": "Soldatenentlassung Info"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        }
-      ]
-    },
-    {
-      "@id": "dbo:deathDate",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:domain": {
-        "@id": "dbo:Person"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Death Date"
-      },
-      "rdfs:range": {
-        "@id": "xsd:date"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/hasLiterature",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Details of the Literature",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
-      },
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "hasLiterature"
-        },
-        {
-          "@language": "en",
-          "@value": "Has Literature"
-        }
-      ],
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable",
-      "@type": "owl:Class",
-      "dc:description": {
-        "@language": "en",
-        "@value": "Describes entities which have an abbreviated name"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Abbreviable"
-      },
-      "rdfs:subClassOf": {
-        "@id": "owl:Thing"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/literatureInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Soldier Literature"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/NSDAPFunctionInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Soldier's function in NSDAP",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Soldier NSDAP Function"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Rank",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "Rang"
-        },
-        {
-          "@language": "en",
-          "@value": "Rank"
-        }
-      ],
-      "rdfs:subClassOf": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/dischargedOn",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Date of Soldier's discharge",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Discharged On"
-      },
-      "rdfs:range": {
-        "@id": "xsd:dateTime"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierGovernmentFunctionInfo",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "Soldatenregierungsfunktion Info"
-        },
-        {
-          "@language": "en",
-          "@value": "SoldierGovernmentFunctionInfo"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/divergentDAL",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Differences observed from the original dataset",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Divergent DAL"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/enrollmentReason",
-      "@type": [
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Reason of Soldier's enrollment",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Enrollment Reason"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass",
-      "@type": "owl:Class",
-      "dc:description": {
-        "@language": "en",
-        "@value": "Top level resource of SS Ontology"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "SSClass"
-      },
-      "rdfs:subClassOf": {
-        "@id": "owl:Thing"
-      }
-    },
-    {
-      "@id": "dbo:Place",
-      "@type": "owl:Class"
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/name",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Name of the resource",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Name"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/abbreviation",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Abbreviation of the Abbreviable resource",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Abbreviation"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/rankInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Soldier'r rank in SS",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Soldier Rank"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRankInfo"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/applicableFrom",
-      "@type": [
-        "owl:ObjectProperty",
-        "owl:FunctionalProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Date from which a Decoration/Rank/Literature/Regiment is recorded.",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Applicable From"
-      },
-      "rdfs:range": {
-        "@id": "time:Instant"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "time:hasEnd",
-      "@type": [
-        "owl:ObjectProperty",
-        "owl:DatatypeProperty"
-      ],
-      "rdfs:comment": "Describes the ending time of a temporal entity",
-      "rdfs:domain": {
-        "@id": "time:DateTimeInterval"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "endsAt"
-      },
-      "rdfs:range": {
-        "@id": "time:Instant"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/regimentInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Soldier's Regiment",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Soldier Regiment"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierRegimentInfo"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    },
-    {
-      "@id": "xsd:date",
-      "@type": "rdfs:Datatype"
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Dischargable",
-      "@type": "owl:Class",
-      "dc:description": {
-        "@language": "en",
-        "@value": "Describes the entity which can be discharged with a reason i.e. Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Dischargable"
-      },
-      "rdfs:subClassOf": {
-        "@id": "owl:Thing"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/birthPlaceStr",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Birth Place(Plain text)"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/author",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Author of a Literature",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Author"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierNSDAPFunctionInfo",
-      "@type": "owl:Class",
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "SoldierNSDAPFunctionInfo"
-      },
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/citaviId",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:comment": "Unique ID of a Literature in the Citavi database",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Literature"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Citavi Database Id"
-      },
-      "rdfs:range": {
-        "@id": "xsd:positiveInteger"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topDataProperty"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Decoration",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "en",
-          "@value": "Decoration"
-        },
-        {
-          "@language": "de",
-          "@value": "Orden"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Abbreviable"
-        },
-        {
-          "@id": "time:DateTimeInterval"
-        }
-      ]
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SoldierLiteratureInfo",
-      "@type": "owl:Class",
-      "rdfs:label": [
-        {
-          "@language": "de",
-          "@value": "SoldatenLiteratur Info"
-        },
-        {
-          "@language": "en",
-          "@value": "SoldierLiteratureInfo"
-        }
-      ],
-      "rdfs:subClassOf": [
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/SSClass"
-        },
-        {
-          "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Timestampable"
-        }
-      ]
-    },
-    {
-      "@id": "dbo:Person",
-      "@type": "owl:Class"
-    },
-    {
-      "@id": "dbo:firstName",
-      "@type": "owl:DatatypeProperty",
-      "rdfs:domain": {
-        "@id": "dbo:Person"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "First Name"
-      },
-      "rdfs:range": {
-        "@id": "xsd:string"
-      }
-    },
-    {
-      "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/decorationInfo",
-      "@type": "owl:ObjectProperty",
-      "rdfs:comment": "Medal acquired by a Soldier",
-      "rdfs:domain": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/Soldier"
-      },
-      "rdfs:label": {
-        "@language": "en",
-        "@value": "Soldier Decoration"
-      },
-      "rdfs:range": {
-        "@id": "https://www.upb.de/historisches-institut/neueste-geschichte/ssdal/ontology/DecorationEvent"
-      },
-      "rdfs:subPropertyOf": {
-        "@id": "owl:topObjectProperty"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/ida-ws/src/main/java/upb/ida/constant/IDALiteral.java b/ida-ws/src/main/java/upb/ida/constant/IDALiteral.java
index 0a7d38347..837a8c75c 100644
--- a/ida-ws/src/main/java/upb/ida/constant/IDALiteral.java
+++ b/ida-ws/src/main/java/upb/ida/constant/IDALiteral.java
@@ -17,6 +17,7 @@ public interface IDALiteral {
 	public static final int UIA_GSDIAGRAM = 8;
 	public static final int UIA_SSBDIAGRAM = 9;
 	public static final int UIA_NOACTION = 0;
+	public static final int UIA_ONTOLOGY = 11;
 
 
 	//Rivescript literals
@@ -50,5 +51,7 @@ public interface IDALiteral {
 			"prefix dc: <http://purl.org/dc/elements/1.1/>\n");
 	public static final String TEST_DATASET = "test-data";
 	public static final String TEST_ONTOLOGYSET = "test-ontology";
+	public static final String SS_DATASET = "ssfuehrer";
+	public static final String ONTOLOGY_ERROR = "Please load a dataset before.";
 
 }
diff --git a/ida-ws/src/main/java/upb/ida/dao/DataRepository.java b/ida-ws/src/main/java/upb/ida/dao/DataRepository.java
index 80d4ae9b4..baa7f0a86 100644
--- a/ida-ws/src/main/java/upb/ida/dao/DataRepository.java
+++ b/ida-ws/src/main/java/upb/ida/dao/DataRepository.java
@@ -8,12 +8,19 @@
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.ResultSetFactory;
 import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.DatasetAccessorFactory;
+import org.apache.jena.query.DatasetAccessor;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdfconnection.RDFConnectionFuseki;
 import org.apache.jena.rdfconnection.RDFConnectionRemoteBuilder;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import upb.ida.constant.IDALiteral;
 
+import java.io.ByteArrayOutputStream;
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
@@ -526,4 +533,21 @@ private List<Map<String, Object>> createColumnsMetadata(Map<String, ArrayList<St
 		}
 		return columns;
 	}
+
+	public JSONObject getOntologyData(String datasetName) {
+		if(!IDALiteral.SS_DATASET.equals(datasetName)){
+			return null;
+		}
+		try{
+			DatasetAccessor accessor = DatasetAccessorFactory.createHTTP(dbhost + datasetName + "-ontology");
+			model = accessor.getModel();
+			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+			RDFDataMgr.write(outputStream, model, Lang.JSONLD);
+			JSONParser parser = new JSONParser();
+			return (JSONObject) parser.parse(new String(outputStream.toByteArray()));
+		}catch (Exception ex){
+			ex.printStackTrace();
+		}
+		return null;
+	}
 }
diff --git a/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java b/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java
deleted file mode 100644
index a3ed66a83..000000000
--- a/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package upb.ida.ontologyexplorer;
-
-import org.apache.jena.graph.Triple;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.ResultSetFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdfconnection.RDFConnectionFuseki;
-import org.apache.jena.rdfconnection.RDFConnectionRemoteBuilder;
-import org.apache.jena.riot.Lang;
-import org.apache.jena.riot.RDFDataMgr;
-import org.springframework.stereotype.Component;
-import java.util.*;
-
-
-@Component
-public class OntologyExplorer {
-	private static String dbhost = System.getenv("FUSEKI_URL");
-	private Model model = null;
-	private RDFConnectionFuseki conn = null;
-
-	/**
-	 * @param queryString the SPARQL query to be executed on the RDF dataset
-	 * @return It takes query string as its parameter and returns the result set after executing the query.
-	 */
-	public ResultSet getResultFromQuery(String queryString, String dataset) {
-		QueryExecution queryExecution;
-		ResultSet resultSet = null;
-		Query query = QueryFactory.create(queryString);
-		boolean connectionCreated = false;
-
-		try
-		{
-			/*
-			 * No need to create a model from file or make database connection if the query is being run on already existing model. ( multiple queries are run on same model from getData function.)
-			 */
-			if (model == null) {
-				/*
-				 *	Create a fuseki model from the file and run the query on that model for test cases.
-				 */
-				if ("test-data".equals(dataset)) {
-
-						model = ModelFactory.createDefaultModel();
-						String path = Objects.requireNonNull(getClass().getClassLoader().getResource("dataset/test-soldier.ttl")).getFile();
-						model.read(path);
-						queryExecution = QueryExecutionFactory.create(query, model);
-
-				} else {
-						RDFConnectionRemoteBuilder builder = RDFConnectionFuseki.create().destination(dbhost + dataset);
-						conn = (RDFConnectionFuseki) builder.build();
-						connectionCreated = true;
-						queryExecution = conn.query(query);
-				}
-			} else {
-				queryExecution = QueryExecutionFactory.create(query, model);
-			}
-			if (queryExecution != null) {
-				resultSet = ResultSetFactory.copyResults(queryExecution.execSelect());
-				queryExecution.close();
-				return resultSet;
-			}
-
-		} catch (NullPointerException ex) {
-			System.out.println(ex.getMessage());
-			return null;
-		}finally {
-			if(connectionCreated)
-			{
-				conn.close();
-			}
-		}
-
-		return resultSet;
-	}
-
-	/**
-	 * @param filename the file name to be used while executing on the RDF dataset
-	 * @return It takes query string as its parameter and returns the result set after executing the query.
-	 */
-	public String fetchData(String filename) {
-		model = null;
-		String qString = "SELECT ?subject ?predicate ?object \n WHERE { ?subject ?predicate ?object }";
-		String returnValue = "";
-
-		try{
-			ResultSet resultSet = getResultFromQuery(qString, filename);
-			model = ModelFactory.createDefaultModel();
-			QuerySolution s;
-			Triple t;
-			while (resultSet.hasNext()) {
-				s = resultSet.nextSolution();
-				t = Triple.create(s.get("subject").asNode(), s.get("predicate").asNode(), s.get("object").asNode());
-				model.add(model.asStatement(t));
-			}
-			RDFDataMgr.loadModel(returnValue, Lang.JSONLD);
-		}
-		catch (Exception e)
-		{
-			System.out.println(e);
-		}
-
-		return returnValue;
-	}
-}
diff --git a/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java b/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
index 1b2605fbc..b7f56a462 100644
--- a/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
+++ b/ida-ws/src/main/java/upb/ida/provider/OntologyExplorerHandler.java
@@ -1,11 +1,12 @@
 package upb.ida.provider;
 
 import com.rivescript.macro.Subroutine;
+import org.json.simple.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import upb.ida.bean.ResponseBean;
 import upb.ida.constant.IDALiteral;
-import upb.ida.ontologyexplorer.OntologyExplorer;
+import upb.ida.dao.DataRepository;
 
 import java.util.Map;
 
@@ -14,16 +15,28 @@ public class OntologyExplorerHandler implements Subroutine {
 	@Autowired
 	private ResponseBean responseBean;
 
-	public String call (com.rivescript.RiveScript rs, String[] args) {
+	public String call(com.rivescript.RiveScript rs, String[] args) {
 
 		Map<String, Object> dataMap = responseBean.getPayload();
-		OntologyExplorer oe = new OntologyExplorer();
-		responseBean.setActnCode(11);
+		String datasetName = (String) dataMap.get("actvDs");
+
+		System.out.println("\n\nDataset name:\t" + datasetName);
+		System.out.println("\n\nDataset is empty?\t" + datasetName.isEmpty());
+
+		DataRepository dataRepository = new DataRepository(false);
+		responseBean.setActnCode(IDALiteral.UIA_ONTOLOGY);
 		try {
-			dataMap.put("ontologyData", oe.fetchData(args[0]));
-			responseBean.setPayload(dataMap);
-			return IDALiteral.RESP_PASS_ROUTINE;
-		} catch (Exception ex){
+			JSONObject ontologyData = dataRepository.getOntologyData(datasetName);
+			if (ontologyData != null) {
+				dataMap.put("ontologyData", ontologyData);
+				responseBean.setPayload(dataMap);
+				return IDALiteral.RESP_PASS_ROUTINE;
+			} else {
+				responseBean.setActnCode(IDALiteral.UIA_NOACTION);
+				responseBean.setPayload(null);
+				return IDALiteral.RESP_FAIL_ROUTINE;
+			}
+		} catch (Exception ex) {
 			System.out.println(ex.getMessage());
 		}
 		return IDALiteral.RESP_FAIL_ROUTINE;
diff --git a/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java b/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
index e2ea74572..0787fe74f 100644
--- a/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
+++ b/ida-ws/src/main/java/upb/ida/rest/MessageRestController.java
@@ -10,7 +10,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import upb.ida.bean.ResponseBean;
-import upb.ida.ontologyexplorer.OntologyExplorer;
 import upb.ida.service.DataService;
 import upb.ida.service.RiveScriptService;
 
@@ -72,16 +71,4 @@ public ResponseBean getDataTable(@RequestParam(value = "actvScrId") String actvS
 		return response;
 	}
 
-	@RequestMapping("/getOntologyData")
-	public ResponseBean getOntologyData(@RequestParam(value = "fileName") String fileName) throws Exception {
-		Map<String, Object> dataMap = new HashMap<>();
-		OntologyExplorer oe = new OntologyExplorer();
-		dataMap.put("actvScrId", "");
-		dataMap.put("actvTbl", "");
-		dataMap.put("actvDs", "");
-		dataMap.put("soldier", oe.fetchData(fileName));
-		response.setPayload(dataMap);
-		return response;
-	}
-
 }
diff --git a/ida-ws/src/main/resources/rivescript/ontology-explorer.rive b/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
index a9c32108b..7b730be66 100644
--- a/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
+++ b/ida-ws/src/main/resources/rivescript/ontology-explorer.rive
@@ -2,9 +2,9 @@
 
 //User queries for ontology
 
-+ i want a ontology explorer for *
-* <call>OntologyExplorerHandler "<star1>"</call> == pass => Your requested
-^ \sOntology explorer is now added to the main view
++ i want ontology explorer for current dataset
+* <call>OntologyExplorerHandler </call> == pass => Ontology explorer is now added to the main view
+- Ontology does not exist for current dataset!
 
-+ open * ontology
-@ i want a ontology explorer for <star>
++ open ontology explorer
+@ i want ontology explorer for current dataset

From a62c9ae48b02bce7dd5caf984523eb89d0abf144 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 19 Jan 2020 14:29:34 +0100
Subject: [PATCH 61/66] resolving "Codacy/PR Quality Review" issues.

---
 .../d3v4-rdf-ontology-graph-view.js           | 452 +++++++++---------
 1 file changed, 221 insertions(+), 231 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index fd5e1ab3e..ab92dd3fe 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -17,6 +17,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         literalRadius = customizeGraphArray.literalRadius;
 
     var g, link, linkTexts, node, circles, lables;
+    var i = 0;
     var svgClear = d3.select("#" + svgId);
     svgClear.selectAll("*").remove();
 
@@ -199,6 +200,214 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         return returnVaule;
     }
 
+    function dragstarted(d) {
+        if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+        d.fx = d.x;
+        d.fy = d.y;
+    }
+
+    function dragged(d) {
+        d.fx = d3.event.x;
+        d.fy = d3.event.y;
+    }
+
+    function dragended(d) {
+        if (!d3.event.active) simulation.alphaTarget(0);
+        d.fx = null;
+        d.fy = null;
+    }
+    
+    function update() {
+
+        simulation.restart();
+
+        simulation
+            .nodes(nodesArray)
+            .on("tick", ticked);
+
+        simulation.force("link")
+            .links(linksArray);
+
+
+        g = svg.append("g")
+            .attr("class", "everything");
+
+        link = g.selectAll("line")
+            .attr("class", "links")
+            .data(linksArray)
+            .enter().append("line")
+            .attr("class", "link")
+            .attr("stroke-width", 1)
+            .style("fill", "#999")
+            .attr("marker-end", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return "url(#subclass)";
+                }
+                return "url(#normal)";
+            })
+            .style("stroke-dasharray", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return ("3, 3");
+                }
+                if (labelStr.includes("subPropertyOf")) {
+                    return ("5, 5");
+                }
+                return ("0, 0");
+            });
+
+        link.exit().remove();
+        // ==================== Add Link Names =====================
+        linkTexts = g.selectAll(".link-text")
+            .data(linksArray)
+            .enter()
+            .append("text")
+            .attr("class", "link-text")
+            .text(function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return customizeGraphArray.subClassLabel;
+                }
+                return d.predicate;
+            })
+            .style("fill", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return customizeGraphArray.subClassLabelColor;
+                }
+                return customizeGraphArray.propertyTextColor;
+            })
+            .style("font-size", "80%")
+            .style("font-style", "italic")
+            .attr("x", 12)
+            .attr("y", 3)
+            ;
+
+
+        linkTexts.append("title")
+            .text(function (d) {
+                var labelStr = d.predicate;
+                var returnValue;
+
+                if (labelStr.includes("subClassOf")) {
+
+                    returnValue = "Source : " + d.source.id + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target.id;
+                } else {
+                    returnValue = "Source : " + d.source.id + "\nProperty : " + labelStr + "\nObject : " + d.target.id;
+                }
+
+                return returnValue;
+            });
+        // ==================== Add Link Names =====================
+
+        node = g.append("g")
+            .attr("class", "nodes")
+            .selectAll("g")
+            .data(nodesArray)
+            .enter().append("g");
+        node.exit().remove();
+
+        circles = node.append("circle")
+            .attr("id", function (d) {
+                return d.nodeId;
+            })
+            .attr("r", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return literalRadius;
+                }
+                return resourceRadius;
+            })
+            .style("fill", function (d) {
+                var labelStr = d.id;
+                var expandedNode = false;
+
+                if (!dispalyAllprop) {
+                    expandedNodesArray.forEach(function (val) {
+                        if (val === "#" + d.nodeId) {
+                            expandedNode = true;
+                        }
+                    });
+                }
+
+                if (expandedNode) {
+                    return "#8E44AD";
+                }
+                if (d.isLitteral) {
+                    return customizeGraphArray.literalNodeColor;
+                }
+                return customizeGraphArray.resourceNodeColor;
+            })
+            .call(d3.drag()
+                .on("start", dragstarted)
+                .on("drag", dragged)
+                .on("end", dragended)
+            );
+
+        lables = node.append("text")
+            .attr("class", "node-text")
+            .text(function (d) {
+                return d.id;
+            })
+            .style("font-size", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return "80%";
+                }
+                return "100%";
+            })
+            .style("font-style", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return "italic";
+                }
+                return "bold";
+            })
+            .style("fill", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return customizeGraphArray.literalNodeTextColor;
+                }
+                return customizeGraphArray.resourceNodeTextColor;
+            })
+            .attr("x", function (d) {
+                if (d.isLitteral) {
+                    return 8;
+                }
+                return 12;
+            })
+            .attr("y", 3);
+
+        node.append("title")
+            .text(function (d) {
+                var returnValue = "Node : " + d.id;
+                if (d.isLitteral) {
+                    returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
+                } else {
+                    returnValue = "Node : " + d.id;
+                }
+                return returnValue;
+            });
+
+        //START :: on double click
+        node.on("dblclick", doubleClickFunctionality);
+        //END :: on double click    
+
+        //START :: on  click
+        node.on("click", clickFuntionality);
+        //END :: on  click
+
+
+        if (!disableZoom) {
+
+            var zoomHandler = d3.zoom()
+                .on("zoom", zoomActions);
+
+            svg.call(zoomHandler).on("dblclick.zoom", null);
+        }
+
+    }
 
     //crating node function
     function createNewNode(tempSub, tempPred, tempObj, isLitteralVal, literalDataTypeVal) {
@@ -206,7 +415,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         var subNodeAdded = false;
         var objNodeAdded = false;
         var onDoubleClickNodesCreated = "";
-
+        var nodeValue = {};
         if (nodesArray === undefined) {
             undefVar = true;
         }
@@ -223,7 +432,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
 
         if (subNodeAdded === false) {
             circleIdIndex = circleIdIndex + 1;
-            var nodeValue = {
+            nodeValue = {
                 id: tempSub,
                 predicate: tempPred,
                 nodeId: "circleId" + circleIdIndex,
@@ -240,7 +449,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         }
         if (objNodeAdded === false) {
             circleIdIndex = circleIdIndex + 1;
-            var nodeValue = {
+            nodeValue = {
                 id: tempObj,
                 predicate: tempPred,
                 nodeId: "circleId" + circleIdIndex,
@@ -265,6 +474,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         tempObj = "?";
         pred = "---subClassOf---";
         tempDomainArray = [];
+        var tempDomainLabel;
         //START :: Nodes and Links creation for subClassOf
         if (displaySubclasses) {
             if (element["subClassOf"] === undefined) {
@@ -276,11 +486,6 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 if (Object.prototype.toString.call(element["subClassOf"]) === "[object Array]") {
                     element["subClassOf"].forEach(function (eachIds) {
                         tempObj = getLabel(displayDeustch, eachIds);
-                        /*if (tempObj === "noLabel") {
-                            tempLabelArray = eachIds["@id"].split("/");
-                            tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                            tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                        }*/
 
                         tripleValue = {
                             source: tempSub,
@@ -293,11 +498,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                     });
                 } else {
                     tempObj = getLabel(displayDeustch, element["subClassOf"]);
-                    /*if (tempObj === "noLabel") {
-                        tempLabelArray = element["subClassOf"]["@id"].split("/");
-                        tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
-                        tempObj = tempLabelArray1[tempLabelArray1.length - 1];
-                    }*/
+                    
                     tripleValue = {
                         source: tempSub,
                         predicate: pred,
@@ -411,7 +612,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         var idVal = "#" + d.nodeId;
         var clickedNodeLabel = d.id;
         var newlyCreatingLinkData = "";
-
+        
         if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
             expandedNodesArray.push(idVal);
 
@@ -563,7 +764,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             removeClikedNode = "";
             onDoubleClickedNewlyCreatedLinks.forEach(function (val) {
                 if (val.nodeClicked === idVal) {
-                    for (var i = 0; i < linksArray.length; i++) {
+                    for (i = 0; i < linksArray.length; i++) {
                         if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) {
                             linksArray.splice(i, 1);
                             i--;
@@ -574,7 +775,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
             });
 
-            for (var i = 0; i < onDoubleClickedNewlyCreatedLinks.length; i++) {
+            for (i = 0; i < onDoubleClickedNewlyCreatedLinks.length; i++) {
                 if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) {
                     onDoubleClickedNewlyCreatedLinks.splice(i, 1);
                     i--;
@@ -585,7 +786,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             removeClikedNode = "";
             onDoubleClickedNewlyCreatedNodes.forEach(function (val) {
                 if (val.nodeClicked === idVal) {
-                    for (var i = 0; i < nodesArray.length; i++) {
+                    for (i = 0; i < nodesArray.length; i++) {
                         if (nodesArray[i].id === val.nodeCreated.id) {
                             nodesArray.splice(i, 1);
                             i--;
@@ -595,14 +796,14 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
             });
 
-            for (var i = 0; i < onDoubleClickedNewlyCreatedNodes.length; i++) {
+            for (i = 0; i < onDoubleClickedNewlyCreatedNodes.length; i++) {
                 if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) {
                     onDoubleClickedNewlyCreatedNodes.splice(i, 1);
                     i--;
                 }
             }
 
-            for (var i = 0; i < expandedNodesArray.length; i++) {
+            for (i = 0; i < expandedNodesArray.length; i++) {
                 if (expandedNodesArray[i] === idVal) {
                     expandedNodesArray.splice(i, 1);
                     break;
@@ -855,197 +1056,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         g.attr("transform", d3.event.transform);
     }
 
-    function update() {
-
-        simulation.restart();
-
-        simulation
-            .nodes(nodesArray)
-            .on("tick", ticked);
-
-        simulation.force("link")
-            .links(linksArray);
-
-
-        g = svg.append("g")
-            .attr("class", "everything");
-
-        link = g.selectAll("line")
-            .attr("class", "links")
-            .data(linksArray)
-            .enter().append("line")
-            .attr("class", "link")
-            .attr("stroke-width", 1)
-            .style("fill", "#999")
-            .attr("marker-end", function (d) {
-                var labelStr = d.predicate;
-                if (labelStr.includes("subClassOf")) {
-                    return "url(#subclass)";
-                }
-                return "url(#normal)";
-            })
-            .style("stroke-dasharray", function (d) {
-                var labelStr = d.predicate;
-                if (labelStr.includes("subClassOf")) {
-                    return ("3, 3");
-                }
-                if (labelStr.includes("subPropertyOf")) {
-                    return ("5, 5");
-                }
-                return ("0, 0");
-            });
-
-        link.exit().remove();
-        // ==================== Add Link Names =====================
-        linkTexts = g.selectAll(".link-text")
-            .data(linksArray)
-            .enter()
-            .append("text")
-            .attr("class", "link-text")
-            .text(function (d) {
-                var labelStr = d.predicate;
-                if (labelStr.includes("subClassOf")) {
-                    return customizeGraphArray.subClassLabel;
-                }
-                return d.predicate;
-            })
-            .style("fill", function (d) {
-                var labelStr = d.predicate;
-                if (labelStr.includes("subClassOf")) {
-                    return customizeGraphArray.subClassLabelColor;
-                }
-                return customizeGraphArray.propertyTextColor;
-            })
-            .style("font-size", "80%")
-            .style("font-style", "italic")
-            .attr("x", 12)
-            .attr("y", 3)
-            ;
-
-
-        linkTexts.append("title")
-            .text(function (d) {
-                var labelStr = d.predicate;
-                var returnValue;
-
-                if (labelStr.includes("subClassOf")) {
-
-                    returnValue = "Source : " + d.source.id + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target.id;
-                } else {
-                    returnValue = "Source : " + d.source.id + "\nProperty : " + labelStr + "\nObject : " + d.target.id;
-                }
-
-                return returnValue;
-            });
-        // ==================== Add Link Names =====================
-
-        node = g.append("g")
-            .attr("class", "nodes")
-            .selectAll("g")
-            .data(nodesArray)
-            .enter().append("g");
-        node.exit().remove();
-
-        circles = node.append("circle")
-            .attr("id", function (d) {
-                return d.nodeId;
-            })
-            .attr("r", function (d) {
-                var labelStr = d.id;
-                if (d.isLitteral) {
-                    return literalRadius;
-                }
-                return resourceRadius;
-            })
-            .style("fill", function (d) {
-                var labelStr = d.id;
-                var expandedNode = false;
-
-                if (!dispalyAllprop) {
-                    expandedNodesArray.forEach(function (val) {
-                        if (val === "#" + d.nodeId) {
-                            expandedNode = true;
-                        }
-                    });
-                }
-
-                if (expandedNode) {
-                    return "#8E44AD";
-                }
-                if (d.isLitteral) {
-                    return customizeGraphArray.literalNodeColor;
-                }
-                return customizeGraphArray.resourceNodeColor;
-            })
-            .call(d3.drag()
-                .on("start", dragstarted)
-                .on("drag", dragged)
-                .on("end", dragended)
-            );
-
-        lables = node.append("text")
-            .attr("class", "node-text")
-            .text(function (d) {
-                return d.id;
-            })
-            .style("font-size", function (d) {
-                var labelStr = d.id;
-                if (d.isLitteral) {
-                    return "80%";
-                }
-                return "100%";
-            })
-            .style("font-style", function (d) {
-                var labelStr = d.id;
-                if (d.isLitteral) {
-                    return "italic";
-                }
-                return "bold";
-            })
-            .style("fill", function (d) {
-                var labelStr = d.id;
-                if (d.isLitteral) {
-                    return customizeGraphArray.literalNodeTextColor;
-                }
-                return customizeGraphArray.resourceNodeTextColor;
-            })
-            .attr("x", function (d) {
-                if (d.isLitteral) {
-                    return 8;
-                }
-                return 12;
-            })
-            .attr("y", 3);
-
-        node.append("title")
-            .text(function (d) {
-                var returnValue = "Node : " + d.id;
-                if (d.isLitteral) {
-                    returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
-                } else {
-                    returnValue = "Node : " + d.id;
-                }
-                return returnValue;
-            });
-
-        //START :: on double click
-        node.on("dblclick", doubleClickFunctionality);
-        //END :: on double click    
-
-        //START :: on  click
-        node.on("click", clickFuntionality);
-        //END :: on  click
-
-
-        if (!disableZoom) {
-
-            var zoomHandler = d3.zoom()
-                .on("zoom", zoomActions);
-
-            svg.call(zoomHandler).on("dblclick.zoom", null);
-        }
-
-    }
+    
 
     function ticked() {
         lables
@@ -1091,25 +1102,4 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     }
 
     update();
-
-
-    // });
-
-    function dragstarted(d) {
-        if (!d3.event.active) simulation.alphaTarget(0.3).restart();
-        d.fx = d.x;
-        d.fy = d.y;
-    }
-
-    function dragged(d) {
-        d.fx = d3.event.x;
-        d.fy = d3.event.y;
-    }
-
-    function dragended(d) {
-        if (!d3.event.active) simulation.alphaTarget(0);
-        d.fx = null;
-        d.fy = null;
-    }
-
 };

From f1b7a38e7509e5dccc878a67c9f5251c260955bf Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 19 Jan 2020 14:52:49 +0100
Subject: [PATCH 62/66] resolving "Codacy/PR Quality Review" issues.

---
 .../d3v4-rdf-ontology-graph-view.js           | 1500 ++++++++---------
 1 file changed, 750 insertions(+), 750 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index ab92dd3fe..5f03e83f2 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -11,6 +11,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     var onDoubleClickCreatingNodes = false;
     var nodeDoubleClicked = "";
     var undefVar = false;
+    var undefinedVarValue = undefined;
     var width = 1175,
         height = 1100,
         resourceRadius = customizeGraphArray.resourceRadius,
@@ -80,7 +81,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     // }
     //START :: get english and deutsch labels values into arrays
     data["@graph"].forEach(function (elem) {
-        if (elem["label"] === undefined) {
+        if (elem["label"] === undefinedVarValue) {
             tempLabelArray = elem["@id"].split("/");
             tempLabelArray1 = tempLabelArray[tempLabelArray.length - 1].split(":");
             tempLabel = tempLabelArray1[tempLabelArray1.length - 1];
@@ -201,7 +202,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     }
 
     function dragstarted(d) {
-        if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+        if (!d3.event.active) { simulation.alphaTarget(0.3).restart();}
         d.fx = d.x;
         d.fy = d.y;
     }
@@ -212,894 +213,893 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     }
 
     function dragended(d) {
-        if (!d3.event.active) simulation.alphaTarget(0);
+        if (!d3.event.active) {simulation.alphaTarget(0);}
         d.fx = null;
         d.fy = null;
     }
-    
-    function update() {
-
-        simulation.restart();
-
-        simulation
-            .nodes(nodesArray)
-            .on("tick", ticked);
-
-        simulation.force("link")
-            .links(linksArray);
-
-
-        g = svg.append("g")
-            .attr("class", "everything");
 
-        link = g.selectAll("line")
-            .attr("class", "links")
-            .data(linksArray)
-            .enter().append("line")
-            .attr("class", "link")
-            .attr("stroke-width", 1)
-            .style("fill", "#999")
-            .attr("marker-end", function (d) {
-                var labelStr = d.predicate;
-                if (labelStr.includes("subClassOf")) {
-                    return "url(#subclass)";
-                }
-                return "url(#normal)";
+    function ticked() {
+        lables
+            .attr("x2", function (d) {
+                return d.x - width;
             })
-            .style("stroke-dasharray", function (d) {
-                var labelStr = d.predicate;
-                if (labelStr.includes("subClassOf")) {
-                    return ("3, 3");
-                }
-                if (labelStr.includes("subPropertyOf")) {
-                    return ("5, 5");
-                }
-                return ("0, 0");
+            .attr("y2", function (d) {
+                return d.y - height;
             });
-
-        link.exit().remove();
-        // ==================== Add Link Names =====================
-        linkTexts = g.selectAll(".link-text")
-            .data(linksArray)
-            .enter()
-            .append("text")
-            .attr("class", "link-text")
-            .text(function (d) {
-                var labelStr = d.predicate;
-                if (labelStr.includes("subClassOf")) {
-                    return customizeGraphArray.subClassLabel;
-                }
-                return d.predicate;
+        link
+            .attr("x1", function (d) {
+                return d.source.x;
             })
-            .style("fill", function (d) {
-                var labelStr = d.predicate;
-                if (labelStr.includes("subClassOf")) {
-                    return customizeGraphArray.subClassLabelColor;
-                }
-                return customizeGraphArray.propertyTextColor;
+            .attr("y1", function (d) {
+                return d.source.y;
             })
-            .style("font-size", "80%")
-            .style("font-style", "italic")
-            .attr("x", 12)
-            .attr("y", 3)
-            ;
+            .attr("x2", function (d) {
+                return d.target.x;
+            })
+            .attr("y2", function (d) {
+                return d.target.y;
+            });
+        linkTexts
+            .attr("x", function (d) {
+                return 4 + (d.source.x + d.target.x) / 2;
+            })
+            .attr("y", function (d) {
+                return 4 + (d.source.y + d.target.y) / 2;
+            });
+        node
+            .attr("transform", function (d) {
+                return "translate(" + d.x + "," + d.y + ")";
+            });
+        if (applyNodesBoundary) {
+            node
+                .attr("cx", function (d) {
+                    return d.x = Math.max(Math.max(resourceRadius, literalRadius), Math.min(width - Math.max(resourceRadius, literalRadius), d.x));
+                })
+                .attr("cy", function (d) {
+                    return d.y = Math.max(Math.max(resourceRadius, literalRadius), Math.min(height - Math.max(resourceRadius, literalRadius), d.y));
+                });
+        }
+    }
 
+    function doubleClickFunctionality(d) {
+        var idVal = "#" + d.nodeId;
+        var clickedNodeLabel = d.id;
+        var newlyCreatingLinkData = "";
+        var allClear;
+        
+        if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
+            expandedNodesArray.push(idVal);
 
-        linkTexts.append("title")
-            .text(function (d) {
-                var labelStr = d.predicate;
-                var returnValue;
 
-                if (labelStr.includes("subClassOf")) {
+            d3.select(idVal)
+                .attr("r", resourceRadius + 4)
+                .style("fill", customizeGraphArray.onClickNodeColor);
 
-                    returnValue = "Source : " + d.source.id + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target.id;
-                } else {
-                    returnValue = "Source : " + d.source.id + "\nProperty : " + labelStr + "\nObject : " + d.target.id;
-                }
+            var tempSub = "?";
+            var tempPred = "?";
+            var tempObj = "?";
+            var pred = "---subClassOf---";
+            var tempDomainArray = [];
+            var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue, removeClikedNode;
 
-                return returnValue;
-            });
-        // ==================== Add Link Names =====================
+            onDoubleClickCreatingNodes = true;
+            nodeDoubleClicked = idVal;
 
-        node = g.append("g")
-            .attr("class", "nodes")
-            .selectAll("g")
-            .data(nodesArray)
-            .enter().append("g");
-        node.exit().remove();
+            data["@graph"].forEach(function (element) {
+                tempSub = "?";
+                tempPred = "?";
+                tempObj = "?";
+                pred = "---subClassOf---";
+                tempDomainArray = [];
 
-        circles = node.append("circle")
-            .attr("id", function (d) {
-                return d.nodeId;
-            })
-            .attr("r", function (d) {
-                var labelStr = d.id;
-                if (d.isLitteral) {
-                    return literalRadius;
+                includeThis = false;
+                //START :: Nodes and Links creation for all Properties
+                //get the subject label  
+                if (element["domain"] === undefinedVarValue) {
+                    undefVar = true;
                 }
-                return resourceRadius;
-            })
-            .style("fill", function (d) {
-                var labelStr = d.id;
-                var expandedNode = false;
+                else {
+                    if (Object.prototype.toString.call(element["domain"]) === "[object Array]") {
+                        element["domain"].forEach(function (eachIds) {
+                            tempDomainLabel = getLabel(displayDeustch, eachIds);
 
-                if (!dispalyAllprop) {
-                    expandedNodesArray.forEach(function (val) {
-                        if (val === "#" + d.nodeId) {
-                            expandedNode = true;
+                            if (clickedNodeLabel === tempDomainLabel) {
+                                includeThis = true;
+                                tempDomainArray.push(tempDomainLabel);
+                            }
+
+                        });
+                    } else {
+                        tempSub = getLabel(displayDeustch, element["domain"]);
+
+                        if (clickedNodeLabel === tempSub) {
+                            includeThis = true;
                         }
-                    });
+                    }
                 }
 
-                if (expandedNode) {
-                    return "#8E44AD";
-                }
-                if (d.isLitteral) {
-                    return customizeGraphArray.literalNodeColor;
-                }
-                return customizeGraphArray.resourceNodeColor;
-            })
-            .call(d3.drag()
-                .on("start", dragstarted)
-                .on("drag", dragged)
-                .on("end", dragended)
-            );
+                if (includeThis) {
+                    //get the predicate
+                    if (element["domain"] === undefinedVarValue) {
+                        undefVar = true;
+                    }
+                    else {
+                        tempPred = getLabel(displayDeustch, element["@id"]);
+                    }
 
-        lables = node.append("text")
-            .attr("class", "node-text")
-            .text(function (d) {
-                return d.id;
-            })
-            .style("font-size", function (d) {
-                var labelStr = d.id;
-                if (d.isLitteral) {
-                    return "80%";
-                }
-                return "100%";
-            })
-            .style("font-style", function (d) {
-                var labelStr = d.id;
-                if (d.isLitteral) {
-                    return "italic";
-                }
-                return "bold";
-            })
-            .style("fill", function (d) {
-                var labelStr = d.id;
-                if (d.isLitteral) {
-                    return customizeGraphArray.literalNodeTextColor;
-                }
-                return customizeGraphArray.resourceNodeTextColor;
-            })
-            .attr("x", function (d) {
-                if (d.isLitteral) {
-                    return 8;
-                }
-                return 12;
-            })
-            .attr("y", 3);
+                    //get the object  range
+                    if (element["range"] === undefinedVarValue) {
+                        undefVar = true;
+                    }
+                    else {
+                        tempObj = getLabel(displayDeustch, element["range"]);
+                    }
 
-        node.append("title")
-            .text(function (d) {
-                var returnValue = "Node : " + d.id;
-                if (d.isLitteral) {
-                    returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
-                } else {
-                    returnValue = "Node : " + d.id;
+                    isLitteral = false;
+                    literalDataType = tempObj;
+
+                    if (tempObj.toLowerCase().includes("xsd:")) {
+                        tempObj = tempObj + literalIndex;
+                        literalIndex = literalIndex + 1;
+                        isLitteral = true;
+                    }
+
+                    if (!tempDomainArray.length === 0) {
+                        tempDomainArray.forEach(function (el) {
+                            if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
+                                if (isLitteral) {
+                                    tripleValue = {
+                                        source: el,
+                                        predicate: tempPred,
+                                        target: tempObj,
+                                        value: 1
+                                    };
+                                    linksArray.push(tripleValue);
+                                    newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
+                                    onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
+                                    createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
+                                } else {
+                                    tripleValue = {
+                                        source: el,
+                                        predicate: tempPred,
+                                        target: tempObj,
+                                        value: 1
+                                    };
+                                    linksArray.push(tripleValue);
+                                    newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
+                                    onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
+                                    createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
+                                }
+                            }
+                        });
+                    } else {
+                        if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
+                            if (isLitteral) {
+                                tripleValue = {
+                                    source: tempSub,
+                                    predicate: " ",
+                                    target: tempPred,
+                                    value: 1
+                                };
+                                linksArray.push(tripleValue);
+                                newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
+                                onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
+                                createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
+                            } else {
+                                tripleValue = {
+                                    source: tempSub,
+                                    predicate: tempPred,
+                                    target: tempObj,
+                                    value: 1
+                                };
+                                linksArray.push(tripleValue);
+                                newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
+                                onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
+                                createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
+                            }
+                        }
+                    }
                 }
-                return returnValue;
+                //END :: Nodes and Links creation for all Properties
             });
 
-        //START :: on double click
-        node.on("dblclick", doubleClickFunctionality);
-        //END :: on double click    
 
-        //START :: on  click
-        node.on("click", clickFuntionality);
-        //END :: on  click
+            onDoubleClickCreatingNodes = false;
 
+            allClear = d3.selectAll(".everything");
+            allClear.selectAll("*").remove();
 
-        if (!disableZoom) {
+            update();
+            simulation.restart();
 
-            var zoomHandler = d3.zoom()
-                .on("zoom", zoomActions);
 
-            svg.call(zoomHandler).on("dblclick.zoom", null);
         }
+        else if (expandedNodesArray.includes(idVal)) {
+            removeClikedNode = "";
+            onDoubleClickedNewlyCreatedLinks.forEach(function (val) {
+                if (val.nodeClicked === idVal) {
+                    for (i = 0; i < linksArray.length; i++) {
+                        if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) {
+                            linksArray.splice(i, 1);
+                            i--;
+                        }
+                    }
+                    removeClikedNode = val.nodeClicked;
 
-    }
+                }
+            });
 
-    //crating node function
-    function createNewNode(tempSub, tempPred, tempObj, isLitteralVal, literalDataTypeVal) {
-        //START :: Node creation
-        var subNodeAdded = false;
-        var objNodeAdded = false;
-        var onDoubleClickNodesCreated = "";
-        var nodeValue = {};
-        if (nodesArray === undefined) {
-            undefVar = true;
-        }
-        else {
-            nodesArray.forEach(function (elem) {
-                if (elem["id"] === tempSub) {
-                    subNodeAdded = true;
+            for (i = 0; i < onDoubleClickedNewlyCreatedLinks.length; i++) {
+                if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) {
+                    onDoubleClickedNewlyCreatedLinks.splice(i, 1);
+                    i--;
                 }
-                if (elem["id"] === tempObj) {
-                    objNodeAdded = true;
+            }
+
+
+            removeClikedNode = "";
+            onDoubleClickedNewlyCreatedNodes.forEach(function (val) {
+                if (val.nodeClicked === idVal) {
+                    for (i = 0; i < nodesArray.length; i++) {
+                        if (nodesArray[i].id === val.nodeCreated.id) {
+                            nodesArray.splice(i, 1);
+                            i--;
+                        }
+                    }
+                    removeClikedNode = val.nodeClicked;
                 }
             });
-        }
 
-        if (subNodeAdded === false) {
-            circleIdIndex = circleIdIndex + 1;
-            nodeValue = {
-                id: tempSub,
-                predicate: tempPred,
-                nodeId: "circleId" + circleIdIndex,
-                isLitteral: false,
-                literalDataType: literalDataTypeVal,
-                group: 1
-            };
-            nodesArray.push(nodeValue);
+            for (i = 0; i < onDoubleClickedNewlyCreatedNodes.length; i++) {
+                if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) {
+                    onDoubleClickedNewlyCreatedNodes.splice(i, 1);
+                    i--;
+                }
+            }
 
-            if (onDoubleClickCreatingNodes) {
-                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
-                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
+            for (i = 0; i < expandedNodesArray.length; i++) {
+                if (expandedNodesArray[i] === idVal) {
+                    expandedNodesArray.splice(i, 1);
+                    break;
+                }
             }
+            allClear = d3.selectAll(".everything");
+            allClear.selectAll("*").remove();
+
+            update();
+            simulation.restart();
+
         }
-        if (objNodeAdded === false) {
-            circleIdIndex = circleIdIndex + 1;
-            nodeValue = {
-                id: tempObj,
-                predicate: tempPred,
-                nodeId: "circleId" + circleIdIndex,
-                isLitteral: isLitteralVal,
-                literalDataType: literalDataTypeVal,
-                group: 1
-            };
-            nodesArray.push(nodeValue);
-            if (onDoubleClickCreatingNodes) {
-                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
-                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
+    }
+
+    function clickFuntionality(d) {
+        var nodeIdVal = d.id;
+        var tempNodeContains = [];
+        nodeContents.forEach(function (val) {
+            if (val.label === nodeIdVal) {
+                tempNodeContains = val.contents;
             }
-        }
-        //END :: Node creation
-    }
+        });
 
-    //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
+        var tempNode = d3.select("#" + idsArray.nodeId);
+        tempNode.selectAll("*").remove();
+        tempNode.append("text")
+            .text(" " + nodeIdVal + "\n")
+            .style("font-style", "italic")
+            .style("font-size", "80%")
+            .style("position", "relative")
+            .style("bottom", "2px");
 
-    data["@graph"].forEach(function (element) {
-        tempSub = "?";
-        tempPred = "?";
-        tempObj = "?";
-        pred = "---subClassOf---";
-        tempDomainArray = [];
-        var tempDomainLabel;
-        //START :: Nodes and Links creation for subClassOf
-        if (displaySubclasses) {
-            if (element["subClassOf"] === undefined) {
+
+        //node label on double click
+        if (tempNodeContains !== undefinedVarValue) {
+            var nodeLabel = d3.select("#" + idsArray.nodeLabelId);
+            nodeLabel.selectAll("*").remove();
+            if (tempNodeContains["label"] === undefinedVarValue) {
                 undefVar = true;
-            }
-            else {
-                tempSub = getLabel(displayDeustch, element["@id"]);
+            } else {
+                if (Object.prototype.toString.call(tempNodeContains["label"]) === "[object Array]") {
+                    tempNodeContains["label"].forEach(function (eachIds) {
+                        if (eachIds["@language"] === "de" && displayDeustch) {
 
-                if (Object.prototype.toString.call(element["subClassOf"]) === "[object Array]") {
-                    element["subClassOf"].forEach(function (eachIds) {
-                        tempObj = getLabel(displayDeustch, eachIds);
+                            nodeLabel.append("text")
+                                .text(" " + eachIds["@value"] + "\n")
+                                .style("font-style", "italic")
+                                .style("font-size", "80%")
+                                .style("position", "relative")
+                                .style("bottom", "2px");
+                        } else if (eachIds["@language"] === "en" && !displayDeustch) {
+                            nodeLabel.append("text")
+                                .text(" " + eachIds["@value"] + "\n")
+                                .style("font-style", "italic")
+                                .style("font-size", "80%")
+                                .style("position", "relative")
+                                .style("bottom", "2px");
+                        }
 
-                        tripleValue = {
-                            source: tempSub,
-                            predicate: pred,
-                            target: tempObj,
-                            value: 1
-                        };
-                        linksArray.push(tripleValue);
-                        createNewNode(tempSub, pred, tempObj, false, "");
                     });
                 } else {
-                    tempObj = getLabel(displayDeustch, element["subClassOf"]);
-                    
-                    tripleValue = {
-                        source: tempSub,
-                        predicate: pred,
-                        target: tempObj,
-                        value: 1
-                    };
-                    linksArray.push(tripleValue);
-
-                    createNewNode(tempSub, pred, tempObj, false, " ");
+                    nodeLabel.append("text")
+                        .text(" " + tempNodeContains["label"]["@value"] + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
                 }
             }
-        }
-        //END :: Nodes and Links creation for subClassOf
 
-        //START :: Nodes and Links creation for all Properties
-        if (dispalyAllprop) {
-            //get the subject label  
-            if (element["domain"] === undefined) {
+            //node id on double click
+            var nodeID = d3.select("#" + idsArray.nodeIdsId);
+            nodeID.selectAll("*").remove();
+            if (tempNodeContains["@id"] === undefinedVarValue) {
                 undefVar = true;
+            } else {
+                nodeID.append("text")
+                    .text(" " + tempNodeContains["@id"] + "\n")
+                    .style("font-style", "italic")
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
             }
-            else {
-                if (Object.prototype.toString.call(element["domain"]) === "[object Array]") {
-                    element["domain"].forEach(function (eachIds) {
-                        tempDomainLabel = getLabel(displayDeustch, eachIds);
-                        tempDomainArray.push(tempDomainLabel);
+            //node type on double click
+            var nodeType = d3.select("#" + idsArray.nodeTypeId);
+            nodeType.selectAll("*").remove();
+            if (tempNodeContains["@type"] === undefinedVarValue) {
+                undefVar = true;
+            } else {
+                nodeType.append("text")
+                    .text(" " + tempNodeContains["@type"] + "\n\n")
+                    .style("font-style", "italic")
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
+            }
+
+            //node description on double click
+            var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
+            nodeDescription.selectAll("*").remove();
+            if (tempNodeContains["description"] === undefinedVarValue) {
+                undefVar = true;
+            } else {
+                if (Object.prototype.toString.call(tempNodeContains["description"]) === "[object Array]") {
+                    tempNodeContains["description"].forEach(function (eachIds) {
+                        if (eachIds["@language"] === "de" && displayDeustch) {
+
+                            nodeDescription.append("text")
+                                .text(" " + eachIds["@value"] + "\n")
+                                .style("font-style", "italic")
+                                .style("font-size", "80%")
+                                .style("position", "relative")
+                                .style("bottom", "2px");
+                        } else if (eachIds["@language"] === "en" && !displayDeustch) {
+                            nodeDescription.append("text")
+                                .text(" " + eachIds["@value"] + "\n")
+                                .style("font-style", "italic")
+                                .style("font-size", "80%")
+                                .style("position", "relative")
+                                .style("bottom", "2px");
+                        }
+
                     });
                 } else {
-                    tempSub = getLabel(displayDeustch, element["domain"]);
+                    nodeDescription.append("text")
+                        .text(" " + tempNodeContains["description"]["@value"] + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
                 }
             }
 
-            //get the predicate
-            if (element["domain"] === undefined) {
+            var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
+            nodeSubClass.selectAll("*").remove();
+            if (tempNodeContains["subClassOf"] === undefinedVarValue) {
                 undefVar = true;
-            }
-            else {
-                tempPred = getLabel(displayDeustch, element["@id"]);
-            }
+            } else {
+                if (Object.prototype.toString.call(tempNodeContains["subClassOf"]) === "[object Array]") {
+                    var tempIndexSubClassof = 1;
+                    tempNodeContains["subClassOf"].forEach(function (eachIds) {
+                        var subClassLabel = getLabel(displayDeustch, eachIds);
 
+                        nodeSubClass.append("text")
+                            .text(" " + tempIndexSubClassof + ". " + subClassLabel + "\n")
+                            .style("font-style", "italic")
+                            .style("font-size", "80%")
+                            .style("position", "relative")
+                            .style("bottom", "2px");
 
-            //get the object  range
-            if (element["range"] === undefined) {
-                undefVar = true;
-            }
-            else {
-                tempObj = getLabel(displayDeustch, element["range"]);
-            }
+                        tempIndexSubClassof = tempIndexSubClassof + 1;
 
-            isLitteral = false;
-            literalDataType = tempObj;
+                    });
+                } else {
+                    var subClassLabel = getLabel(displayDeustch, tempNodeContains["subClassOf"]);
 
-            if (tempObj.toLowerCase().includes("xsd:")) {
-                tempObj = tempObj + literalIndex;
-                literalIndex = literalIndex + 1;
-                isLitteral = true;
+                    nodeSubClass.append("text")
+                        .text(" " + subClassLabel + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
+                }
             }
 
-            if (tempDomainArray.length !== 0) {
-                tempDomainArray.forEach(function (el) {
-                    if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
-                        if (isLitteral) {
-                            tripleValue = {
-                                source: el,
-                                predicate: tempPred,
-                                target: tempObj,
-                                value: 1
-                            };
-                            linksArray.push(tripleValue);
-                            createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
-                        } else {
-                            tripleValue = {
-                                source: el,
-                                predicate: tempPred,
-                                target: tempObj,
-                                value: 1
-                            };
-                            linksArray.push(tripleValue);
-                            createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
-                        }
-                    }
-                });
+            var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
+            nodeDomain.selectAll("*").remove();
+            if (tempNodeContains["domain"] === undefinedVarValue) {
+                undefVar = true;
             } else {
-                if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
-                    if (isLitteral) {
-                        tripleValue = {
-                            source: tempSub,
-                            predicate: "",
-                            target: tempPred,
-                            value: 1
-                        };
-                        linksArray.push(tripleValue);
-                        createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
-                    } else {
-                        tripleValue = {
-                            source: tempSub,
-                            predicate: tempPred,
-                            target: tempObj,
-                            value: 1
-                        };
-                        linksArray.push(tripleValue);
-                        createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
-                    }
-                }
-            }
-        }
-        //END :: Nodes and Links creation for all Properties
-    });
-    //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
+                if (Object.prototype.toString.call(tempNodeContains["domain"]) === "[object Array]") {
+                    var tempIndexdomain = 1;
+                    tempNodeContains["domain"].forEach(function (eachIds) {
+                        var domainLabel = getLabel(displayDeustch, eachIds);
+
+                        nodeDomain.append("text")
+                            .text(" " + tempIndexdomain + ". " + domainLabel + "\n")
+                            .style("font-style", "italic")
+                            .style("font-size", "80%")
+                            .style("position", "relative")
+                            .style("bottom", "2px");
+
+                        tempIndexdomain = tempIndexdomain + 1;
+
+                    });
+                } else {
+                    var domainLabel = getLabel(displayDeustch, tempNodeContains["domain"]);
+
+                    nodeDomain.append("text")
+                        .text(" " + domainLabel + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
+                }
+            }
 
-    function doubleClickFunctionality(d) {
-        var idVal = "#" + d.nodeId;
-        var clickedNodeLabel = d.id;
-        var newlyCreatingLinkData = "";
-        
-        if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
-            expandedNodesArray.push(idVal);
 
 
-            d3.select(idVal)
-                .attr("r", resourceRadius + 4)
-                .style("fill", customizeGraphArray.onClickNodeColor);
+            var nodeRange = d3.select("#" + idsArray.nodeRangeId)
+            nodeRange.selectAll("*").remove();
+            if (tempNodeContains["range"] === undefinedVarValue) {
+                undefVar = true;
+            } else {
+                if (Object.prototype.toString.call(tempNodeContains["range"]) === "[object Array]") {
+                    var tempIndexRange = 1;
+                    tempNodeContains["range"].forEach(function (eachIds) {
+                        var rangeLabel = getLabel(displayDeustch, eachIds);
 
-            var tempSub = "?";
-            var tempPred = "?";
-            var tempObj = "?";
-            var pred = "---subClassOf---";
-            var tempDomainArray = [];
-            var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue, removeClikedNode;
+                        nodeRange.append("text")
+                            .text(" " + tempIndexRange + ". " + rangeLabel + "\n")
+                            .style("font-style", "italic")
+                            .style("font-size", "80%")
+                            .style("position", "relative")
+                            .style("bottom", "2px");
 
-            onDoubleClickCreatingNodes = true;
-            nodeDoubleClicked = idVal;
+                        tempIndexRange = tempIndexRange + 1;
 
-            data["@graph"].forEach(function (element) {
-                tempSub = "?";
-                tempPred = "?";
-                tempObj = "?";
-                pred = "---subClassOf---";
-                tempDomainArray = [];
+                    });
+                } else {
+                    var rangeLabel = getLabel(displayDeustch, tempNodeContains["range"]);
 
-                includeThis = false;
-                //START :: Nodes and Links creation for all Properties
-                //get the subject label  
-                if (element["domain"] === undefined) {
-                    undefVar = true;
+                    nodeRange.append("text")
+                        .text(" " + rangeLabel + "\n")
+                        .style("font-style", "italic")
+                        .style("font-size", "80%")
+                        .style("position", "relative")
+                        .style("bottom", "2px");
                 }
-                else {
-                    if (Object.prototype.toString.call(element["domain"]) === "[object Array]") {
-                        element["domain"].forEach(function (eachIds) {
-                            tempDomainLabel = getLabel(displayDeustch, eachIds);
+            }
 
-                            if (clickedNodeLabel === tempDomainLabel) {
-                                includeThis = true;
-                                tempDomainArray.push(tempDomainLabel);
-                            }
+            var nodeComment = d3.select("#" + idsArray.nodeCommentId)
+            nodeComment.selectAll("*").remove();
+            if (tempNodeContains["comment"] === undefinedVarValue) {
+                undefVar = true;
+            }
+            else {
+                nodeComment.append("text")
+                    .text(tempNodeContains["comment"] + "\n")
+                    .style("font-style", "italic")
+                    .style("font-size", "80%")
+                    .style("position", "relative")
+                    .style("bottom", "2px");
+            }
+        }
 
-                        });
-                    } else {
-                        tempSub = getLabel(displayDeustch, element["domain"]);
+    }
 
-                        if (clickedNodeLabel === tempSub) {
-                            includeThis = true;
-                        }
-                    }
-                }
+    function zoomActions() {
+        g.attr("transform", d3.event.transform);
+    }
 
-                if (includeThis) {
-                    //get the predicate
-                    if (element["domain"] === undefined) {
-                        undefVar = true;
-                    }
-                    else {
-                        tempPred = getLabel(displayDeustch, element["@id"]);
-                    }
+    function update() {
 
-                    //get the object  range
-                    if (element["range"] === undefined) {
-                        undefVar = true;
-                    }
-                    else {
-                        tempObj = getLabel(displayDeustch, element["range"]);
-                    }
+        simulation.restart();
 
-                    isLitteral = false;
-                    literalDataType = tempObj;
+        simulation
+            .nodes(nodesArray)
+            .on("tick", ticked);
 
-                    if (tempObj.toLowerCase().includes("xsd:")) {
-                        tempObj = tempObj + literalIndex;
-                        literalIndex = literalIndex + 1;
-                        isLitteral = true;
-                    }
+        simulation.force("link")
+            .links(linksArray);
 
-                    if (!tempDomainArray.length === 0) {
-                        tempDomainArray.forEach(function (el) {
-                            if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
-                                if (isLitteral) {
-                                    tripleValue = {
-                                        source: el,
-                                        predicate: tempPred,
-                                        target: tempObj,
-                                        value: 1
-                                    };
-                                    linksArray.push(tripleValue);
-                                    newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
-                                    onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
-                                    createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
-                                } else {
-                                    tripleValue = {
-                                        source: el,
-                                        predicate: tempPred,
-                                        target: tempObj,
-                                        value: 1
-                                    };
-                                    linksArray.push(tripleValue);
-                                    newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
-                                    onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
-                                    createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
-                                }
-                            }
-                        });
-                    } else {
-                        if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
-                            if (isLitteral) {
-                                tripleValue = {
-                                    source: tempSub,
-                                    predicate: " ",
-                                    target: tempPred,
-                                    value: 1
-                                };
-                                linksArray.push(tripleValue);
-                                newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
-                                onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
-                                createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
-                            } else {
-                                tripleValue = {
-                                    source: tempSub,
-                                    predicate: tempPred,
-                                    target: tempObj,
-                                    value: 1
-                                };
-                                linksArray.push(tripleValue);
-                                newlyCreatingLinkData = { nodeClicked: idVal, link: tripleValue };
-                                onDoubleClickedNewlyCreatedLinks.push(newlyCreatingLinkData);
-                                createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
-                            }
-                        }
-                    }
+
+        g = svg.append("g")
+            .attr("class", "everything");
+
+        link = g.selectAll("line")
+            .attr("class", "links")
+            .data(linksArray)
+            .enter().append("line")
+            .attr("class", "link")
+            .attr("stroke-width", 1)
+            .style("fill", "#999")
+            .attr("marker-end", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return "url(#subclass)";
                 }
-                //END :: Nodes and Links creation for all Properties
+                return "url(#normal)";
+            })
+            .style("stroke-dasharray", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return ("3, 3");
+                }
+                if (labelStr.includes("subPropertyOf")) {
+                    return ("5, 5");
+                }
+                return ("0, 0");
             });
 
+        link.exit().remove();
+        // ==================== Add Link Names =====================
+        linkTexts = g.selectAll(".link-text")
+            .data(linksArray)
+            .enter()
+            .append("text")
+            .attr("class", "link-text")
+            .text(function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return customizeGraphArray.subClassLabel;
+                }
+                return d.predicate;
+            })
+            .style("fill", function (d) {
+                var labelStr = d.predicate;
+                if (labelStr.includes("subClassOf")) {
+                    return customizeGraphArray.subClassLabelColor;
+                }
+                return customizeGraphArray.propertyTextColor;
+            })
+            .style("font-size", "80%")
+            .style("font-style", "italic")
+            .attr("x", 12)
+            .attr("y", 3)
+            ;
+
 
-            onDoubleClickCreatingNodes = false;
+        linkTexts.append("title")
+            .text(function (d) {
+                var labelStr = d.predicate;
+                var returnValue;
 
-            var allClear = d3.selectAll(".everything");
-            allClear.selectAll("*").remove();
+                if (labelStr.includes("subClassOf")) {
 
-            update();
-            simulation.restart();
+                    returnValue = "Source : " + d.source.id + "\nProperty : " + customizeGraphArray.subClassLabel + "\nObject : " + d.target.id;
+                } else {
+                    returnValue = "Source : " + d.source.id + "\nProperty : " + labelStr + "\nObject : " + d.target.id;
+                }
 
+                return returnValue;
+            });
+        // ==================== Add Link Names =====================
 
-        }
-        else if (expandedNodesArray.includes(idVal)) {
-            removeClikedNode = "";
-            onDoubleClickedNewlyCreatedLinks.forEach(function (val) {
-                if (val.nodeClicked === idVal) {
-                    for (i = 0; i < linksArray.length; i++) {
-                        if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) {
-                            linksArray.splice(i, 1);
-                            i--;
-                        }
-                    }
-                    removeClikedNode = val.nodeClicked;
+        node = g.append("g")
+            .attr("class", "nodes")
+            .selectAll("g")
+            .data(nodesArray)
+            .enter().append("g");
+        node.exit().remove();
 
+        circles = node.append("circle")
+            .attr("id", function (d) {
+                return d.nodeId;
+            })
+            .attr("r", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return literalRadius;
                 }
-            });
+                return resourceRadius;
+            })
+            .style("fill", function (d) {
+                var labelStr = d.id;
+                var expandedNode = false;
 
-            for (i = 0; i < onDoubleClickedNewlyCreatedLinks.length; i++) {
-                if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) {
-                    onDoubleClickedNewlyCreatedLinks.splice(i, 1);
-                    i--;
+                if (!dispalyAllprop) {
+                    expandedNodesArray.forEach(function (val) {
+                        if (val === "#" + d.nodeId) {
+                            expandedNode = true;
+                        }
+                    });
                 }
-            }
 
-
-            removeClikedNode = "";
-            onDoubleClickedNewlyCreatedNodes.forEach(function (val) {
-                if (val.nodeClicked === idVal) {
-                    for (i = 0; i < nodesArray.length; i++) {
-                        if (nodesArray[i].id === val.nodeCreated.id) {
-                            nodesArray.splice(i, 1);
-                            i--;
-                        }
-                    }
-                    removeClikedNode = val.nodeClicked;
+                if (expandedNode) {
+                    return "#8E44AD";
                 }
-            });
+                if (d.isLitteral) {
+                    return customizeGraphArray.literalNodeColor;
+                }
+                return customizeGraphArray.resourceNodeColor;
+            })
+            .call(d3.drag()
+                .on("start", dragstarted)
+                .on("drag", dragged)
+                .on("end", dragended)
+            );
 
-            for (i = 0; i < onDoubleClickedNewlyCreatedNodes.length; i++) {
-                if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) {
-                    onDoubleClickedNewlyCreatedNodes.splice(i, 1);
-                    i--;
+        lables = node.append("text")
+            .attr("class", "node-text")
+            .text(function (d) {
+                return d.id;
+            })
+            .style("font-size", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return "80%";
                 }
-            }
+                return "100%";
+            })
+            .style("font-style", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return "italic";
+                }
+                return "bold";
+            })
+            .style("fill", function (d) {
+                var labelStr = d.id;
+                if (d.isLitteral) {
+                    return customizeGraphArray.literalNodeTextColor;
+                }
+                return customizeGraphArray.resourceNodeTextColor;
+            })
+            .attr("x", function (d) {
+                if (d.isLitteral) {
+                    return 8;
+                }
+                return 12;
+            })
+            .attr("y", 3);
 
-            for (i = 0; i < expandedNodesArray.length; i++) {
-                if (expandedNodesArray[i] === idVal) {
-                    expandedNodesArray.splice(i, 1);
-                    break;
+        node.append("title")
+            .text(function (d) {
+                var returnValue = "Node : " + d.id;
+                if (d.isLitteral) {
+                    returnValue = "Node : " + d.id + "\nData type : " + d.literalDataType;
+                } else {
+                    returnValue = "Node : " + d.id;
                 }
-            }
-            var allClear = d3.selectAll(".everything");
-            allClear.selectAll("*").remove();
+                return returnValue;
+            });
 
-            update();
-            simulation.restart();
+        //START :: on double click
+        node.on("dblclick", doubleClickFunctionality);
+        //END :: on double click    
 
-        }
-    }
+        //START :: on  click
+        node.on("click", clickFuntionality);
+        //END :: on  click
 
-    function clickFuntionality(d) {
-        var nodeIdVal = d.id;
-        var tempNodeContains = [];
-        nodeContents.forEach(function (val) {
-            if (val.label === nodeIdVal) {
-                tempNodeContains = val.contents;
-            }
-        });
 
-        var tempNode = d3.select("#" + idsArray.nodeId)
-        tempNode.selectAll("*").remove();
-        tempNode.append("text")
-            .text(" " + nodeIdVal + "\n")
-            .style("font-style", "italic")
-            .style("font-size", "80%")
-            .style("position", "relative")
-            .style("bottom", "2px");
+        if (!disableZoom) {
 
+            var zoomHandler = d3.zoom()
+                .on("zoom", zoomActions);
 
-        //node label on double click
-        if (tempNodeContains !== undefined) {
-            var nodeLabel = d3.select("#" + idsArray.nodeLabelId)
-            nodeLabel.selectAll("*").remove();
-            if (tempNodeContains["label"] === undefined) {
-                undefVar = true;
-            } else {
-                if (Object.prototype.toString.call(tempNodeContains["label"]) === "[object Array]") {
-                    tempNodeContains["label"].forEach(function (eachIds) {
-                        if (eachIds["@language"] === "de" && displayDeustch) {
+            svg.call(zoomHandler).on("dblclick.zoom", null);
+        }
 
-                            nodeLabel.append("text")
-                                .text(" " + eachIds["@value"] + "\n")
-                                .style("font-style", "italic")
-                                .style("font-size", "80%")
-                                .style("position", "relative")
-                                .style("bottom", "2px");
-                        } else if (eachIds["@language"] === "en" && !displayDeustch) {
-                            nodeLabel.append("text")
-                                .text(" " + eachIds["@value"] + "\n")
-                                .style("font-style", "italic")
-                                .style("font-size", "80%")
-                                .style("position", "relative")
-                                .style("bottom", "2px");
-                        }
+    }
 
-                    });
-                } else {
-                    nodeLabel.append("text")
-                        .text(" " + tempNodeContains["label"]["@value"] + "\n")
-                        .style("font-style", "italic")
-                        .style("font-size", "80%")
-                        .style("position", "relative")
-                        .style("bottom", "2px");
+    //crating node function
+    function createNewNode(tempSub, tempPred, tempObj, isLitteralVal, literalDataTypeVal) {
+        //START :: Node creation
+        var subNodeAdded = false;
+        var objNodeAdded = false;
+        var onDoubleClickNodesCreated = "";
+        var nodeValue = {};
+        if (nodesArray === undefinedVarValue) {
+            undefVar = true;
+        }
+        else {
+            nodesArray.forEach(function (elem) {
+                if (elem["id"] === tempSub) {
+                    subNodeAdded = true;
                 }
-            }
-
-            //node id on double click
-            var nodeID = d3.select("#" + idsArray.nodeIdsId)
-            nodeID.selectAll("*").remove();
-            if (tempNodeContains["@id"] === undefined) {
-                undefVar = true;
-            } else {
-                nodeID.append("text")
-                    .text(" " + tempNodeContains["@id"] + "\n")
-                    .style("font-style", "italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
-            }
-            //node type on double click
-            var nodeType = d3.select("#" + idsArray.nodeTypeId)
-            nodeType.selectAll("*").remove();
-            if (tempNodeContains["@type"] === undefined) {
-                undefVar = true;
-            } else {
-                nodeType.append("text")
-                    .text(" " + tempNodeContains["@type"] + "\n\n")
-                    .style("font-style", "italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
-            }
-
-            //node description on double click
-            var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
-            nodeDescription.selectAll("*").remove();
-            if (tempNodeContains["description"] === undefined) {
-                undefVar = true;
-            } else {
-                if (Object.prototype.toString.call(tempNodeContains["description"]) === "[object Array]") {
-                    tempNodeContains["description"].forEach(function (eachIds) {
-                        if (eachIds["@language"] === "de" && displayDeustch) {
+                if (elem["id"] === tempObj) {
+                    objNodeAdded = true;
+                }
+            });
+        }
 
-                            nodeDescription.append("text")
-                                .text(" " + eachIds["@value"] + "\n")
-                                .style("font-style", "italic")
-                                .style("font-size", "80%")
-                                .style("position", "relative")
-                                .style("bottom", "2px");
-                        } else if (eachIds["@language"] === "en" && !displayDeustch) {
-                            nodeDescription.append("text")
-                                .text(" " + eachIds["@value"] + "\n")
-                                .style("font-style", "italic")
-                                .style("font-size", "80%")
-                                .style("position", "relative")
-                                .style("bottom", "2px");
-                        }
+        if (subNodeAdded === false) {
+            circleIdIndex = circleIdIndex + 1;
+            nodeValue = {
+                id: tempSub,
+                predicate: tempPred,
+                nodeId: "circleId" + circleIdIndex,
+                isLitteral: false,
+                literalDataType: literalDataTypeVal,
+                group: 1
+            };
+            nodesArray.push(nodeValue);
 
-                    });
-                } else {
-                    nodeDescription.append("text")
-                        .text(" " + tempNodeContains["description"]["@value"] + "\n")
-                        .style("font-style", "italic")
-                        .style("font-size", "80%")
-                        .style("position", "relative")
-                        .style("bottom", "2px");
-                }
+            if (onDoubleClickCreatingNodes) {
+                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
+                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
+            }
+        }
+        if (objNodeAdded === false) {
+            circleIdIndex = circleIdIndex + 1;
+            nodeValue = {
+                id: tempObj,
+                predicate: tempPred,
+                nodeId: "circleId" + circleIdIndex,
+                isLitteral: isLitteralVal,
+                literalDataType: literalDataTypeVal,
+                group: 1
+            };
+            nodesArray.push(nodeValue);
+            if (onDoubleClickCreatingNodes) {
+                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
+                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
             }
+        }
+        //END :: Node creation
+    }
 
-            var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
-            nodeSubClass.selectAll("*").remove();
-            if (tempNodeContains["subClassOf"] === undefined) {
-                undefVar = true;
-            } else {
-                if (Object.prototype.toString.call(tempNodeContains["subClassOf"]) === "[object Array]") {
-                    var tempIndexSubClassof = 1;
-                    tempNodeContains["subClassOf"].forEach(function (eachIds) {
-                        var subClassLabel = getLabel(displayDeustch, eachIds);
+    //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
-                        nodeSubClass.append("text")
-                            .text(" " + tempIndexSubClassof + ". " + subClassLabel + "\n")
-                            .style("font-style", "italic")
-                            .style("font-size", "80%")
-                            .style("position", "relative")
-                            .style("bottom", "2px");
+    data["@graph"].forEach(function (element) {
+        tempSub = "?";
+        tempPred = "?";
+        tempObj = "?";
+        pred = "---subClassOf---";
+        tempDomainArray = [];
+        var tempDomainLabel;
+        //START :: Nodes and Links creation for subClassOf
+        if (displaySubclasses) {
+            if (element["subClassOf"] === undefinedVarValue) {
+                undefVar = true;
+            }
+            else {
+                tempSub = getLabel(displayDeustch, element["@id"]);
 
-                        tempIndexSubClassof = tempIndexSubClassof + 1;
+                if (Object.prototype.toString.call(element["subClassOf"]) === "[object Array]") {
+                    element["subClassOf"].forEach(function (eachIds) {
+                        tempObj = getLabel(displayDeustch, eachIds);
 
+                        tripleValue = {
+                            source: tempSub,
+                            predicate: pred,
+                            target: tempObj,
+                            value: 1
+                        };
+                        linksArray.push(tripleValue);
+                        createNewNode(tempSub, pred, tempObj, false, "");
                     });
                 } else {
-                    var subClassLabel = getLabel(displayDeustch, tempNodeContains["subClassOf"]);
+                    tempObj = getLabel(displayDeustch, element["subClassOf"]);
+                    
+                    tripleValue = {
+                        source: tempSub,
+                        predicate: pred,
+                        target: tempObj,
+                        value: 1
+                    };
+                    linksArray.push(tripleValue);
 
-                    nodeSubClass.append("text")
-                        .text(" " + subClassLabel + "\n")
-                        .style("font-style", "italic")
-                        .style("font-size", "80%")
-                        .style("position", "relative")
-                        .style("bottom", "2px");
+                    createNewNode(tempSub, pred, tempObj, false, " ");
                 }
             }
+        }
+        //END :: Nodes and Links creation for subClassOf
 
-            var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
-            nodeDomain.selectAll("*").remove();
-            if (tempNodeContains["domain"] === undefined) {
+        //START :: Nodes and Links creation for all Properties
+        if (dispalyAllprop) {
+            //get the subject label  
+            if (element["domain"] === undefinedVarValue) {
                 undefVar = true;
-            } else {
-                if (Object.prototype.toString.call(tempNodeContains["domain"]) === "[object Array]") {
-                    var tempIndexdomain = 1;
-                    tempNodeContains["domain"].forEach(function (eachIds) {
-                        var domainLabel = getLabel(displayDeustch, eachIds);
-
-                        nodeDomain.append("text")
-                            .text(" " + tempIndexdomain + ". " + domainLabel + "\n")
-                            .style("font-style", "italic")
-                            .style("font-size", "80%")
-                            .style("position", "relative")
-                            .style("bottom", "2px");
-
-                        tempIndexdomain = tempIndexdomain + 1;
-
+            }
+            else {
+                if (Object.prototype.toString.call(element["domain"]) === "[object Array]") {
+                    element["domain"].forEach(function (eachIds) {
+                        tempDomainLabel = getLabel(displayDeustch, eachIds);
+                        tempDomainArray.push(tempDomainLabel);
                     });
                 } else {
-                    var domainLabel = getLabel(displayDeustch, tempNodeContains["domain"]);
-
-                    nodeDomain.append("text")
-                        .text(" " + domainLabel + "\n")
-                        .style("font-style", "italic")
-                        .style("font-size", "80%")
-                        .style("position", "relative")
-                        .style("bottom", "2px");
+                    tempSub = getLabel(displayDeustch, element["domain"]);
                 }
             }
 
-
-
-            var nodeRange = d3.select("#" + idsArray.nodeRangeId)
-            nodeRange.selectAll("*").remove();
-            if (tempNodeContains["range"] === undefined) {
+            //get the predicate
+            if (element["domain"] === undefinedVarValue) {
                 undefVar = true;
-            } else {
-                if (Object.prototype.toString.call(tempNodeContains["range"]) === "[object Array]") {
-                    var tempIndexRange = 1;
-                    tempNodeContains["range"].forEach(function (eachIds) {
-                        var rangeLabel = getLabel(displayDeustch, eachIds);
-
-                        nodeRange.append("text")
-                            .text(" " + tempIndexRange + ". " + rangeLabel + "\n")
-                            .style("font-style", "italic")
-                            .style("font-size", "80%")
-                            .style("position", "relative")
-                            .style("bottom", "2px");
-
-                        tempIndexRange = tempIndexRange + 1;
-
-                    });
-                } else {
-                    var rangeLabel = getLabel(displayDeustch, tempNodeContains["range"]);
-
-                    nodeRange.append("text")
-                        .text(" " + rangeLabel + "\n")
-                        .style("font-style", "italic")
-                        .style("font-size", "80%")
-                        .style("position", "relative")
-                        .style("bottom", "2px");
-                }
+            }
+            else {
+                tempPred = getLabel(displayDeustch, element["@id"]);
             }
 
-            var nodeComment = d3.select("#" + idsArray.nodeCommentId)
-            nodeComment.selectAll("*").remove();
-            if (tempNodeContains["comment"] === undefined) {
+
+            //get the object  range
+            if (element["range"] === undefinedVarValue) {
                 undefVar = true;
             }
             else {
-                nodeComment.append("text")
-                    .text(tempNodeContains["comment"] + "\n")
-                    .style("font-style", "italic")
-                    .style("font-size", "80%")
-                    .style("position", "relative")
-                    .style("bottom", "2px");
+                tempObj = getLabel(displayDeustch, element["range"]);
             }
-        }
-
-    }
 
-    function zoomActions() {
-        g.attr("transform", d3.event.transform);
-    }
+            isLitteral = false;
+            literalDataType = tempObj;
 
-    
+            if (tempObj.toLowerCase().includes("xsd:")) {
+                tempObj = tempObj + literalIndex;
+                literalIndex = literalIndex + 1;
+                isLitteral = true;
+            }
 
-    function ticked() {
-        lables
-            .attr("x2", function (d) {
-                return d.x - width;
-            })
-            .attr("y2", function (d) {
-                return d.y - height;
-            });
-        link
-            .attr("x1", function (d) {
-                return d.source.x;
-            })
-            .attr("y1", function (d) {
-                return d.source.y;
-            })
-            .attr("x2", function (d) {
-                return d.target.x;
-            })
-            .attr("y2", function (d) {
-                return d.target.y;
-            });
-        linkTexts
-            .attr("x", function (d) {
-                return 4 + (d.source.x + d.target.x) / 2;
-            })
-            .attr("y", function (d) {
-                return 4 + (d.source.y + d.target.y) / 2;
-            });
-        node
-            .attr("transform", function (d) {
-                return "translate(" + d.x + "," + d.y + ")";
-            });
-        if (applyNodesBoundary) {
-            node
-                .attr("cx", function (d) {
-                    return d.x = Math.max(Math.max(resourceRadius, literalRadius), Math.min(width - Math.max(resourceRadius, literalRadius), d.x));
-                })
-                .attr("cy", function (d) {
-                    return d.y = Math.max(Math.max(resourceRadius, literalRadius), Math.min(height - Math.max(resourceRadius, literalRadius), d.y));
+            if (tempDomainArray.length !== 0) {
+                tempDomainArray.forEach(function (el) {
+                    if (el !== "?" && tempPred !== "?" && tempObj !== "?") {
+                        if (isLitteral) {
+                            tripleValue = {
+                                source: el,
+                                predicate: tempPred,
+                                target: tempObj,
+                                value: 1
+                            };
+                            linksArray.push(tripleValue);
+                            createNewNode(el, tempPred, tempObj, isLitteral, literalDataType, element);
+                        } else {
+                            tripleValue = {
+                                source: el,
+                                predicate: tempPred,
+                                target: tempObj,
+                                value: 1
+                            };
+                            linksArray.push(tripleValue);
+                            createNewNode(el, tempPred, tempObj, isLitteral, literalDataType);
+                        }
+                    }
                 });
+            } else {
+                if (tempSub !== "?" && tempPred !== "?" && tempObj !== "?") {
+                    if (isLitteral) {
+                        tripleValue = {
+                            source: tempSub,
+                            predicate: "",
+                            target: tempPred,
+                            value: 1
+                        };
+                        linksArray.push(tripleValue);
+                        createNewNode(tempSub, "", tempPred, isLitteral, literalDataType);
+                    } else {
+                        tripleValue = {
+                            source: tempSub,
+                            predicate: tempPred,
+                            target: tempObj,
+                            value: 1
+                        };
+                        linksArray.push(tripleValue);
+                        createNewNode(tempSub, tempPred, tempObj, isLitteral, literalDataType);
+                    }
+                }
+            }
         }
-    }
+        //END :: Nodes and Links creation for all Properties
+    });
+    //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
     update();
 };

From a7ca0fb709547635531e48d9765124dcd06f8654 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 19 Jan 2020 15:07:50 +0100
Subject: [PATCH 63/66] resolving "Codacy/PR Quality Review" issues.

---
 ida-chatbot/src/app/app.module.ts                 |  6 +++---
 .../rdfontology/d3v4-rdf-ontology-graph-view.js   | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ida-chatbot/src/app/app.module.ts b/ida-chatbot/src/app/app.module.ts
index 6157182f1..0e0a87698 100644
--- a/ida-chatbot/src/app/app.module.ts
+++ b/ida-chatbot/src/app/app.module.ts
@@ -62,7 +62,7 @@ import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { RdfOntologyViewComponent } from './components/rdf-ontology-view/rdf-ontology-view.component'
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
 import { SpeechInputComponent } from './components/speech-input/speech-input.component';
-//import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 @NgModule({
   declarations: [
     AppComponent,
@@ -124,8 +124,8 @@ import { SpeechInputComponent } from './components/speech-input/speech-input.com
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule //,
-   // NgbModule
+    FlexLayoutModule,
+    NgbModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 5f03e83f2..d7c1ace8f 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -19,6 +19,9 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
 
     var g, link, linkTexts, node, circles, lables;
     var i = 0;
+
+    if (typeof d3 == 'undefined'){d3 = d3;}
+    
     var svgClear = d3.select("#" + svgId);
     svgClear.selectAll("*").remove();
 
@@ -556,7 +559,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             }
 
             //node description on double click
-            var nodeDescription = d3.select("#" + idsArray.nodeDescripId)
+            var nodeDescription = d3.select("#" + idsArray.nodeDescripId);
             nodeDescription.selectAll("*").remove();
             if (tempNodeContains["description"] === undefinedVarValue) {
                 undefVar = true;
@@ -591,7 +594,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
             }
 
-            var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId)
+            var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId);
             nodeSubClass.selectAll("*").remove();
             if (tempNodeContains["subClassOf"] === undefinedVarValue) {
                 undefVar = true;
@@ -623,7 +626,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
             }
 
-            var nodeDomain = d3.select("#" + idsArray.nodeDomainId)
+            var nodeDomain = d3.select("#" + idsArray.nodeDomainId);
             nodeDomain.selectAll("*").remove();
             if (tempNodeContains["domain"] === undefinedVarValue) {
                 undefVar = true;
@@ -657,7 +660,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
 
 
 
-            var nodeRange = d3.select("#" + idsArray.nodeRangeId)
+            var nodeRange = d3.select("#" + idsArray.nodeRangeId);
             nodeRange.selectAll("*").remove();
             if (tempNodeContains["range"] === undefinedVarValue) {
                 undefVar = true;
@@ -689,7 +692,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
             }
 
-            var nodeComment = d3.select("#" + idsArray.nodeCommentId)
+            var nodeComment = d3.select("#" + idsArray.nodeCommentId);
             nodeComment.selectAll("*").remove();
             if (tempNodeContains["comment"] === undefinedVarValue) {
                 undefVar = true;
@@ -1102,4 +1105,4 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     //END :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
     update();
-};
+}
\ No newline at end of file

From 45d11dd6546aad742cb3a3d767402501420429a7 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 19 Jan 2020 15:19:22 +0100
Subject: [PATCH 64/66] resolving "Codacy/PR Quality Review" issues.

---
 .../d3v4-rdf-ontology-graph-view.js           | 172 +++++++++---------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index d7c1ace8f..807224478 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -20,12 +20,12 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     var g, link, linkTexts, node, circles, lables;
     var i = 0;
 
-    if (typeof d3 == 'undefined'){d3 = d3;}
-    
-    var svgClear = d3.select("#" + svgId);
+    if (typeof d3v4 === "undefined"){d3v4 = d3;}
+
+    var svgClear = d3v4.select("#" + svgId);
     svgClear.selectAll("*").remove();
 
-    var svg = d3.select("#" + svgId)
+    var svg = d3v4.select("#" + svgId)
         .append("svg")
         .attr("width", "100%")
         .attr("height", height);
@@ -58,14 +58,14 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         .attr("points", "0,-4 20,0 0,5");
 
 
-    var color = d3.scaleOrdinal(d3.schemeCategory20);
+    var color = d3v4.scaleOrdinal(d3v4.schemeCategory20);
 
-    var simulation = d3.forceSimulation()
-        .force("link", d3.forceLink().id(function (d) {
+    var simulation = d3v4.forceSimulation()
+        .force("link", d3v4.forceLink().id(function (d) {
             return d.id;
         }).distance(customizeGraphArray.edgeSize))
-        .force("charge", d3.forceManyBody().strength(-customizeGraphArray.graphCharge)) //Charge strength is here
-        .force("center", d3.forceCenter((width / 2), (height / 2)));
+        .force("charge", d3v4.forceManyBody().strength(-customizeGraphArray.graphCharge)) //Charge strength is here
+        .force("center", d3v4.forceCenter((width / 2), (height / 2)));
 
     var tempLabel, tepmNodeContent, tempLabelArray, tempLabelArray1;
     var literalIndex = 0;
@@ -78,7 +78,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     var tripleValue, isLitteral, literalDataType;
 
     const data = graphData;
-    // d3.json("assets/rdfontology/historian-onlogoly.json", function (error, data) {
+    // d3v4.json("assets/rdfontology/historian-onlogoly.json", function (error, data) {
     // if (error) {
     // return console.warn("Error in createV3RDFOntologyGraphView() method :" + error);
     // }
@@ -204,19 +204,76 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         return returnVaule;
     }
 
+    //crating node function
+    function createNewNode(tempSub, tempPred, tempObj, isLitteralVal, literalDataTypeVal) {
+        //START :: Node creation
+        var subNodeAdded = false;
+        var objNodeAdded = false;
+        var onDoubleClickNodesCreated = "";
+        var nodeValue = {};
+        if (nodesArray === undefinedVarValue) {
+            undefVar = true;
+        }
+        else {
+            nodesArray.forEach(function (elem) {
+                if (elem["id"] === tempSub) {
+                    subNodeAdded = true;
+                }
+                if (elem["id"] === tempObj) {
+                    objNodeAdded = true;
+                }
+            });
+        }
+
+        if (subNodeAdded === false) {
+            circleIdIndex = circleIdIndex + 1;
+            nodeValue = {
+                id: tempSub,
+                predicate: tempPred,
+                nodeId: "circleId" + circleIdIndex,
+                isLitteral: false,
+                literalDataType: literalDataTypeVal,
+                group: 1
+            };
+            nodesArray.push(nodeValue);
+
+            if (onDoubleClickCreatingNodes) {
+                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
+                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
+            }
+        }
+        if (objNodeAdded === false) {
+            circleIdIndex = circleIdIndex + 1;
+            nodeValue = {
+                id: tempObj,
+                predicate: tempPred,
+                nodeId: "circleId" + circleIdIndex,
+                isLitteral: isLitteralVal,
+                literalDataType: literalDataTypeVal,
+                group: 1
+            };
+            nodesArray.push(nodeValue);
+            if (onDoubleClickCreatingNodes) {
+                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
+                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
+            }
+        }
+        //END :: Node creation
+    }
+    
     function dragstarted(d) {
-        if (!d3.event.active) { simulation.alphaTarget(0.3).restart();}
+        if (!d3v4.event.active) { simulation.alphaTarget(0.3).restart();}
         d.fx = d.x;
         d.fy = d.y;
     }
 
     function dragged(d) {
-        d.fx = d3.event.x;
-        d.fy = d3.event.y;
+        d.fx = d3v4.event.x;
+        d.fy = d3v4.event.y;
     }
 
     function dragended(d) {
-        if (!d3.event.active) {simulation.alphaTarget(0);}
+        if (!d3v4.event.active) {simulation.alphaTarget(0);}
         d.fx = null;
         d.fy = null;
     }
@@ -274,7 +331,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             expandedNodesArray.push(idVal);
 
 
-            d3.select(idVal)
+            d3v4.select(idVal)
                 .attr("r", resourceRadius + 4)
                 .style("fill", customizeGraphArray.onClickNodeColor);
 
@@ -409,7 +466,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
 
             onDoubleClickCreatingNodes = false;
 
-            allClear = d3.selectAll(".everything");
+            allClear = d3v4.selectAll(".everything");
             allClear.selectAll("*").remove();
 
             update();
@@ -466,7 +523,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                     break;
                 }
             }
-            allClear = d3.selectAll(".everything");
+            allClear = d3v4.selectAll(".everything");
             allClear.selectAll("*").remove();
 
             update();
@@ -484,7 +541,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             }
         });
 
-        var tempNode = d3.select("#" + idsArray.nodeId);
+        var tempNode = d3v4.select("#" + idsArray.nodeId);
         tempNode.selectAll("*").remove();
         tempNode.append("text")
             .text(" " + nodeIdVal + "\n")
@@ -496,7 +553,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
 
         //node label on double click
         if (tempNodeContains !== undefinedVarValue) {
-            var nodeLabel = d3.select("#" + idsArray.nodeLabelId);
+            var nodeLabel = d3v4.select("#" + idsArray.nodeLabelId);
             nodeLabel.selectAll("*").remove();
             if (tempNodeContains["label"] === undefinedVarValue) {
                 undefVar = true;
@@ -532,7 +589,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             }
 
             //node id on double click
-            var nodeID = d3.select("#" + idsArray.nodeIdsId);
+            var nodeID = d3v4.select("#" + idsArray.nodeIdsId);
             nodeID.selectAll("*").remove();
             if (tempNodeContains["@id"] === undefinedVarValue) {
                 undefVar = true;
@@ -545,7 +602,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                     .style("bottom", "2px");
             }
             //node type on double click
-            var nodeType = d3.select("#" + idsArray.nodeTypeId);
+            var nodeType = d3v4.select("#" + idsArray.nodeTypeId);
             nodeType.selectAll("*").remove();
             if (tempNodeContains["@type"] === undefinedVarValue) {
                 undefVar = true;
@@ -559,7 +616,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             }
 
             //node description on double click
-            var nodeDescription = d3.select("#" + idsArray.nodeDescripId);
+            var nodeDescription = d3v4.select("#" + idsArray.nodeDescripId);
             nodeDescription.selectAll("*").remove();
             if (tempNodeContains["description"] === undefinedVarValue) {
                 undefVar = true;
@@ -594,7 +651,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
             }
 
-            var nodeSubClass = d3.select("#" + idsArray.nodeSubClassId);
+            var nodeSubClass = d3v4.select("#" + idsArray.nodeSubClassId);
             nodeSubClass.selectAll("*").remove();
             if (tempNodeContains["subClassOf"] === undefinedVarValue) {
                 undefVar = true;
@@ -626,7 +683,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
             }
 
-            var nodeDomain = d3.select("#" + idsArray.nodeDomainId);
+            var nodeDomain = d3v4.select("#" + idsArray.nodeDomainId);
             nodeDomain.selectAll("*").remove();
             if (tempNodeContains["domain"] === undefinedVarValue) {
                 undefVar = true;
@@ -660,7 +717,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
 
 
 
-            var nodeRange = d3.select("#" + idsArray.nodeRangeId);
+            var nodeRange = d3v4.select("#" + idsArray.nodeRangeId);
             nodeRange.selectAll("*").remove();
             if (tempNodeContains["range"] === undefinedVarValue) {
                 undefVar = true;
@@ -692,7 +749,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
             }
 
-            var nodeComment = d3.select("#" + idsArray.nodeCommentId);
+            var nodeComment = d3v4.select("#" + idsArray.nodeCommentId);
             nodeComment.selectAll("*").remove();
             if (tempNodeContains["comment"] === undefinedVarValue) {
                 undefVar = true;
@@ -710,7 +767,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     }
 
     function zoomActions() {
-        g.attr("transform", d3.event.transform);
+        g.attr("transform", d3v4.event.transform);
     }
 
     function update() {
@@ -835,7 +892,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
                 }
                 return customizeGraphArray.resourceNodeColor;
             })
-            .call(d3.drag()
+            .call(d3v4.drag()
                 .on("start", dragstarted)
                 .on("drag", dragged)
                 .on("end", dragended)
@@ -897,7 +954,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
 
         if (!disableZoom) {
 
-            var zoomHandler = d3.zoom()
+            var zoomHandler = d3v4.zoom()
                 .on("zoom", zoomActions);
 
             svg.call(zoomHandler).on("dblclick.zoom", null);
@@ -905,63 +962,6 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
 
     }
 
-    //crating node function
-    function createNewNode(tempSub, tempPred, tempObj, isLitteralVal, literalDataTypeVal) {
-        //START :: Node creation
-        var subNodeAdded = false;
-        var objNodeAdded = false;
-        var onDoubleClickNodesCreated = "";
-        var nodeValue = {};
-        if (nodesArray === undefinedVarValue) {
-            undefVar = true;
-        }
-        else {
-            nodesArray.forEach(function (elem) {
-                if (elem["id"] === tempSub) {
-                    subNodeAdded = true;
-                }
-                if (elem["id"] === tempObj) {
-                    objNodeAdded = true;
-                }
-            });
-        }
-
-        if (subNodeAdded === false) {
-            circleIdIndex = circleIdIndex + 1;
-            nodeValue = {
-                id: tempSub,
-                predicate: tempPred,
-                nodeId: "circleId" + circleIdIndex,
-                isLitteral: false,
-                literalDataType: literalDataTypeVal,
-                group: 1
-            };
-            nodesArray.push(nodeValue);
-
-            if (onDoubleClickCreatingNodes) {
-                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
-                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
-            }
-        }
-        if (objNodeAdded === false) {
-            circleIdIndex = circleIdIndex + 1;
-            nodeValue = {
-                id: tempObj,
-                predicate: tempPred,
-                nodeId: "circleId" + circleIdIndex,
-                isLitteral: isLitteralVal,
-                literalDataType: literalDataTypeVal,
-                group: 1
-            };
-            nodesArray.push(nodeValue);
-            if (onDoubleClickCreatingNodes) {
-                onDoubleClickNodesCreated = { nodeClicked: nodeDoubleClicked, nodeCreated: nodeValue };
-                onDoubleClickedNewlyCreatedNodes.push(onDoubleClickNodesCreated);
-            }
-        }
-        //END :: Node creation
-    }
-
     //START :: Creation of Graph depenging on displaySubclasses and dispalyAllprop values
 
     data["@graph"].forEach(function (element) {

From 2111245263ba3d443bd13320bf72c731acfff9e3 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 19 Jan 2020 15:51:08 +0100
Subject: [PATCH 65/66] resolving "Codacy/PR Quality Review" issues.

---
 .../d3v4-rdf-ontology-graph-view.js           | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 807224478..5b52bbded 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -11,7 +11,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
     var onDoubleClickCreatingNodes = false;
     var nodeDoubleClicked = "";
     var undefVar = false;
-    var undefinedVarValue = undefined;
+    var undefinedVarValue;
     var width = 1175,
         height = 1100,
         resourceRadius = customizeGraphArray.resourceRadius,
@@ -260,7 +260,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         }
         //END :: Node creation
     }
-    
+
     function dragstarted(d) {
         if (!d3v4.event.active) { simulation.alphaTarget(0.3).restart();}
         d.fx = d.x;
@@ -326,7 +326,8 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         var clickedNodeLabel = d.id;
         var newlyCreatingLinkData = "";
         var allClear;
-        
+        var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue, removeClikedNode;
+
         if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
             expandedNodesArray.push(idVal);
 
@@ -340,8 +341,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             var tempObj = "?";
             var pred = "---subClassOf---";
             var tempDomainArray = [];
-            var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue, removeClikedNode;
-
+            
             onDoubleClickCreatingNodes = true;
             nodeDoubleClicked = idVal;
 
@@ -479,7 +479,14 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             onDoubleClickedNewlyCreatedLinks.forEach(function (val) {
                 if (val.nodeClicked === idVal) {
                     for (i = 0; i < linksArray.length; i++) {
-                        if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) {
+                        var sourceVal = linksArray[i].source;
+                        var linkSrc = val.link.source;
+                        var predVal = linksArray[i].predicate;
+                        var linkPred = val.link.predicate;
+                        var targetVal = linksArray[i].target;
+                        var linkTarget = val.link.target;
+                        
+                        if ( sourceVal === linkSrc && predVal === linkPred &&  targetVal === linkTarget) {
                             linksArray.splice(i, 1);
                             i--;
                         }
@@ -490,7 +497,8 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             });
 
             for (i = 0; i < onDoubleClickedNewlyCreatedLinks.length; i++) {
-                if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) {
+                var nodeClickedVal = onDoubleClickedNewlyCreatedLinks[i].nodeClicked;
+                if ( nodeClickedVal === removeClikedNode) {
                     onDoubleClickedNewlyCreatedLinks.splice(i, 1);
                     i--;
                 }
@@ -501,7 +509,9 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             onDoubleClickedNewlyCreatedNodes.forEach(function (val) {
                 if (val.nodeClicked === idVal) {
                     for (i = 0; i < nodesArray.length; i++) {
-                        if (nodesArray[i].id === val.nodeCreated.id) {
+                        var tempIdVal = nodesArray[i].id;
+                        var tempCreatedId = val.nodeCreated.id;
+                        if (tempIdVal === tempCreatedId ) {
                             nodesArray.splice(i, 1);
                             i--;
                         }
@@ -511,14 +521,16 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             });
 
             for (i = 0; i < onDoubleClickedNewlyCreatedNodes.length; i++) {
-                if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) {
+                var nodeClickedValue = onDoubleClickedNewlyCreatedLinks[i].nodeClicked;
+                if (nodeClickedValue === removeClikedNode) {
                     onDoubleClickedNewlyCreatedNodes.splice(i, 1);
                     i--;
                 }
             }
 
             for (i = 0; i < expandedNodesArray.length; i++) {
-                if (expandedNodesArray[i] === idVal) {
+                var expandedArrayVal = expandedNodesArray[i];
+                if (expandedArrayVal === idVal) {
                     expandedNodesArray.splice(i, 1);
                     break;
                 }

From 6dc2c542a46edb4a7927e29ca0e98ba3f5c2b317 Mon Sep 17 00:00:00 2001
From: RahulSherikar <rahulsherikar94@gmail.com>
Date: Sun, 19 Jan 2020 15:57:54 +0100
Subject: [PATCH 66/66] resolving "Codacy/PR Quality Review" issues.

---
 .../d3v4-rdf-ontology-graph-view.js           | 30 ++++++-------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
index 5b52bbded..da9055714 100644
--- a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
+++ b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -260,7 +260,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         }
         //END :: Node creation
     }
-
+    
     function dragstarted(d) {
         if (!d3v4.event.active) { simulation.alphaTarget(0.3).restart();}
         d.fx = d.x;
@@ -326,8 +326,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
         var clickedNodeLabel = d.id;
         var newlyCreatingLinkData = "";
         var allClear;
-        var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue, removeClikedNode;
-
+        
         if (expandedNodesArray.length === 0 || !expandedNodesArray.includes(idVal)) {
             expandedNodesArray.push(idVal);
 
@@ -341,7 +340,8 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             var tempObj = "?";
             var pred = "---subClassOf---";
             var tempDomainArray = [];
-            
+            var includeThis, tempDomainLabel, tempLabelArray, tempLabelArray1, isLitteral, literalDataType, tripleValue, removeClikedNode;
+
             onDoubleClickCreatingNodes = true;
             nodeDoubleClicked = idVal;
 
@@ -479,14 +479,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             onDoubleClickedNewlyCreatedLinks.forEach(function (val) {
                 if (val.nodeClicked === idVal) {
                     for (i = 0; i < linksArray.length; i++) {
-                        var sourceVal = linksArray[i].source;
-                        var linkSrc = val.link.source;
-                        var predVal = linksArray[i].predicate;
-                        var linkPred = val.link.predicate;
-                        var targetVal = linksArray[i].target;
-                        var linkTarget = val.link.target;
-                        
-                        if ( sourceVal === linkSrc && predVal === linkPred &&  targetVal === linkTarget) {
+                        if (linksArray[i].source === val.link.source && linksArray[i].predicate === val.link.predicate && linksArray[i].target === val.link.target) {
                             linksArray.splice(i, 1);
                             i--;
                         }
@@ -497,8 +490,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             });
 
             for (i = 0; i < onDoubleClickedNewlyCreatedLinks.length; i++) {
-                var nodeClickedVal = onDoubleClickedNewlyCreatedLinks[i].nodeClicked;
-                if ( nodeClickedVal === removeClikedNode) {
+                if (onDoubleClickedNewlyCreatedLinks[i].nodeClicked === removeClikedNode) {
                     onDoubleClickedNewlyCreatedLinks.splice(i, 1);
                     i--;
                 }
@@ -509,9 +501,7 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             onDoubleClickedNewlyCreatedNodes.forEach(function (val) {
                 if (val.nodeClicked === idVal) {
                     for (i = 0; i < nodesArray.length; i++) {
-                        var tempIdVal = nodesArray[i].id;
-                        var tempCreatedId = val.nodeCreated.id;
-                        if (tempIdVal === tempCreatedId ) {
+                        if (nodesArray[i].id === val.nodeCreated.id) {
                             nodesArray.splice(i, 1);
                             i--;
                         }
@@ -521,16 +511,14 @@ function createV4RDFOntologyGraph(figId, svgId, graphData, displayDeustch, displ
             });
 
             for (i = 0; i < onDoubleClickedNewlyCreatedNodes.length; i++) {
-                var nodeClickedValue = onDoubleClickedNewlyCreatedLinks[i].nodeClicked;
-                if (nodeClickedValue === removeClikedNode) {
+                if (onDoubleClickedNewlyCreatedNodes[i].nodeClicked === removeClikedNode) {
                     onDoubleClickedNewlyCreatedNodes.splice(i, 1);
                     i--;
                 }
             }
 
             for (i = 0; i < expandedNodesArray.length; i++) {
-                var expandedArrayVal = expandedNodesArray[i];
-                if (expandedArrayVal === idVal) {
+                if (expandedNodesArray[i] === idVal) {
                     expandedNodesArray.splice(i, 1);
                     break;
                 }