Explorar o código

added selected counters on top progress bar

Piotr Labudda %!s(int64=7) %!d(string=hai) anos
pai
achega
540fbb5c90
Modificáronse 2 ficheiros con 22 adicións e 5 borrados
  1. 3 3
      tools/Bocian.php
  2. 19 2
      tools/Bocian.php.view.js

+ 3 - 3
tools/Bocian.php

@@ -1132,7 +1132,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 																			<a href="'.Request::getPathUri().'index.php?_route=UrlAction_Bocian#PRACOWNICY" class="smad-wizard-dot"></a>
 																			<div class="smad-wizard-info complete text-center">
 																					<div class="step-item"><a href="'.Request::getPathUri().'index.php?_route=UrlAction_Bocian#PRACOWNICY">Krok 1</a></div>
-																					<div class="step-title ">PRACOWNICY</div>
+																					<div class="step-title">PRACOWNICY <span class="top--count-selected-item-pracownicy"></span></div>
 																			</div>
 																	</div>
 
@@ -1142,7 +1142,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 																			<a href="'.Request::getPathUri().'index.php?_route=UrlAction_Bocian#KONTRAHENCI" class="smad-wizard-dot"></a>
 																			<div class="smad-wizard-info  text-center">
 																					<div class="step-item"><a href="'.Request::getPathUri().'index.php?_route=UrlAction_Bocian#KONTRAHENCI">Krok 2</a></div>
-																					<div class="step-title ">KONTRAHENCI</div>
+																					<div class="step-title">KONTRAHENCI <span class="top--count-selected-item-kontrahenci"></span></div>
 																			</div>
 																	</div>
 
@@ -1152,7 +1152,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 																			<a href="#" class="smad-wizard-dot"></a>
 																			<div class="smad-wizard-info  text-center">
 																					<div class="step-item">Krok 3</div>
-																					<div class="step-title ">SZUKANIE POWIĄZAŃ</div>
+																					<div class="step-title">SZUKANIE POWIĄZAŃ</div>
 																			</div>
 																	</div>
 															</div>

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

@@ -8,6 +8,7 @@ console.log('BASE_URLS',BASE_URLS);
 $(window).on('hashchange', function() {
 	initLocalStorage();
 	rootChangeForm();
+	updateTopCounters();
 });
 
 
@@ -773,6 +774,7 @@ function urlFetchKontrahenci(page) {
 
 				//	$( ".container-bi_audit_raport" ).append( data.body.view );
 					console.log('request succeeded with JSON responseKontrahenci', data)
+					updateTopCounters();
 				}).catch(function(error) {
 					console.log('request failed', error)
 				})
@@ -856,6 +858,7 @@ function urlFetchPracownicy(page) {
 				catchEventCheckbox('PRACOWNICY');
 				checkedChoiseItems('PRACOWNICY', getItemLocalStorage('Bocian.biAuditForm.pracownicyIds') );
 
+				updateTopCounters();
 			}).catch(function(error) {
 				console.log('request failed', error)
 			})
@@ -1263,13 +1266,14 @@ function clearListLocalStorageByType(typeNameLocalStorage) {
 function updateCountItemCheckedByType(typeNameLocalStorage) {
   var countId = 0;
 
+	updateTopCounters();
+
 	if (typeNameLocalStorage === 'pracownicy') {
 		var countPracownicy = getItemLocalStorage('Bocian.biAuditForm.pracownicyIds');
 
 		if (countPracownicy === null || countPracownicy === undefined) {
 			return countId;
 		}
-
 		countId = Object.keys(countPracownicy).length;
 		$('#count-selected-item-pracownicy').text(countId);
 	}
@@ -1277,7 +1281,6 @@ function updateCountItemCheckedByType(typeNameLocalStorage) {
 	if (typeNameLocalStorage === 'kontrahenci') {
 		var countKontrahenci = getItemLocalStorage('Bocian.biAuditForm.kontrahenciIds');
 
-
 		if (countKontrahenci === null || countKontrahenci === undefined) {
 			return countId;
 		}
@@ -1289,6 +1292,19 @@ function updateCountItemCheckedByType(typeNameLocalStorage) {
 	return countId;
 }
 
+function updateTopCounters() {
+	var countPracownicy = getItemLocalStorage('Bocian.biAuditForm.pracownicyIds');
+	var countKontrahenci = getItemLocalStorage('Bocian.biAuditForm.kontrahenciIds');
+	var totalPracownicy = (countPracownicy) ? Object.keys(countPracownicy).length : 0;
+	var totalKontrahenci = (countKontrahenci) ? Object.keys(countKontrahenci).length : 0;
+	console.warn({totalPracownicy: totalPracownicy, totalKontrahenci: totalKontrahenci})
+	$('.top--count-selected-item-pracownicy').text(totalPracownicy ? '('+totalPracownicy+')' : '');
+	$('.top--count-selected-item-kontrahenci').text(totalKontrahenci ? '('+totalKontrahenci+')' : '');
+	$('.top--count-selected-item-pracownicy').attr('title', totalPracownicy ? "Wybrano: " + totalPracownicy + " pracowników" : '');
+	$('.top--count-selected-item-kontrahenci').attr('title', totalKontrahenci ? "Wybrano: " + totalKontrahenci + " kontrahentów" : '');
+}
+
+
 // Pagination
 var Pagination = {
 
@@ -1501,6 +1517,7 @@ function todo__fetchRaport(id) {
 $(document).ready(function(){
 	rootChangeForm();
 	detectChoiseFilter();
+	updateTopCounters();
 });
 
 global.checkAll = checkAll;