moved field list to Bocian.php; fiels Pracownicy: removed perm fields, added jednostka_organizacyjna

tools/Bocian.php

@@ -8,6 +8,50 @@ Lib::loadClass('Request');
 // index.php?_route=UrlAction_BiAuditRaport  - uruchamia defaultAction
 class RouteTool_Bocian extends RouteToolBase {
 
+	public static $FIELD_LIST_PRACOWNICY = [
+		'ID',
+		'imiona',
+		'nazwisko',
+		'nip',
+		'pesel',
+		'regon',
+		'source',
+		'jednostka_organizacyjna',
+		'A_STATUS',
+		'A_STATUS_INFO',
+		'L_APPOITMENT_USER',
+		// 'Adresy' // 'default_db__x3A__BI_audit_ENERGA_PRACOWNICY_adresy:BI_audit_ENERGA_PRACOWNICY_adresy/*'
+	];
+	public static $FIELD_LIST_KONTRAHENCI = [
+		'ID',
+		'Nazwa_grupy_kapitalowej',
+		'Pelna_nazwa_kontrahenta',
+		'Numer_kontrahenta',
+		'Skrocona_Nazwa_Kontrahenta',
+		'Typ_kontrahenta',
+		'NIP',
+		'KRS',
+		'REGON',
+		'PESEL',
+		'Forma_prawna_dzialalnosci',
+		'Ulica',
+		'Numer_budynku',
+		'Numer_mieszkania_lokalu',
+		'Miejscowosc',
+		'Kod_pocztowy',
+		'Kraj',
+		'Telefon',
+		'Fax',
+		'Mail',
+		'A_ADM_COMPANY',
+		'A_CLASSIFIED',
+		'Dodano',
+		'Podmiot_dominujacy',
+		'Tytul_dokumentu',
+		'ownCompany',
+		'uwagi',
+	];
+
 	public function defaultAction() {
 		UI::gora();
 		echo UI::h('script', ['src'=>"static/sweetalert2.min.js"]);
@@ -40,6 +84,17 @@ class RouteTool_Bocian extends RouteToolBase {
 			'URL_FORM_DATA_CSV_FILE_AJAX' => $this->getLink('formDataCsvFileAjax'),
 			'URL_SAVE_FORM_CSV_FILE_AJAX' => $this->getLink('saveFormCsvFileAjax'),
 			'URL_TABLE_POWIAZANIA' => Router::getRoute('ViewTableAjax', [ 'namespace' => "default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA" ]),
+			'FIELD_LIST_PRACOWNICY' => array_merge(
+				array_map(function ($fieldName) {
+					return "f_{$fieldName}";
+				}, self::$FIELD_LIST_PRACOWNICY),
+				[
+					'f_Adresy',
+				]
+			),
+			'FIELD_LIST_KONTRAHENCI' => array_map(function ($fieldName) {
+				return "f_{$fieldName}";
+			}, self::$FIELD_LIST_KONTRAHENCI),
 		]);
 
 		echo '</div>'; // #smad-wrapper
@@ -635,6 +690,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 
 
 	public function showTableKontrahenci($labels = []) {
+		// TODO: use self::$FIELD_LIST_KONTRAHENCI
 		$view = '<form class="form-horizontal" method="post">
 						<table class="table table-bordered table-hover table-striped" height=5>
 									 <thead>
@@ -924,21 +980,9 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 
 		$acl = ACL::getAclByNamespace('default_db/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY');
 		$query = $acl->buildQuery(array_merge([
-			'cols' => [
-				'ID',
-				'imiona',
-				'nazwisko',
-				'nip',
-				'pesel',
-				'regon',
-				'source',
-				'A_ADM_COMPANY',
-				'A_CLASSIFIED',
-				'A_STATUS',
-				'A_STATUS_INFO',
-				'L_APPOITMENT_USER',
+			'cols' => array_merge(self::$FIELD_LIST_PRACOWNICY, [
 				'default_db__x3A__BI_audit_ENERGA_PRACOWNICY_adresy:BI_audit_ENERGA_PRACOWNICY_adresy/*'
-			],
+			]),
 			//'f_ID' => $id,
 			'limit' => $limit,
 			'limitstart' => $limitstart, // offset
@@ -990,6 +1034,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 
 
 	public function showTablePracownicy($labels = []) {
+		// TODO: use self::$FIELD_LIST_PRACOWNICY
 			$view = '<form class="form-horizontal" method="post">
 							<table class="table table-responsive table-bordered table-hover table-striped" height=5>
 										 <thead>
@@ -1002,8 +1047,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 													<td>' . V::get('pesel', 'Pesel', $labels) . '</td>
 													<td>' . V::get('regon', 'Regon', $labels) . '</td>
 													<td>' . V::get('source', 'source', $labels) . '</td>
-													<td>' . V::get('A_ADM_COMPANY', 'A_ADM_COMPANY', $labels) . '</td>
-													<td>' . V::get('A_CLASSIFIED', 'A_CLASSIFIED', $labels) . '</td>
+													<td>' . V::get('jednostka_organizacyjna', 'jednostka_organizacyjna', $labels) . '</td>
 													<td>' . V::get('A_STATUS', 'A_STATUS', $labels) . '</td>
 													<td>' . V::get('A_STATUS_INFO', 'A_STATUS_INFO', $labels) . '</td>
 													<td>' . V::get('L_APPOITMENT_USER', 'L_APPOITMENT_USER', $labels) . '</td>
@@ -1018,8 +1062,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_pesel" value="" placeholder="%"></td>
 												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_regon" value="" placeholder="%"></td>
 												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_source" value="" placeholder="%"></td>
-												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_A_ADM_COMPANY" value="" placeholder="%"></td>
-												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_A_CLASSIFIED" value="" placeholder="%"></td>
+												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_jednostka_organizacyjna" value="" placeholder="%"></td>
 												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_A_STATUS" value="" placeholder="%"></td>
 												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_A_STATUS_INFO" value="" placeholder="%"></td>
 												<td style="padding:0"><input style="padding:2px 8px; width:100%" onChange="return onChangeFiltersPracownicy(this)" type="text" name="f_L_APPOITMENT_USER" value="" placeholder="%"></td>

tools/Bocian.php.view.js

@@ -3,51 +3,8 @@ if (!URL_TABLE_POWIAZANIA) throw "Brak URL_TABLE_POWIAZANIA";
 if (!BASE_URLS) throw "Brak BASE_URLS"
 
 var RECORD_MORE_FUNCTIONS_OPENED_NODE = null;
-
-var FIELD_LIST_PRACOWNICY = [
-	'f_ID',
-	'f_imiona',
-	'f_nazwisko',
-	'f_nip',
-	'f_pesel',
-	'f_regon',
-	'f_source',
-	'f_A_ADM_COMPANY',
-	'f_A_CLASSIFIED',
-	'f_A_STATUS',
-	'f_A_STATUS_INFO',
-	'f_L_APPOITMENT_USER',
-	'f_Adresy',
-]
-var FIELD_LIST_KONTRAHENCI = [
-	'f_ID',
-	'f_Nazwa_grupy_kapitalowej',
-	'f_Pelna_nazwa_kontrahenta',
-	'f_Numer_kontrahenta',
-	'f_Skrocona_Nazwa_Kontrahenta',
-	'f_Typ_kontrahenta',
-	'f_NIP',
-	'f_KRS',
-	'f_REGON',
-	'f_PESEL',
-	'f_Forma_prawna_dzialalnosci',
-	'f_Ulica',
-	'f_Numer_budynku',
-	'f_Numer_mieszkania_lokalu',
-	'f_Miejscowosc',
-	'f_Kod_pocztowy',
-	'f_Kraj',
-	'f_Telefon',
-	'f_Fax',
-	'f_Mail',
-	'f_A_ADM_COMPANY',
-	'f_A_CLASSIFIED',
-	'f_Dodano',
-	'f_Podmiot_dominujacy',
-	'f_Tytul_dokumentu',
-	'f_ownCompany',
-	'f_uwagi',
-]
+if (!FIELD_LIST_PRACOWNICY) throw "Brak FIELD_LIST_PRACOWNICY"
+if (!FIELD_LIST_KONTRAHENCI) throw "Brak FIELD_LIST_KONTRAHENCI"
 
 $(window).on('hashchange', function() {
 	initLocalStorage();
@@ -903,7 +860,10 @@ function urlFetchPracownicy(page) {
 
 			var frm = document.getElementById('filtersFieldRemoveBtn-PRACOWNICY').form
 			var fieldNameList = FIELD_LIST_PRACOWNICY
-			var filterFields = fieldNameList.map(function (fieldName) {
+			var filterFields = fieldNameList.filter(function (fieldName) {
+				if (!frm[fieldName]) console.log('Err missing field: "'+fieldName+'"')
+				return (frm[fieldName]) ? true : false
+			}).map(function (fieldName) {
 				return [ fieldName, frm[fieldName].value ]
 			}).filter(function (filter) {
 				return ( filter[1].length > 0 )
@@ -941,8 +901,7 @@ function urlFetchPracownicy(page) {
 							'<td align="right">' + ( row["pesel"] || '' ) + '</td>' +
 							'<td align="right">' + ( row["regon"] || '' ) + '</td>' +
 							'<td align="right">' + ( row["source"] || '' ) + '</td>' +
-							'<td align="right">' + ( row["A_ADM_COMPANY"] || '' ) + '</td>' +
-							'<td align="right">' + ( row["A_CLASSIFIED"] || '' ) + '</td>' +
+							'<td align="right">' + ( row["jednostka_organizacyjna"] || '' ) + '</td>' +
 							'<td align="right">' + ( row["A_STATUS"] || '' ) + '</td>' +
 							'<td align="right">' + ( row["A_STATUS_INFO"] || '' ) + '</td>' +
 							'<td align="right">' + ( row["L_APPOITMENT_USER"] || '' ) + '</td>' +