Browse Source

- zakomentowanie grafów

dariusz.andryskowski 7 years ago
parent
commit
c6481a6e30
3 changed files with 9 additions and 13 deletions
  1. 1 5
      theme/assets/js/graph/parser.js
  2. 6 6
      theme/bocian.php
  3. 2 2
      tools/Bocian.php.view.js

+ 1 - 5
theme/assets/js/graph/parser.js

@@ -1,6 +1,6 @@
 var responseObjects = p5WFS_GetFeature();
 var object = responseObjects[0];
-console.log('p5WFS_GetFeature', responseObjects);
+
 var nodes = {};
 var nodesArray = [];
 var links = {};
@@ -48,7 +48,6 @@ const getLinks = (array, expansion) => {
 const getNodes = (array, expansion) => {
 
     if (array != undefined && expansion !== undefined) {
-      console.log('getNodes akcja', array, expansion);
       array.forEach(element => {
         const rowObject = hasTargetArray(element);
         if (rowObject)
@@ -94,7 +93,6 @@ const parseLinks = () => {
 };
 
 const parseGraph = (expansion) => {
-  console.log('parseGraph Start');
   nodes = {};
   links = {};
   nodesArray = [];
@@ -107,13 +105,11 @@ const parseGraph = (expansion) => {
     nodes: nodesArray,
     links: linksArray
   };
-  console.log('parseGraph End', dataModel);
 };
 
 const redraw = (expansion) => {
   if (dragged)
     return dragged = false;
-    console.log('redrow');
   parseGraph(expansion);
   draw();
 };

+ 6 - 6
theme/bocian.php

@@ -20,9 +20,9 @@ class Theme_bocian extends ThemeDefault {
 	function top() {
 		include dirname(__FILE__) . '/view/top.php';
 		//todo: demo load data for graph :DELETE line if tested
-		UI::inlineRawJS(dirname(__FILE__) . '/demoGraph/sampleData/sampleData.js');
-		UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/GetFeature.js');
-		UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/parser.js');
+//		UI::inlineRawJS(dirname(__FILE__) . '/demoGraph/sampleData/sampleData.js');
+		//UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/GetFeature.js');
+	//	UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/parser.js');
 	}
 
 	function footer() {
@@ -31,9 +31,9 @@ class Theme_bocian extends ThemeDefault {
 		UI::inlineRawJS(dirname(__FILE__) . '/assets/js/scripts.js');
 
 		// graph lib
-		UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/d3.v3.min.js');
-		UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/csaladenes/sankey/sankey.js');
-		UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/csaladenes/sankey/sankey-init.js');
+	//	UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/d3.v3.min.js');
+		//UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/csaladenes/sankey/sankey.js');
+	//	UI::inlineRawJS(dirname(__FILE__) . '/assets/js/graph/csaladenes/sankey/sankey-init.js');
 	}
 
 	function login($data) {

+ 2 - 2
tools/Bocian.php.view.js

@@ -898,7 +898,7 @@ urlFetchKontrahenciPowiazania();
 			fetchGroupKontrahenci();
 			$( ".container-bi_audit_form_pracownicy_raport" ).hide();
 			$( ".container-bi_audit_form_kontrahenci_raport" ).show();
-			parseGraph();
+			//parseGraph();
 			break;
 
 		case '#PRACOWNICY':
@@ -1787,7 +1787,7 @@ function updateTopCounters() {
 	var totalPracownicy = (countPracownicy) ? Object.keys(countPracownicy).length : 0;
 	var totalKontrahenci = (countKontrahenci) ? Object.keys(countKontrahenci).length : 0;
 	var depthValue = getItemLocalStorage('Bocian.biAuditForm.depth');
-	console.warn({totalPracownicy: totalPracownicy, totalKontrahenci: totalKontrahenci})
+	if(DBG) console.warn({totalPracownicy: totalPracownicy, totalKontrahenci: totalKontrahenci})
 	$('.top--count-selected-item-pracownicy').text(totalPracownicy ? '('+totalPracownicy+')' : '');
 	$('.top--count-selected-item-kontrahenci').text(totalKontrahenci ? '('+totalKontrahenci+')' : '');
 	$('.bottom--count-selected-item-pracownicy').text(totalPracownicy ? "Wybrano: (" + totalPracownicy + ") pracownika/ów" : '');