added field labels from Zasoby

tools/Bocian.php

@@ -634,39 +634,39 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 	}
 
 
-	public function showTableKontrahenci($items) {
+	public function showTableKontrahenci($labels = []) {
 		$view = '<form class="form-horizontal" method="post">
 						<table class="table table-bordered table-hover table-striped" height=5>
 									 <thead>
 										 <tr>
 												<td width=1><input type="checkbox" name="checkAll" id="checkAll-KONTRAHENCI" /></td>
-											 <td width=1>ID</td>
-											 <td>Nazwa grupy kapitalowej</td>
-											 <td>Pelna nazwa kontrahenta</td>
-											 <td>Numer kontrahenta</td>
-											 <td>Skrócona nazwa kontrahenta</td>
-											 <td>Typ_kontrahenta</td>
-											 <td>NIP</td>
-											 <td>KRS</td>
-											 <td>Regon</td>
-											 <td>PESEL</td>
-											 <td>Forma prawna działalności</td>
-											 <td>Ulica</td>
-											 <td>Numer budynku</td>
-											 <td>Numer mieszkania lokalu</td>
-											 <td>Miejscowosc</td>
-											 <td>Kod pocztowy</td>
-											 <td>Kraj</td>
-											 <td>Telefon</td>
-											 <td>Fax</td>
-											 <td>Mail</td>
-											 <td>A_ADM_COMPANY</td>
-											 <td>A_CLASSIFIED</td>
-											 <td>Dodano</td>
-											 <td>Podmiot dominujacy</td>
-											 <td>Tytul dokumentu</td>
-											 <td>ownCompany</td>
-											 <td>uwagi</td>
+												<td width=1>' . V::get('ID', 'ID', $labels) . '</td>
+												<td>' . V::get('Nazwa_grupy_kapitalowej', 'Nazwa grupy kapitalowej', $labels) . '</td>
+												<td>' . V::get('Pelna_nazwa_kontrahenta', 'Pelna nazwa kontrahenta', $labels) . '</td>
+												<td>' . V::get('Numer_kontrahenta', 'Numer kontrahenta', $labels) . '</td>
+												<td>' . V::get('Skrocona_Nazwa_Kontrahenta', 'Skrócona nazwa kontrahenta', $labels) . '</td>
+												<td>' . V::get('Typ_kontrahenta', 'Typ_kontrahenta', $labels) . '</td>
+												<td>' . V::get('NIP', 'NIP', $labels) . '</td>
+												<td>' . V::get('KRS', 'KRS', $labels) . '</td>
+												<td>' . V::get('REGON', 'Regon', $labels) . '</td>
+												<td>' . V::get('PESEL', 'PESEL', $labels) . '</td>
+												<td>' . V::get('Forma_prawna_dzialalnosci', 'Forma prawna działalności', $labels) . '</td>
+												<td>' . V::get('Ulica', 'Ulica', $labels) . '</td>
+												<td>' . V::get('Numer_budynku', 'Numer budynku', $labels) . '</td>
+												<td>' . V::get('Numer_mieszkania_lokalu', 'Numer mieszkania lokalu', $labels) . '</td>
+												<td>' . V::get('Miejscowosc', 'Miejscowosc', $labels) . '</td>
+												<td>' . V::get('Kod_pocztowy', 'Kod pocztowy', $labels) . '</td>
+												<td>' . V::get('Kraj', 'Kraj', $labels) . '</td>
+												<td>' . V::get('Telefon', 'Telefon', $labels) . '</td>
+												<td>' . V::get('Fax', 'Fax', $labels) . '</td>
+												<td>' . V::get('Mail', 'Mail', $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('Dodano', 'Dodano', $labels) . '</td>
+												<td>' . V::get('Podmiot_dominujacy', 'Podmiot dominujacy', $labels) . '</td>
+												<td>' . V::get('Tytul_dokumentu', 'Tytul dokumentu', $labels) . '</td>
+												<td>' . V::get('ownCompany', 'ownCompany', $labels) . '</td>
+												<td>' . V::get('uwagi', 'uwagi', $labels) . '</td>
 										 </tr>
 										 <tr>
 											<td style="padding:0" width=1><button style="padding:5px" id="filtersFieldRemoveBtn-KONTRAHENCI" onClick="return removeFiltersKontrahenci(event, this)" title="Kasuj filtry" class="btn btn-xs btn-link glyphicon glyphicon-remove"></button></td>
@@ -989,25 +989,25 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 
 
 
-	public function showTablePracownicy() {
+	public function showTablePracownicy($labels = []) {
 			$view = '<form class="form-horizontal" method="post">
 							<table class="table table-responsive table-bordered table-hover table-striped" height=5>
 										 <thead>
 											 <tr>
 											 		<td width=1><input type="checkbox" name="checkAll" id="checkAll-PRACOWNICY" /></td>
-												 <td width=1>ID</td>
-												 <td>Imię/Imiona</td>
-												 <td>Nazwisko</td>
-												 <td>NIP</td>
-												 <td>Pesel</td>
-												 <td>Regon</td>
-												 <td>source</td>
-												 <td>A_ADM_COMPANY</td>
-												 <td>A_CLASSIFIED</td>
-												 <td>A_STATUS</td>
-												 <td>A_STATUS_INFO</td>
-												 <td>L_APPOITMENT_USER</td>
-												 <td>Adresy</td>
+													<td width=1>' . V::get('ID', 'ID', $labels) . '</td>
+													<td>' . V::get('imiona', 'Imię/Imiona', $labels) . '</td>
+													<td>' . V::get('nazwisko', 'Nazwisko', $labels) . '</td>
+													<td>' . V::get('nip', 'NIP', $labels) . '</td>
+													<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('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>
+													<td>' . V::get('Adresy', 'Adresy', $labels) . '</td>
 											 </tr>
 											 <tr>
 												<td style="padding:0" width=1><button style="padding:5px" id="filtersFieldRemoveBtn-PRACOWNICY" onClick="return removeFiltersPracownicy(event, this)" title="Kasuj filtry" class="btn btn-xs btn-link glyphicon glyphicon-remove"></button></td>
@@ -1218,12 +1218,12 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 	}
 
 
-		/**
-		* Widok formularza dodawania pracowników i kontrahentów
-		*/
-		public function defaultViewFormBiAudit($items, $type) {
-
-	$activeFormSteps = '';
+	/**
+	* Widok formularza dodawania pracowników i kontrahentów
+	*/
+	public function defaultViewFormBiAudit($items, $type) {
+		$activeFormSteps = '';
+		$fieldLabels = [];
 
 		switch($type) {
 				case 'KONTRAHENCI':
@@ -1257,6 +1257,16 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 					$showButtonNextStep = '<button type="button" class="btn btn-primary" onClick="generateBiAuditRaport(event)" id="button-generate-reaport">SZUKAJ POWIĄZAŃ</button>';
 
 					$pagination_form = '<div id="pagination-kontrahenci"></div>';
+
+					$acl = ACL::getAclByNamespace("default_db/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI");
+					$fieldList = $acl->getRealFieldList();
+					$fieldLabels = array_combine(
+						$fieldList,
+						array_map(function ($fieldName) use ($acl) {
+							return $acl->getFieldLabel($fieldName);
+						}, $fieldList)
+					);
+					DBG::log($fieldLabels, 'array', "fieldLabels (KONTRAHENCI)");
 				break;
 
 				case 'PRACOWNICY':
@@ -1288,7 +1298,16 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 
 					$pagination_form = '<div id="pagination-pracownicy"></div>';
 
-					break;
+					$acl = ACL::getAclByNamespace("default_db/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY");
+					$fieldList = $acl->getRealFieldList();
+					$fieldLabels = array_combine(
+						$fieldList,
+						array_map(function ($fieldName) use ($acl) {
+							return $acl->getFieldLabel($fieldName);
+						}, $fieldList)
+					);
+					DBG::log($fieldLabels, 'array', "fieldLabels (PRACOWNICY)");
+				break;
 		}
 
 
@@ -1404,7 +1423,7 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 			</div>
 			<div class="container-fluid">
 					<div class="table-responsive padding-0" id="smad-table-' . $type . '">
-							' . $this->showListDataByType($items, $type) . '
+							' . $this->showListDataByType($items, $type, $fieldLabels) . '
 					</div>
 			</div>
 			<!-- end:list employees -->
@@ -1435,14 +1454,14 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 		}
 
 
-	public function showListDataByType($items, $type='PRACOWNICY') {
+	public function showListDataByType($items, $type='PRACOWNICY', $labels) {
 
 			switch ($type) {
 				case 'PRACOWNICY':
-					return $this->showTablePracownicy();
+					return $this->showTablePracownicy($labels);
 					break;
 				case 'KONTRAHENCI':
-					return $this->showTableKontrahenci($items);
+					return $this->showTableKontrahenci($labels);
 					break;
 			}
 	}

tools/Bocian.php.view.js

@@ -766,32 +766,32 @@ function urlFetchKontrahenci(page) {
 						data.body.items.forEach (function(row) {
 							listItemsKontrahenci += '<tr><td><input type="checkbox" name="kontrID[]" value="'+row['ID']+'" /></td>'+
 								'<td align="right">'+row["ID"]+'</td>'+
-								'<td align="right">'+row["Nazwa_grupy_kapitalowej"]+'</td>'+
-								'<td align="right">'+row["Pelna_nazwa_kontrahenta"]+'</td>'+
-								'<td align="right">'+row["Numer_kontrahenta"]+'</td>'+
-								'<td align="right">'+row["Skrocona_Nazwa_Kontrahenta"]+'</td>'+
-								'<td align="right">'+row["Typ_kontrahenta"]+'</td>'+
-								'<td align="right">'+row["NIP"]+'</td>'+
-								'<td align="right">'+row["KRS"]+'</td>'+
-								'<td align="right">'+row["REGON"]+'</td>'+
-								'<td align="right">'+row["PESEL"]+'</td>'+
-								'<td align="right">'+row["Forma_prawna_dzialalnosci"]+'</td>'+
-								'<td align="right">'+row["Ulica"]+'</td>'+
-								'<td align="right">'+row["Numer_budynku"]+'</td>'+
-								'<td align="right">'+row["Numer_mieszkania_lokalu"]+'</td>'+
-								'<td align="right">'+row["Miejscowosc"]+'</td>'+
-								'<td align="right">'+row["Kod_pocztowy"]+'</td>'+
-								'<td align="right">'+row["Kraj"]+'</td>'+
-								'<td align="right">'+row["Telefon"]+'</td>'+
-								'<td align="right">'+row["Fax"]+'</td>'+
-								'<td align="right">'+row["Mail"]+'</td>'+
-								'<td align="right">'+row["A_ADM_COMPANY"]+'</td>'+
-								'<td align="right">'+row["A_CLASSIFIED"]+'</td>'+
-								'<td align="right">'+row["Dodano"]+'</td>'+
-								'<td align="right">'+row["Podmiot_dominujacy"]+'</td>'+
-								'<td align="right">'+row["Tytul_dokumentu"]+'</td>'+
-								'<td align="right">'+row["ownCompany"]+'</td>'+
-								'<td align="right">'+row["uwagi"]+'</td></tr>';
+								'<td align="right">' + ( row["Nazwa_grupy_kapitalowej"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Pelna_nazwa_kontrahenta"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Numer_kontrahenta"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Skrocona_Nazwa_Kontrahenta"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Typ_kontrahenta"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["NIP"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["KRS"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["REGON"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["PESEL"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Forma_prawna_dzialalnosci"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Ulica"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Numer_budynku"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Numer_mieszkania_lokalu"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Miejscowosc"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Kod_pocztowy"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Kraj"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Telefon"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Fax"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Mail"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["A_ADM_COMPANY"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["A_CLASSIFIED"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Dodano"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Podmiot_dominujacy"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["Tytul_dokumentu"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["ownCompany"] || '' ) + '</td>' +
+								'<td align="right">' + ( row["uwagi"] || '' ) + '</td></tr>';
 						});
 
 				if (data.body.pagination !== undefined) {
@@ -925,17 +925,17 @@ function urlFetchPracownicy(page) {
 
 						listItemsPracownik += '<tr><td><input type="checkbox" name="prID[]" value="'+row['ID']+'" /></td>'+
 							'<td align="right">'+row["ID"]+'</td>'+
-							'<td align="right">'+row["imiona"]+'</td>'+
-							'<td align="right">'+row["nazwisko"]+'</td>'+
-							'<td align="right">'+row["nip"]+'</td>'+
-							'<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["A_STATUS"]+'</td>'+
-							'<td align="right">'+row["A_STATUS_INFO"]+'</td>'+
-							'<td align="right">'+row["L_APPOITMENT_USER"]+'</td>'+
+							'<td align="right">' + ( row["imiona"] || '' ) + '</td>' +
+							'<td align="right">' + ( row["nazwisko"] || '' ) + '</td>' +
+							'<td align="right">' + ( row["nip"] || '' ) + '</td>' +
+							'<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["A_STATUS"] || '' ) + '</td>' +
+							'<td align="right">' + ( row["A_STATUS_INFO"] || '' ) + '</td>' +
+							'<td align="right">' + ( row["L_APPOITMENT_USER"] || '' ) + '</td>' +
 							'<td align="right">'+ addresPerson +'</td></tr>';
 					});