ustwaienie bewzględnego url z nazwa katalogu (uniwersalne rozwiazanie pozwoli na odtworzenie srodowiska bez zmiany nazwy lokalizacji katalogu kodu)

tools/Bocian.php

@@ -3,6 +3,7 @@
 Lib::loadClass('RouteToolBase');
 Lib::loadClass('UI');
 Lib::loadClass('Response');
+Lib::loadClass('Request');
 
 // index.php?_route=UrlAction_BiAuditRaport  - uruchamia defaultAction
 class Bocian extends RouteToolBase {
@@ -18,6 +19,7 @@ class Bocian extends RouteToolBase {
 	//	echo '<div class="container-bi_audit_form_raport_data" style="display: none;"></div>';
 
 		UI::inlineJS(__FILE__ . '.view.js', [
+			'BASE_URLS' => Request::getPathUri(),
 			'URL_FETCH_KONTRAHENCI_POWIAZANIA' => $this->getLink('fetchEnergaRumKontrahenciPowiazaniaAjax'),
 			'URL_FETCH_TEST_KRS' => $this->getLink('fetchTestKrsAjax'),
 			'URL_FETCH_TEST_CEIDG' => $this->getLink('fetchTestCeidgAjax'),

tools/Bocian.php.view.js

@@ -6,9 +6,10 @@ console.log('test1... DBG:', DBG)
 // localStorage.removeItem('Bocian.kontrahenciIds')
 // localStorage.removeItem('Bocian.depth') // TODO: zapis na stronie głównej i BiAuditRaport
 
-if (!URL_FETCH_KONTRAHENCI_POWIAZANIA) {
-	throw "Brak zmiennej URL_FETCH_KONTRAHENCI_POWIAZANIA"
+if (!BASE_URLS) {
+	throw "Brak BASE_URLS"
 }
+console.log('BASE_URLS',BASE_URLS);
 
 $(window).on('hashchange', function() {
 	initLocalStorage();
@@ -721,7 +722,7 @@ console.log('URL_FETCH_KONTRAHENCI', data);
 
 				if (data.body.pagination !== undefined) {
 					Pagination.Init(document.getElementById('pagination-kontrahenci'), {
-							url: '/SE/index.php?_route=UrlAction_Bocian#KONTRAHENCI',
+							url: BASE_URLS+'index.php?_route=UrlAction_Bocian#KONTRAHENCI',
 							id_pagination: 'pagination-kontrahenci',
 							type: 'KONTRAHENCI',
 							limit: data.body.pagination.limit,
@@ -733,7 +734,7 @@ console.log('URL_FETCH_KONTRAHENCI', data);
 
 					var paginationShowNextCount = 1;
 					if ( parseInt(data.body.pagination.current) !== 1) {
-						 paginationShowNextCount = parseInt(data.body.pagination.limit) * (parseInt(data.body.pagination.current) - 1 );
+						 paginationShowNextCount = parseInt(data.body.pagination.limit) * (parseInt(data.body.pagination.current) - 1 ) + 1;
 					}
 					$('#paginationShowNextCount-KONTRAHENCI').text(paginationShowNextCount);
 
@@ -800,7 +801,7 @@ function urlFetchPracownicy(page) {
 
 			if (data.body.pagination.size) {
 						Pagination.Init(document.getElementById('pagination-pracownicy'), {
-							  url: '/SE/index.php?_route=UrlAction_Bocian#PRACOWNICY',
+							  url: BASE_URLS+'index.php?_route=UrlAction_Bocian#PRACOWNICY',
 								id_pagination: 'pagination-pracownicy',
 								type: 'PRACOWNICY',
 								limit: data.body.pagination.limit,
@@ -812,7 +813,7 @@ function urlFetchPracownicy(page) {
 
 						var paginationShowNextCount = 1;
 						if ( parseInt(data.body.pagination.current) !== 1) {
-							 paginationShowNextCount = parseInt(data.body.pagination.limit) * (parseInt(data.body.pagination.current) - 1 );
+							 paginationShowNextCount = parseInt(data.body.pagination.limit) * (parseInt(data.body.pagination.current) - 1 ) + 1;
 						}
 						$('#paginationShowNextCount-PRACOWNICY').text(paginationShowNextCount);