@@ -98,14 +98,15 @@ $GLOBALS['TL_DCA']['tl_vr_real_estate_assets'] = array

     // Palettes

     'palettes'    => array

     (

-        '__selector__' => array('availability'),

-        'default'      => '{title_legend},title,assetNo,address,floor,postal,city;{availability_legend},availability;{misc_legend},description;{basic_data_legend},livingSpace,numberOfRooms,rent,coldRent,advanceOperatingCosts,constructionYear,deposit,entitlementCertificate;{features_legend},features,parking,heatingType,energyPassType,energyConsumption;{images_legend},gallerySRC,floorPlansSRC;{publish_legend},published,start,stop',

+        '__selector__' => array('availability','managedPropertyId'),

+        'default'      => '{title_legend},title,assetNo,floor,managedPropertyId;{availability_legend},availability;{misc_legend},description;{basic_data_legend},livingSpace,numberOfRooms,rent,coldRent,advanceOperatingCosts,constructionYear,deposit,entitlementCertificate;{features_legend},features,parking,heatingType,energyPassType,energyConsumption;{images_legend},gallerySRC,floorPlansSRC;{publish_legend},published,start,stop',

     ),

     // Subpalettes

     'subpalettes' => array

     (

         'availability_from' => 'availableFrom',

+        'managedPropertyId_0' => 'address,postal,city'

     ),

     // Fields

@@ -171,6 +172,15 @@ $GLOBALS['TL_DCA']['tl_vr_real_estate_assets'] = array

             'eval'      => array('mandatory' => true, 'maxlength' => 8, 'tl_class' => 'w50'),

             'sql'       => "varchar(8) NOT NULL default ''"

         ),

+        'managedPropertyId'           => array

+        (

+            'exclude'   => true,

+            'inputType' => 'select',

+            'foreignKey' => 'tl_vr_re_managedProperties.address',

+            'eval'      => array('mandatory' => false, 'includeBlankOption' => true, 'submitOnChange' => true, 'tl_class' => 'w50', 'chosen' => true),

+            'sql'       => "int(10) unsigned NOT NULL",

+            'relation'   => array('type' => 'belongsTo', 'load' => 'lazy')

+        ),

         'livingSpace'           => array

         (

             'exclude'   => true,

@@ -38,6 +38,12 @@

             <trans-unit id="tl_vr_real_estate_assets.floor.1">

                 <source>Die Etagenangabe des Objekts (z.B. 2. OG links).</source>

             </trans-unit>

+            <trans-unit id="tl_vr_real_estate_assets.managedPropertyId.0">

+                <source>Verwaltetes Objekt</source>

+            </trans-unit>

+            <trans-unit id="tl_vr_real_estate_assets.managedPropertyId.1">

+                <source>Wählen Sie hier das verwaltete Objekt, zu dem dieser Eintrag gehört.</source>

+            </trans-unit>

             <trans-unit id="tl_vr_real_estate_assets.livingSpace.0">

                 <source>Wohnfläche</source>

             </trans-unit>

@@ -10,49 +10,27 @@

 namespace vonRotenberg\RealEstateListingBundle\EventListener;

-use Contao\CoreBundle\ServiceAnnotation\Hook;

-use Contao\Validator;

-use Contao\Widget;

+use Contao\CoreBundle\ServiceAnnotation\Callback;

+use Contao\DataContainer;

+use vonRotenberg\RealEstateListingBundle\Model\ManagedPropertyModel;

 class RealEstateAssetsContainerListener

 {

   /**

-   * @param string $strRegexp

-   * @param        $varValue

-   * @param Widget $objWidget

-   *

-   * @return bool

-   * @Hook("addCustomRegexp")

+   * @Callback(table="tl_vr_real_estate_assets", target="fields.managedPropertyId.options")

    */

-  public function onAddCustomRegexp(string $strRegexp, &$varValue, Widget $objWidget): bool

+  public function onAddCustomRegexp(?DataContainer $dc): array

     {

-      switch ($strRegexp)

-        {

-            case 'currency':

-            case 'float':

+      $arrOptions = [];

-                if ((substr_count($varValue, ',') == 1 && strpos($varValue, '.') === false)

-                    || (substr_count($varValue, ',') == 1 && ($dotPos = strpos($varValue, '.')) !== false && $dotPos < strpos($varValue, ',')))

-                {

-                    $varValue = str_replace('.', '', $varValue);

-                    $varValue = str_replace(',', '.', $varValue);

-                }

+      if (($Properties = ManagedPropertyModel::findAllPublished()) !== null)

+      {

+          foreach ($Properties as $property)

+          {

+              $arrOptions[$property->city][$property->id] = $property->address . ' [' . $property->city . ']';

+          }

+      }

-                if (!Validator::isNumeric($varValue))

-                {

-                    if ($strRegexp == 'currency')

-                    {

-                        $objWidget->addError(sprintf($GLOBALS['TL_LANG']['ERR']['currency'], $objWidget->label));

-                    } else {

-                        $objWidget->addError(sprintf($GLOBALS['TL_LANG']['ERR']['digit'], $objWidget->label));

-                    }

-

-                    return true;

-                }

-

-                break;

-        }

-

-        return false;

+      return $arrOptions;

     }

 }

@@ -123,7 +123,7 @@ class ManagedPropertyModel extends Model

         if (!isset($arrOptions['order']))

         {

-            $arrOptions['order'] = "$t.city ASC, $t.livingSpace ASC";

+            $arrOptions['order'] = "$t.city ASC, $t.address ASC";

         }

         $arrOptions['limit'] = $intLimit;