P#110445 adress detailpage template

css/onoffice-address-detail.css

@@ -0,0 +1,56 @@
+.oo-address {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    margin-bottom: 4rem;
+}
+.oo-address-name {
+    flex: 1 0 100%;
+}
+.oo-address-picture {
+    margin-bottom: 0.25rem;
+}
+.oo-address-fieldlist {
+    display: flex;
+    flex-direction: column;
+}
+.oo-address-placefieldlist {
+    display: flex;
+    flex-direction: column;
+    margin-top: 0.25rem;
+    margin-bottom: 0.25rem;
+}
+.oo-address-placefield {
+    font-size: 1rem;
+}
+.oo-address-field {
+    font-size: 1rem;
+    margin-top: 0.25rem;
+    margin-bottom: 0.25rem;
+}
+.oo-address-estatelist {
+    margin-bottom: 4rem;
+}
+.oo-address-form {
+    margin-bottom: 4rem;
+}
+@media only screen and (min-width: 960px) {
+    .oo-address {
+        flex-direction: row;
+        margin-bottom: 7.5rem;
+    }
+    .oo-address-picture {
+        flex: 1 0 50%;
+        padding-right: 2rem
+    }
+    .oo-address-fieldlist {
+        flex: 1 0 50%;
+        padding-left: 2rem;
+    }
+    .oo-address-estatelist {
+        margin-bottom: 7.5rem;
+    }
+    .oo-address-form {
+        margin-bottom: 7.5rem;
+    }
+}

plugin/AddressList.php

@@ -165,12 +165,20 @@ public function loadAddressesById(array $addressIds, array $fields)
 			'outputlanguage' => Language::getDefault(),
 			'formatoutput' => true,
 		];
+        $parametersRaw = [
+            'recordids' => $addressIds,
+            'data' => $this->_addressParametersForImageAlt,
+            'outputlanguage' => Language::getDefault(),
+            'formatoutput' => false,
+        ];
 		$pApiCall->setParameters($parameters);
 		$pApiCall->addRequestToQueue()->sendRequests();
 
 		$records = $pApiCall->getResultRecords();
 		$this->fillAddressesById($records);
 		$this->_pDataViewAddress->setFields($fields);
+
+        $this->addRawRecordsByAPICall(clone $pApiCall, $parametersRaw);
 	}
 
 	/**
@@ -202,12 +210,7 @@ public function loadAddresses(int $inputPage = 1)
 
 		$addressParameterRaws = $pDataListViewToApi->buildParameters($this->_addressParametersForImageAlt,
 			$this->_pDataViewAddress, $newPage);
-
-		$pAddressRawApiCall = clone $pApiCall;
-		$pAddressRawApiCall->setParameters($addressParameterRaws);
-		$pAddressRawApiCall->addRequestToQueue()->sendRequests();
-		$recordsRaw = $pAddressRawApiCall->getResultRecords();
-		$this->_recordsRaw = array_combine(array_column($recordsRaw, 'id'), $recordsRaw);
+		$this->addRawRecordsByAPICall(clone $pApiCall, $addressParameterRaws);
 
 		$this->_records = $pApiCall->getResultRecords();
 		$this->fillAddressesById($this->_records);
@@ -227,7 +230,7 @@ private function generateRecordModifier(): ViewFieldModifierHandler
 	{
 		$fields = $this->_pDataViewAddress->getFields();
 
-		if ($this->_pDataViewAddress->getShowPhoto()) {
+		if ($this->getDataViewAddress() instanceof DataListViewAddress && $this->_pDataViewAddress->getShowPhoto()) {
 			$fields []= 'imageUrl';
 		}
 
@@ -460,4 +463,18 @@ public function getCurrentAddress(): array
 	{
 		return $this->_addressesById;
 	}
+
+    /**
+     * @param APIClientActionGeneric $addressApiCall
+     * @param array $parameters
+     * @throws API\ApiClientException
+     */
+    private function addRawRecordsByAPICall(APIClientActionGeneric $addressApiCall, array $parameters) {
+        $addressApiCall->setParameters($parameters);
+        $addressApiCall->addRequestToQueue()->sendRequests();
+        $recordsRaw = $addressApiCall->getResultRecords();
+
+        $this->_recordsRaw = array_combine(array_column($recordsRaw, 'id'), $recordsRaw);
+
+    }
 }

plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php

@@ -79,6 +79,7 @@ public function getScriptLoaderGenericConfiguration(): array
 			$values []= (new IncludeFileModel($script, 'onoffice-favorites', plugins_url('/dist/favorites.min.js', $pluginPath)))
 				->setDependencies(['jquery']);
 		}
+        $values = $this->addAddressStyle($values, $style, $pluginPath);
 
 		return array_merge($values, $this->addScripts($pluginPath, $script, $style, $defer, $async));
 	}
@@ -346,11 +347,24 @@ private function extractFormNames(string $pageContent): array
 		return $matches[1];
 	}
 
+    /**
+     * @param array $values
+     * @param string $style
+     * @param string $pluginPath
+     * @return array
+     */
+    private function addAddressStyle(array $values, string $style, string $pluginPath) {
+        $pageContent = get_the_content();
+        if ($this->isDetailAddressPage($pageContent)) {
+            $values []= (new IncludeFileModel($style, 'onoffice-address-detail', plugins_url('/css/onoffice-address-detail.css', $pluginPath)));
+        }
+        return $values;
+    }
+
 	/**
 	 * @param array $scripts
 	 * @param string $pluginPath
 	 * @param string $script
-	 * @param string $style
 	 * @param string $defer
 	 * @return array
 	 */
@@ -371,7 +385,6 @@ private function renderScriptForAddressDetailPage(array $scripts, string $plugin
 	 * @param array $scripts
 	 * @param string $pluginPath
 	 * @param string $script
-	 * @param string $style
 	 * @param string $defer
 	 * @return array
 	 */

templates.dist/address/default_detail.php

@@ -21,60 +21,86 @@
 
 use onOffice\WPlugin\AddressList;
 
-?>
-
-<div class="oo-detailview">
-	<?php
-    /* @var $pAddressList AddressList */
-	$currentAddressArr = $pAddressList->getCurrentAddress();
-	foreach ($currentAddressArr as $addressId => $escapedValues) {
-        $imageUrl = $escapedValues['imageUrl'];
-        unset($escapedValues['imageUrl']);
+$addressName = array('Anrede', 'Titel', 'Vorname', 'Name');
+$addressPlace = array('Strasse', 'Plz', 'Ort', 'Plz-Ort');
+/* @var $pAddressList AddressList */
+$currentAddressArr = $pAddressList->getRows();
+foreach ($currentAddressArr as $addressId => $escapedValues) {
+		$imageUrl = $escapedValues['imageUrl'];
+		unset($escapedValues['imageUrl']);
+	?>
+<div class="oo-address">
+    <h2 class="oo-address-name">
+        <?php
+        $fullName = '';
+        foreach ($addressName as $namePart) {
+            $fullName .= !empty($escapedValues[$namePart]) ? $escapedValues[$namePart]. ' ' : '';
+        }
+        echo substr_replace($fullName, '', -1);;
+        ?>
+    </h2>
+    <?php
+        if (!empty($imageUrl)) {
+            $imageAlt = $pAddressList->generateImageAlt($addressId);
+            echo '<picture class="oo-picture oo-address-picture">';
+            echo '<img class="oo-responsive-image" ' .
+                'src="' . esc_url($imageUrl) . '" ' .
+                'alt="' . esc_html($imageAlt) . '" ' .
+                'loading="lazy"/>';
+            echo '</picture>';
+        }
     ?>
-	<div class="oo-detailsheadline">
-		<h1><?php echo $escapedValues['Name']; ?></h1>
-		<div class="oo-detailstable">
-			<?php
-            if (!empty($imageUrl)) {
-                echo '<img width="350" src="'.$imageUrl.'"/>';
-            }
-			foreach ($escapedValues as $field => $value) {
-                echo '<div class="oo-detailslisttd">' . esc_html($pAddressList->getFieldLabel($field)) . '</div>' . "\n"
-                    . '<div class="oo-detailslisttd">'
+    <div class="oo-address-fieldlist">
+        <?php
+            $addressPlaceDiv = '';
+            foreach ($escapedValues as $field => $value) {
+                if (in_array($field, $addressName) || empty($value)) {
+                    continue;
+                }
+                if (in_array($field, $addressPlace)) {
+                    $addressPlaceDiv .= '<div class="oo-address-placefield">'
+                        . (is_array($value) ? esc_html(implode(', ', $value)) : esc_html($value))
+                        . '</div>';
+                    continue;
+                }
+                echo '<div class="oo-address-field">'
                     . (is_array($value) ? esc_html(implode(', ', $value)) : esc_html($value))
-                    . '</div>' . "\n";
-			}?>
-		</div>
-	</div>
-	<?php } ?>
-	<!--
-		to filter estates on address-detail-page you have to change the estate-list-template
-		add this in while:
-		if( !$pEstatesClone->isCurrentEstateContactsInAddressFilter() )
-			continue;
-	-->
-	<?php
-		$shortCodeActiveEstates = $pAddressList->getShortCodeActiveEstates();
-		if (!empty($shortCodeActiveEstates)) {
-		?>
-			<div class="detail-contact-form">
-				<?php echo do_shortcode($shortCodeActiveEstates); ?>
-			</div>
-	<?php } ?>
-    <?php
-    $shortCodeReferenceEstates = $pAddressList->getShortCodeReferenceEstates();
-    if (!empty($shortCodeReferenceEstates)) {
-        ?>
-        <div class="detail-contact-form">
-            <?php echo do_shortcode($shortCodeReferenceEstates); ?>
-        </div>
-    <?php } ?>
-	<?php
-		$shortCodeForm = $pAddressList->getShortCodeForm();
-		if (!empty($shortCodeForm)) {
-		?>
-			<div class="detail-contact-form">
-				<?php echo do_shortcode($shortCodeForm); ?>
-			</div>
-		<?php } ?>
+                    . '</div>';
+            }
+            if(!empty($addressPlaceDiv)) {
+                echo '<div class="oo-address-placefieldlist">'.$addressPlaceDiv.'</div>';
+            }
+            ?>
+    </div>
 </div>
+<?php } ?>
+<!--
+    to filter estates on address-detail-page you have to change the estate-list-template
+    add this in while:
+    if( !$pEstatesClone->isCurrentEstateContactsInAddressFilter() )
+        continue;
+-->
+<?php
+    $shortCodeActiveEstates = $pAddressList->getShortCodeActiveEstates();
+    if (!empty($shortCodeActiveEstates)) {
+    ?>
+        <div class="oo-address-estatelist">
+            <?php echo do_shortcode($shortCodeActiveEstates); ?>
+        </div>
+<?php } ?>
+<?php
+$shortCodeReferenceEstates = $pAddressList->getShortCodeReferenceEstates();
+if (!empty($shortCodeReferenceEstates)) {
+    ?>
+    <div class="oo-address-estatelist">
+        <?php echo do_shortcode($shortCodeReferenceEstates); ?>
+    </div>
+<?php } ?>
+<?php
+    $shortCodeForm = $pAddressList->getShortCodeForm();
+    if (!empty($shortCodeForm)) {
+    ?>
+        <div class="oo-address-form">
+            <?php echo do_shortcode($shortCodeForm); ?>
+        </div>
+<?php } ?>

templates.dist/estate/default.php

@@ -92,9 +92,6 @@
 	ul.oo-listparking {
 		padding: 0 10px;
 	}
-	.clear {
-		width: 50%;
-	}
 </style>
 
 <div class="oo-estate-map">
@@ -117,6 +114,8 @@
 	$pEstatesClone = clone $pEstates;
 	$pEstatesClone->resetEstateIterator();
 	while ( $currentEstate = $pEstatesClone->estateIterator() ) :
+		if( !$pEstatesClone->isCurrentEstateContactsInAddressFilter() )
+			continue;
 		$marketingStatus = $currentEstate['vermarktungsstatus'];
 		unset($currentEstate['vermarktungsstatus']);
 		$estateId = $pEstatesClone->getCurrentEstateId();

templates.dist/estate/default_detail.php

@@ -84,9 +84,6 @@
 	ul.oo-listparking {
 		padding: 0 10px;
 	}
-	.clear {
-		width: 25%;
-	}
 </style>
 <div class="oo-detailview">
 	<?php

tests/TestClassAddressList.php

@@ -128,6 +128,13 @@ public function prepare()
 			'formatoutput' => false,
 		];
 
+        $addressParametersWithFormatDetail = [
+            'recordids' => [13,37],
+            'data' => ['contactCategory', 'Vorname', 'Name', 'Zusatz1', 'branch', 'communityOfHeirs', 'communityOfOwners', 'umbrellaOrganization', 'association', 'institution', 'department'],
+            'outputlanguage' => "ENG",
+            'formatoutput' => false,
+        ];
+
 		$pSDKWrapper->addResponseByParameters
 			(onOfficeSDK::ACTION_ID_READ, 'address', '', $parameters, null, $response);
 		$pSDKWrapper->addResponseByParameters
@@ -140,6 +147,8 @@ public function prepare()
 		$addressParametersWithFormat['data'][] = 'imageUrl';
 		$pSDKWrapper->addResponseByParameters
 			(onOfficeSDK::ACTION_ID_READ, 'address', '', $addressParametersWithFormat, null, $responseRaw);
+		$pSDKWrapper->addResponseByParameters
+			(onOfficeSDK::ACTION_ID_READ, 'address', '', $addressParametersWithFormatDetail, null, $responseRaw);
 
 		$pMockViewFieldModifierHandler = $this->getMockBuilder(ViewFieldModifierHandler::class)
 			->setMethods(['processRecord', 'getAllAPIFields'])

tests/resources/templates/output_default_detail.html

@@ -2,9 +2,6 @@
 	ul.oo-listparking {
 		padding: 0 10px;
 	}
-	.clear {
-		width: 25%;
-	}
 </style>
 <div class="oo-detailview">
 			<div class="oo-detailsheadline">