Browse Source

- change default value onlyTarget: 'YES'
- home page set default params

dariusz.andryskowski 7 years ago
parent
commit
88b5ab7a63
3 changed files with 12 additions and 15 deletions
  1. 2 0
      theme/view/home.php
  2. 2 2
      tools/Bocian.php
  3. 8 13
      tools/Bocian.php.view.js

+ 2 - 0
theme/view/home.php

@@ -124,6 +124,8 @@ function clearBIAuditFormLocalStorage() {
   setItemLocalStorage('Bocian.biAuditForm.kontrahenciIds', arrayValue);
   setItemLocalStorage('Bocian.biAuditForm.pracownicy.filterIdGroup', 0);
   setItemLocalStorage('Bocian.biAuditForm.kontrahenci.filterIdGroup', 0);
+  setItemLocalStorage('Bocian.biAuditForm.analizaOnlyTargets', 'y');
+
 }
 window.delayUpdate = delayUpdate;
 </script>

+ 2 - 2
tools/Bocian.php

@@ -1547,7 +1547,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 
 					$formSmadDepth = '<input type="text" class="form-control smad-depth-kontrahenci" placeholder="1-16" value="" />';
 
-					$formSmadSelectTarget = '<select class="form-control" id="smad-select-target-kontrahenci"><option value="n">nie</option><option value="y">tak</option></select>';
+					$formSmadSelectTarget = '<select class="form-control" id="smad-select-target-kontrahenci"><option value="y">tak</option><option value="n">nie</option></select>';
 
 					$formFilterHeadTitle = '<h2 class="title" id="smad-filter-head-title-kontrahenci">Wszyscy</h2>';
 					$formFilterHeadDesc = '<p>Liczba pozycji na liście: <span id="smad-filter-desc-kontrahenci">0</span></p>';
@@ -1592,7 +1592,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 
 					$formSmadDepth = '<input type="text" class="form-control smad-depth" placeholder="1-16" value="" />';
 
-					$formSmadSelectTarget = '<select class="form-control" id="smad-select-target"><option value="n">nie</option><option value="y">tak</option></select>';
+					$formSmadSelectTarget = '<select class="form-control" id="smad-select-target"><option value="y">tak</option><option value="n">nie</option></select>';
 
 					$formFilterHeadTitle = '<h2 class="title" id="smad-filter-head-title-pracownicy">Wszyscy</h2>';
 					$formFilterHeadDesc = '<p>Liczba pozycji na liście: <span id="smad-filter-desc-pracownicy">0</span></p>';

+ 8 - 13
tools/Bocian.php.view.js

@@ -61,7 +61,7 @@ function updateLocalStorageBiAuditDepth(idInput) {
 			loadCurrentDepthInInput('.smad-depth-kontrahenci');
 
 			// check depth value
-			if ( parseInt(newValue) > 4 ) {
+			if ( parseInt(newValue) > 6 ) {
 				// check count praconwicy/kontrahenci
 					var formItemsPraconwicyKontrahenci = countChoiseItemsPraconwicyKontrahenci();
 
@@ -170,9 +170,7 @@ function initLocalStorage() {
 	}
 
 	if (getItemLocalStorage('Bocian.biAuditForm.analizaOnlyTargets') === null) {
-		setItemLocalStorage('Bocian.biAuditForm.analizaOnlyTargets', 'n');
-		 //updateLocalStorageBiAuditOnlyTargets('#smad-select-target-kontrahenci');
-		 //updateLocalStorageBiAuditOnlyTargets('#smad-select-target-kontrahenci');
+		setItemLocalStorage('Bocian.biAuditForm.analizaOnlyTargets', defaultOnlyTarger);
 	}
 }
 
@@ -281,9 +279,6 @@ function saveFormCsvFileAjaxAction(enumType) {
 	formDataFrom = formDataFrom.replace(/%5B/g,"[");
 	formDataFrom = formDataFrom.replace(/%5D/g,"]");
 
-//var formDataFrom =	$("#formDataFromCsv").serializeArray();
-console.log('dane z formularza formDataFrom ', formDataFrom );
-
 	fetch(URL_SAVE_FORM_CSV_FILE_AJAX, {
 	  method: 'POST',
 		credentials: 	'same-origin',
@@ -320,7 +315,7 @@ function defaultBIAuditLocalStorage() {
 	setItemLocalStorage('Bocian.biAuditForm.pracownicy.filterIdGroup', 0);
 	setItemLocalStorage('Bocian.biAuditForm.kontrahenci.filterIdGroup', 0);
 	setItemLocalStorage('Bocian.biAuditForm.depth', 7);
-	setItemLocalStorage('Bocian.biAuditForm.analizaOnlyTargets', 'n');
+	setItemLocalStorage('Bocian.biAuditForm.analizaOnlyTargets', defaultOnlyTarger);
 }
 
 
@@ -502,6 +497,7 @@ function addPracownikToGroup(event) {
 		//TODO: pIOTRKU CZY TU POWINIENEM COŚ JESZCZE OBSŁUŻYĆ
 	});
 }
+
 function addPracownikAllToGroup(event) {
 	event.preventDefault();
 
@@ -883,11 +879,11 @@ function createGroupPracownicy(event) {
 
 
 function rootChangeForm() {
+
 //todo: do przeniesienia
 urlFetchKontrahenciPowiazania();
 	var valueUrl = global.location.hash;
 
-
 	switch (valueUrl) {
 		case '#KONTRAHENCI':
 			$( ".container-bi_audit_form_kontrahenci_raport" ).html( VIEW_KONTRAHENCI );
@@ -978,7 +974,6 @@ function getNameGroupById(store, filterIdGroup) {
 	}
 
 	return NAZWA;
-
 }
 
 
@@ -1707,7 +1702,6 @@ function clearListLocalStorageByType(typeNameLocalStorage) {
 
 	if (typeNameLocalStorage === 'kontrahenci') {
 		setItemLocalStorage('Bocian.biAuditForm.kontrahenciIds', []);
-
 	}
 	// update count selected item
 	updateCountItemCheckedByType(typeNameLocalStorage);
@@ -1765,7 +1759,7 @@ function updateTopCounters() {
 		$('.smad-generate-reaport-button').addClass('disabled');
 	} else {
 
-		if ( ( totalPracownicy === 0 || totalKontrahenci === 0 ) && parseInt(depthValue) > 4) {
+		if ( ( totalPracownicy === 0 || totalKontrahenci === 0 ) && parseInt(depthValue) > 6) {
 			$('.bottom--message-warning-critical-search').text(messageCriticalSearchData);
 			console.log('dodanie komunikatu niżej');
 		} else {
@@ -2190,4 +2184,5 @@ global.parseCsvFile = parseCsvFile;
 global.clearListLocalStorageByType = clearListLocalStorageByType;
 
 // message
-global.messageCriticalSearchData = 'Krytyczne wielkości danych do przeszukania. Optymalna wartość głębokość szukania powiaząń to: 4';
+global.messageCriticalSearchData = 'Krytyczne wielkości danych do przeszukania. Optymalna wartość głębokość szukania powiaząń to: 6';
+global.defaultOnlyTarger = 'y';