fixed labels

theme/view/home.php

@@ -18,9 +18,11 @@
                     <div class="menu-items text-center">
                         <div class="menu-item">
                             <a href="index.php?_route=UrlAction_Bocian#PRACOWNICY" title="Pracownicy">
-                                <div>OSOBY</div>
-                                <img src="<?= $this->asset("assets/images/button-red.png"); ?>" alt="Osoby" onmouseover="this.src='<?= $this->asset("assets/images/button-red-border.png"); ?>'" onmouseout="this.src='<?= $this->asset("assets/images/button-red.png"); ?>'"
- />
+                                <div>Pracownicy</div>
+                                <img src="<?= $this->asset("assets/images/button-red.png"); ?>"
+                                  alt="Pracownicy"
+                                  onmouseover="this.src='<?= $this->asset("assets/images/button-red-border.png"); ?>'"
+                                  onmouseout="this.src='<?= $this->asset("assets/images/button-red.png"); ?>'" />
                             </a>
                         </div>
                     </div>
@@ -29,9 +31,11 @@
                     <div class="menu-items text-center">
                         <div class="menu-item">
                             <a href="index.php?_route=UrlAction_Bocian#KONTRAHENCI" title="Kontrahenci">
-                                <div>PODMIOTY/ <br> KONTRAHENCI</div>
-                                <img src="<?= $this->asset("assets/images/button-red.png"); ?>" alt="Podmioty/Kontrahenci" onmouseover="this.src='<?= $this->asset("assets/images/button-red-border.png"); ?>'" onmouseout="this.src='<?= $this->asset("assets/images/button-red.png"); ?>'"
- />
+                                <div>Kontrahenci</div>
+                                <img src="<?= $this->asset("assets/images/button-red.png"); ?>"
+                                  alt="Kontrahenci"
+                                  onmouseover="this.src='<?= $this->asset("assets/images/button-red-border.png"); ?>'"
+                                  onmouseout="this.src='<?= $this->asset("assets/images/button-red.png"); ?>'" />
                             </a>
                         </div>
                     </div>

theme/view/top.php

@@ -237,8 +237,8 @@
                                 <li><a href="<?php echo Request::getPathUri(); ?>index.php?_route=ViewTableAjax&namespace=default_db/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI" title="RUM Kontrahenci" class="btn btn-success">RUM/k</a></li>
 
                                 <li><a href="<?php echo Request::getPathUri(); ?>index.php?_route=ViewTableAjax&namespace=default_db/BI_audit_ENERGA_FAKTURY/BI_audit_ENERGA_FAKTURY" title="Faktury - do imoportowania" class="btn btn-success">Faktury</a></li>
-																<li><a href="<?php echo Request::getPathUri(); ?>index.php?_route=UrlAction_Bocian#PRACOWNICY" title="OSOBY" class="btn btn-success">OSOBY</a></li>
-																<li><a href="<?php echo Request::getPathUri(); ?>index.php?_route=UrlAction_Bocian#KONTRAHENCI" title="KONTRAHENCI" class="btn btn-success">KONTRAHENCI</a></li>
+																<li><a href="<?php echo Request::getPathUri(); ?>index.php?_route=UrlAction_Bocian#PRACOWNICY" title="Pracownicy" class="btn btn-success">Pracownicy</a></li>
+																<li><a href="<?php echo Request::getPathUri(); ?>index.php?_route=UrlAction_Bocian#KONTRAHENCI" title="Kontrahenci" class="btn btn-success">Kontrahenci</a></li>
 
                                 <!--<li><a href="#" title="KSIĘGOWOŚĆ" class="btn btn-success">KSIĘGOWOŚĆ</a></li> -->
                             </ul>

tools/Bocian.php

@@ -2896,11 +2896,6 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 
 		switch($type) {
 				case 'KONTRAHENCI':
-
-					$activeFormStepsKontrahent = 'complete';
-
-					$titleHeader = 'KONTRAHENCI/PODMIOTY';
-
 					$groupFilterList = '
 					<div class="menu-item">
 							<ul class="padding-0">
@@ -2947,11 +2942,6 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 				break;
 
 				case 'OPERACYJNA_BAZA_ZGLOSZEN':
-
-					$activeFormStepsKontrahent = 'complete';
-
-					$titleHeader = 'KONTRAHENCI/PODMIOTY';
-
 					$groupFilterList = '
 					<div class="menu-item">
 							<ul class="padding-0">
@@ -2998,8 +2988,6 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 				break;
 
 				case 'PRACOWNICY':
-					$titleHeader = 'OSOBY';
-
 					$groupFilterList = '
 					<div class="menu-item">
 							<ul class="padding-0">
@@ -3047,189 +3035,193 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 		}
 
 
-			$view = '
-			<!-- start:employees-section-->
-			<div id="smad-employees-section" class="smad-form-' . $type . '" >
-				<div class="container-fluid">
-					<div>
-							<div class="padding-lr-0">
-									<div id="smad-menu-section">
-											<div class="col-sm-12 col-md-6 padding-lr-0">
-													<div class="menu-items">
-															<div class="smad-heder-title menu-item"><span class="smad-line-red">|</span> ' . $titleHeader . ' </div>
-													</div>
-											</div>
-											<div class="col-sm-12 col-md-6 padding-lr-0">
-													<div class="form-steps">
-															<!-- start:form steps wizard -->
-															<div class="row smad-wizard" style="border-bottom:0;">
-																	<div class="col-xs-4 col-md-4 smad-wizard-step complete"><!-- complited line -->
-																			<div class="text-center smad-wizard-stepnum">&nbsp;</div>
-																			<div class="progress"><div class="progress-bar"></div></div>
-																			<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">OSOBY <span class="top--count-selected-item-pracownicy"></span></div>
-																			</div>
-																	</div>
-
-																	<div class="col-xs-4 col-md-4 smad-wizard-step ' . $activeFormStepsKontrahent . ' ">
-																			<div class="text-center smad-wizard-stepnum">&nbsp;</div>
-																			<div class="progress"><div class="progress-bar"></div></div>
-																			<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">PODMIOTY/<BR />KONTRAHENCI <span class="top--count-selected-item-kontrahenci"></span></div>
-																			</div>
-																	</div>
-
-																	<div class="col-xs-4 col-md-4 smad-wizard-step ">
-																			<div class="text-center smad-wizard-stepnum">&nbsp;</div>
-																			<div class="progress"><div class="progress-bar"></div></div>
-																			<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>
-																	</div>
-															</div>
-															<!-- end:form steps wizard -->
-													</div>
-											</div>
-									</div>
-							</div>
-					</div>
-			</div>
+		$outLinkOD = $this->getLink() . "#PRACOWNICY";
+		$outLinkDO = $this->getLink() . "#KONTRAHENCI";
+		$outStepOdCompleted = 'complete';
+		$outStepDoCompleted = '';
+		switch ($type) {
+			case 'KONTRAHENCI': $outStepDoCompleted = 'complete'; break;
+			case 'OPERACYJNA_BAZA_ZGLOSZEN': $outStepDoCompleted = 'complete'; break;
+		}
+		$outHeaderTitle = '';
+		switch ($type) {
+				case 'KONTRAHENCI': $outHeaderTitle = 'Kontrahenci'; break;
+				case 'OPERACYJNA_BAZA_ZGLOSZEN': $outHeaderTitle = 'KONTRAHENCI/PODMIOTY'; break;
+				case 'PRACOWNICY': $outHeaderTitle = 'Pracownicy'; break;
+		}
 
-			<div class="container-fluid">
+		$view = '';
+		$view .= '<div id="smad-employees-section" class="smad-form-' . $type . '" >';
+		$view .= '	<div class="container-fluid">';
+		$view .= '		<div id="smad-menu-section">';
+		$view .= '
+										<div class="col-sm-12 col-md-6 padding-lr-0">
+												<div class="menu-items">
+														<div class="smad-heder-title menu-item"><span class="smad-line-red">|</span> ' . $outHeaderTitle . ' </div>
+												</div>
+										</div>
+		';
+		$view .= '			<div class="col-sm-12 col-md-6 padding-lr-0">';
+		$view .= '				<div class="form-steps">';
+		// start:form steps wizard
+		$view .= '					<div class="row smad-wizard" style="border-bottom:0;">';
+		// <div class="step-item"><a href="' . $outLinkOD . '">Krok 1</a></div>
+		// <div class="step-title">Pracownicy <span class="top--count-selected-item-pracownicy"></span></div>
+		$view .= '
+			<div class="col-xs-4 col-md-4 smad-wizard-step '.$outStepOdCompleted.'">
+				<div class="text-center smad-wizard-stepnum">&nbsp;</div>
+				<div class="progress"><div class="progress-bar"></div></div>
+				<a href="' . $outLinkOD . '" class="smad-wizard-dot"></a>
+				<div class="smad-wizard-info complete text-center">
+					<div class="step-item"><a href="' . $outLinkOD . '">Pracownicy <span class="top--count-selected-item-pracownicy"></span></a></div>
+				</div>
+			</div>
+		';
+		// <div class="step-item"><a href="' . $outLinkDO . '">Krok 2</a></div>
+		// <div class="step-title">Kontrahenci <span class="top--count-selected-item-kontrahenci"></span></div>
+		$view .= '
+			<div class="col-xs-4 col-md-4 smad-wizard-step ' . $outStepDoCompleted . ' ">
+				<div class="text-center smad-wizard-stepnum">&nbsp;</div>
+				<div class="progress"><div class="progress-bar"></div></div>
+				<a href="' . $outLinkDO . '" class="smad-wizard-dot"></a>
+				<div class="smad-wizard-info  text-center">
+					<div class="step-item"><a href="' . $outLinkDO . '">Kontrahenci <span class="top--count-selected-item-kontrahenci"></span></a></div>
+				</div>
+			</div>
+		';
+		// <div class="step-item">Krok 3</div>
+		// <div class="step-title">Szukanie powiązań</div>
+		$view .= '
+			<div class="col-xs-4 col-md-4 smad-wizard-step ">
+				<div class="text-center smad-wizard-stepnum">&nbsp;</div>
+				<div class="progress"><div class="progress-bar"></div></div>
+				<a href="#" class="smad-wizard-dot"></a>
+				<div class="smad-wizard-info  text-center">
+					<div class="step-item">Szukanie powiązań</div>
+				</div>
+			</div>
+		';
+		$view .= '					</div>'; // .smad-wizard
+		$view .= '				</div>'; // .form-steps
+		$view .= '			</div>'; // .col-sm-12 col-md-6 padding-lr-0
+		$view .= '		</div>'; // #smad-menu-section
+		$view .= '	</div>'; // .container-fluid
+		$view .= '
+				<div class="container-fluid">
 					<div class=" padding-lr-0">
-							<div class="smad-divider"></div>
+						<div class="smad-divider"></div>
 					</div>
-			</div>
-			<!-- start:filters -->
-			<div class="container-fluid">
+				</div>
+				<div class="container-fluid">
 					<div class="row">
-							<div>
-									<div class="smad-employees-form-section" class="border-top-grey">
-											<div class="col-md-9 smad-border-col">
-													<div class="menu-items">
-														'.$groupFilterList.'
-														</div>
-											</div>
-											<div class="col-md-3">
-													<div class="form-input">
-															<div class="form-item col-md-7  col-lg-9 smad-heder-title">głębokość powiązań:</div>
-															<div class="form-item col-md-5  col-lg-3">
-																	'.$formSmadDepth.'
-															</div>
-													</div>
-													<div class="form-input">
-															<div class="form-item col-md-7  col-lg-9 smad-heder-title">Czy zwracać wyniki tylko ze znalezionymi obiektami docelowymi(z tabeli kontrahentów)?</div>
-															<div class="form-item col-md-5  col-lg-3">
-																	'.$formSmadSelectTarget.'
-															</div>
-													</div>
-											</div>
+						<div>
+							<div class="smad-employees-form-section" class="border-top-grey">
+								<div class="col-md-9 smad-border-col">
+									<div class="menu-items">
+										'.$groupFilterList.'
 									</div>
-							</div>
-					</div>
-			</div>
-			<!-- end:filters -->
-
-			<!-- start:list employees -->
-			<div class="container-fluid">
-
-							<div class="padding-0 smad-employees-list-head">
-									<div class="col-md-8">
-											<header>
-											'.$formFilterHeadTitle.'
-											</header>
-											<div class="desc">
-													<p style="text-align:left">'.$formFilterHeadDesc.'</p>
-											</div>
-											<div class="countSelectedItem">
-													'.$countSelectedItem.'
-											</div>
+								</div>
+							<div class="col-md-3">
+							<div class="form-input">
+								<div class="form-item col-md-7  col-lg-9 smad-heder-title">głębokość powiązań:</div>
+									<div class="form-item col-md-5  col-lg-3">
+										'.$formSmadDepth.'
 									</div>
-									<div class="col-md-4">
-											<div class="menu-items">
-													<div class="menu-item">
-															<ul class="padding-0">
-																	'.$formAddNewData.'
-															</ul>
-													</div>
-											</div>
-											<div style="position:absolute; bottom:0; right:24px">
-												'.$btnGrafPowiazan.'
-											</div>
+								</div>
+								<div class="form-input">
+									<div class="form-item col-md-7  col-lg-9 smad-heder-title">Czy zwracać wyniki tylko ze znalezionymi obiektami docelowymi(z tabeli kontrahentów)?</div>
+										<div class="form-item col-md-5  col-lg-3">
+											'.$formSmadSelectTarget.'
+										</div>
 									</div>
+								</div>
 							</div>
-			</div>
+						</div>
+					</div>
+				</div>
 
-			<!-- Start: graph-view -->
-			<div class="smad-graph-section">
 				<div class="container-fluid">
-				'.$graphView.'
+					<div class="padding-0 smad-employees-list-head">
+						<div class="col-md-8">
+							<header>
+								'.$formFilterHeadTitle.'
+							</header>
+							<div class="desc">
+								<p style="text-align:left">'.$formFilterHeadDesc.'</p>
+							</div>
+							<div class="countSelectedItem">
+								'.$countSelectedItem.'
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="menu-items">
+								<div class="menu-item">
+									<ul class="padding-0">
+										'.$formAddNewData.'
+									</ul>
+								</div>
+							</div>
+							<div style="position:absolute; bottom:0; right:24px">
+								'.$btnGrafPowiazan.'
+							</div>
+						</div>
+					</div>
 				</div>
-			</div>
-			<!-- End: graph-view -->
 
-			<div class="container-fluid">
+				<div class="smad-graph-section">
+					<div class="container-fluid">
+						'.$graphView.'
+					</div>
+				</div>
+
+				<div class="container-fluid">
 					<div class="table-responsive padding-0" id="smad-table-' . $type . '">
-							' . $this->showListDataByType($items, $type, $fieldLabels) . '
+						' . $this->showListDataByType($items, $type, $fieldLabels) . '
+					</div>
+				</div>
+				<div class="container-fluid ">
+					<div>
+						'. $pagination_form .'
 					</div>
-			</div>
-			<!-- end:list employees -->
-			<!-- start:list paginations employees -->
-			<div class="container-fluid ">
-				<div>
-					'. $pagination_form .'
 				</div>
-			</div>
-			<!-- end:list paginations employees -->
 
-			<!-- start:bottom buttons -->
-			<div class="container-fluid smad-employees-bottom-navigation">
+				<div class="container-fluid smad-employees-bottom-navigation">
 					<div class="padding-0">
-							<div class="col-lg-6 ">
-									'.$buttonMoveToGroup.'
-							</div>
-							<div class="col-lg-6 text-right">
-									' . $showButtonNextStep . '
-							</div>
+						<div class="col-lg-6 ">
+								'.$buttonMoveToGroup.'
+						</div>
+						<div class="col-lg-6 text-right">
+							' . $showButtonNextStep . '
+						</div>
 					</div>
+				</div>
 			</div>
-			<!-- end:bottom buttons -->
-	</div>
-	<!-- start:employees-section -->
 
-	<div class="container-fluid ">
-			<div class="row">
+			<div class="container-fluid">
+				<div class="row">
 					<div class="container text-center">
-								<div class="col-md-7  col-lg-5 "  style="margin: 0 auto; float: none;">
-									'.$formSmadReaportTitleInput.'
-								</div>
+						<div class="col-md-7 col-lg-5"  style="margin:0 auto; float:none">
+							'.$formSmadReaportTitleInput.'
+						</div>
 					</div>
+				</div>
 			</div>
- </div>
-	<!-- START:bottom generate reaport-->
-<div class="container-fluid smad-generate-reaport">
-    <div class="row">
-        <div class="container text-center">
-            <button type="button" class="btn btn-default smad-generate-reaport-button" onclick="generateBiAuditRaport(event)" id="button-generate-reaport" >GENERUJ RAPORT POWIĄZAŃ</button>
-        </div>
-        <div class="container smad-generate-reaport-info text-center">
-            <div class="step-title"><span class="bottom--count-selected-item-kontrahenci"></span></div>
-            <div class="step-title"><span class="bottom--count-selected-item-pracownicy"></span></div>
-						<div><strong><span class="bottom--message-warning-critical-search"></span></strong></div>
-        </div>
-    </div>
-</div>
-<!-- end:bottom generate reaport -->
 
-			';
-			return $view;
-		}
+			<div class="container-fluid smad-generate-reaport">
+				<div class="row">
+					<div class="container text-center">
+						<button type="button" class="btn btn-default smad-generate-reaport-button" onclick="generateBiAuditRaport(event)" id="button-generate-reaport" >GENERUJ RAPORT POWIĄZAŃ</button>
+					</div>
+					<div class="container smad-generate-reaport-info text-center">
+						<div class="step-title"><span class="bottom--count-selected-item-kontrahenci"></span></div>
+						<div class="step-title"><span class="bottom--count-selected-item-pracownicy"></span></div>
+						<div><strong><span class="bottom--message-warning-critical-search"></span></strong></div>
+					</div>
+				</div>
+			</div>
+		';
+		return $view;
+	}
 
 
 	public function showListDataByType($items, $type='PRACOWNICY', $labels) {