Browse Source

- dodanie liczby kolejnej listy rekordów wyświetlanych z lewej strony paginacji
- dodanie w formularzu zapisu CSV checkboxa pozwalajcego na nadpisanie
wszyskich rekordów w db nowymi przesłanymi z formularza
- usuniecie checkboxów (nadpisz rekord) przy każdym z rekordów w
formularzu uplodu pliku csv

dariusz.andryskowski 7 years ago
parent
commit
b1cae5437f
1 changed files with 33 additions and 6 deletions
  1. 33 6
      tools/Bocian.php.view.js

+ 33 - 6
tools/Bocian.php.view.js

@@ -228,9 +228,9 @@ console.log('dane z formularza formDataFrom ', formDataFrom );
  }).then(function(json) {
 	 console.log('parsed json', json)
 
-	 if (result.type == 'success') {
+	 if (response.type == 'success') {
 
-	 	p5UI__notifyAjaxCallback(result);
+	 	p5UI__notifyAjaxCallback(response.msg);
 	 }
 
 	// return json;
@@ -680,6 +680,7 @@ function urlFetchKontrahenci(page) {
 						})
 				.then(function(data) {
 
+console.log('URL_FETCH_KONTRAHENCI', data);
 						var listItemsKontrahenci = null;
 						data.body.items.forEach (function(row) {
 							listItemsKontrahenci += '<tr><td><input type="checkbox" name="kontrID[]" value="'+row['ID']+'" /></td>'+
@@ -720,12 +721,19 @@ function urlFetchKontrahenci(page) {
 							url: '/SE/index.php?_route=UrlAction_Bocian#KONTRAHENCI',
 							id_pagination: 'pagination-kontrahenci',
 							type: 'KONTRAHENCI',
+							limit: data.body.pagination.limit,
 							total_items: data.body.pagination.total_items, // pages size
 							size: data.body.pagination.size, // pages size
 							page: page,  // selected page
 							step: 1   // pages before and after current
 					});
 
+					var paginationShowNextCount = 1;
+					if ( parseInt(data.body.pagination.current) !== 1) {
+						 paginationShowNextCount = parseInt(data.body.pagination.limit) * (parseInt(data.body.pagination.current) - 1 );
+					}
+					$('#paginationShowNextCount-KONTRAHENCI').text(paginationShowNextCount);
+
 				}
 
 				$( "#body-kontrahenci" ).html(listItemsKontrahenci);
@@ -792,20 +800,27 @@ function urlFetchPracownicy(page) {
 							  url: '/SE/index.php?_route=UrlAction_Bocian#PRACOWNICY',
 								id_pagination: 'pagination-pracownicy',
 								type: 'PRACOWNICY',
+								limit: data.body.pagination.limit,
 								total_items: data.body.pagination.total_items, // pages size
 								size: data.body.pagination.size, // pages size
 								page: data.body.pagination.current,  // selected page
 								step: 1   // pages before and after current
 						});
+
+						var paginationShowNextCount = 1;
+						if ( parseInt(data.body.pagination.current) !== 1) {
+							 paginationShowNextCount = parseInt(data.body.pagination.limit) * (parseInt(data.body.pagination.current) - 1 );
+						}
+						$('#paginationShowNextCount-PRACOWNICY').text(paginationShowNextCount);
+
 			}
 
+
 			$( "#body-pracownicy" ).html( listItemsPracownik);
 				checkAll('PRACOWNICY');
 				catchEventCheckbox('PRACOWNICY');
 				checkedChoiseItems('PRACOWNICY', getItemLocalStorage('Bocian.biAuditForm.pracownicyIds') );
 
-			//	$( ".container-bi_audit_raport" ).append( data.body.view );
-				console.log('request succeeded with JSON responsePRACOWNICY', data)
 			}).catch(function(error) {
 				console.log('request failed', error)
 			})
@@ -869,6 +884,11 @@ function checkedChoiseItems(type, store) {
 	// if id element exist
 	if (document.getElementById(idElement)) {
 
+		// if not checked
+		if (!store) {
+			return false;
+		}
+
 		// checked again if user selected Item (pracownicy/kontrahent)
 			for (i = 0; i < store.length; i++) {
 				$('#body-'+type.toLowerCase() +' input[type=checkbox] ').map(function(k, v) {
@@ -1176,6 +1196,7 @@ var Pagination = {
         Pagination.url = data.url;
         Pagination.id_pagination = data.id_pagination;
         Pagination.type = data.type;
+        Pagination.limit = data.limit;
         Pagination.total_items = data.total_items;
         Pagination.size = data.size || 2;
         Pagination.page = data.page || 1;
@@ -1283,9 +1304,15 @@ var Pagination = {
         Pagination.Bind();
     },
 
+
     // find pagination type
     Start: function() {
-			Pagination.code = '<div class="foot-info tblAjax__footer__toolbar__info footer_pagination_menu_items"><p>Wiersze od 1 do ' + Pagination.total_items + ' z ' + Pagination.total_items + '</p></div>';
+			Pagination.code = '';
+			if ( Pagination.type === 'KONTRAHENCI' ) {
+				Pagination.code = '<div class="foot-info tblAjax__footer__toolbar__info footer_pagination_menu_items"><p>Wiersze od <span id="paginationShowNextCount-KONTRAHENCI"></span> do ' + Pagination.total_items + ' z ' + Pagination.total_items + '</p></div>';
+			} else if ( Pagination.type === 'PRACOWNICY' ) {
+					Pagination.code = '<div class="foot-info tblAjax__footer__toolbar__info footer_pagination_menu_items"><p>Wiersze od <span id="paginationShowNextCount-PRACOWNICY"></span> do ' + Pagination.total_items + ' z ' + Pagination.total_items + '</p></div>';
+			}
 			Pagination.code += '<nav aria-label="Page navigation" class="footer_pagination_menu_items"><ul class="btn-group tblAjax__footer__toolbar__pagination smad-pagination">';
 			Pagination.First();
 			Pagination.Prev();
@@ -1294,7 +1321,7 @@ var Pagination = {
 				if ( Pagination.type === 'KONTRAHENCI' ) {
 					Pagination.page = getItemLocalStorage('Bocian.biAuditForm.kontrahenci.pagination.page') || 1;
 				}
-				else if ( Pagination.type === 'PRACOWNICY' ){
+				else if ( Pagination.type === 'PRACOWNICY' ) {
 					Pagination.page = getItemLocalStorage('Bocian.biAuditForm.pracownicy.pagination.page') || 1;
 				}