47946 Optional writing of activities in the agents log with plugin forms & fields.

.github/workflows/unit-tests.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest]
+        operating-system: [ubuntu-20.04]
         php-versions: ['7.4', '8.0']
     name: Unittest on ${{ matrix.operating-system }} with PHP version ${{ matrix.php-versions }}
     steps:

css/admin.css

@@ -528,6 +528,11 @@ body #post-head-content p.wp-clearfix:nth-child(1) {
 	color: #999;
 }
 
+.select2-dropdown.select2-dropdown--below,
+.select2-dropdown.select2-dropdown--above {
+	margin-top: 0 !important;
+}
+
 .oo-poststuff .custom-input-field input[name=oopluginlistviews-countryactive]:checked::before,
 .oo-poststuff .custom-input-field input[name=oopluginlistviews-radiusactive]:checked::before {
 	filter: brightness(0) saturate(100%) invert(35%) sepia(4%) saturate(967%) hue-rotate(170deg) brightness(91%) contrast(94%);
@@ -679,6 +684,19 @@ body #post-head-content p.wp-clearfix:nth-child(1) {
 	margin-left: 5px;
 }
 
+.oo-poststuff .custom-input-field textarea[name=oopluginformactivityconfig-remark] {
+	min-height: 100px;
+}
+
+.oo-poststuff .select2-container--default.select2-container--disabled .select2-selection--multiple {
+	background-color: #f6f7f7;
+	border-color: #dcdcde;
+}
+
+.oo-poststuff .select2-container--default .select2-selection--multiple[aria-disabled="true"] .select2-selection__choice {
+    opacity: 0.5;
+}
+
 .oo-search-field {
 	width: 100%;
 	float: left;

js/checkbox.js

@@ -61,6 +61,34 @@ onOffice.checkboxAdmin = function() {
 				invert: true
 			},
 		],
+
+		// view: create activity form
+		"input[name=oopluginformactivityconfig-writeactivity]": [
+			{
+				element: "select[name=oopluginformactivityconfig-actionkind]",
+				invert: false
+			},
+			{
+				element: "select[name=oopluginformactivityconfig-actiontype]",
+				invert: false
+			},
+			{
+				element: "select[name^=oopluginformactivityconfig-characteristic]",
+				invert: false
+			},
+			{
+				element: "textarea[name=oopluginformactivityconfig-remark]",
+				invert: false
+			},
+			{
+				element: "select[name^=oopluginformactivityconfig-origincontact]",
+				invert: false
+			},
+			{
+				element: "select[name^=oopluginformactivityconfig-advisorylevel]",
+				invert: false
+			}
+		]
 	};
 };
 

js/onoffice-custom-select.js

@@ -7,6 +7,11 @@ jQuery(document).ready(function ($) {
 	$('.custom-multiple-select, .custom-single-select').select2({
 		width: '100%'
 	});
+	if ($('.oo-poststuff .custom-input-field .oo-custom-select2').length > 0) {
+		$('.oo-poststuff .custom-input-field .oo-custom-select2').select2({
+			width: '50%'
+		});
+	}
 
 	if ($adminSelect.length > 0) {
 		$adminSelect.select2({

js/onoffice-handle-activity-config.js

@@ -0,0 +1,32 @@
+jQuery(document).ready(function($) {
+	const actionKindSelect = $('.oo-poststuff select[name="oopluginformactivityconfig-actionkind"]');
+	const actionTypeSelect = $('.oo-poststuff select[name="oopluginformactivityconfig-actiontype"]');
+
+	if (actionTypeSelect.length && actionKindSelect.length) {
+		const actionTypes = onOffice_loc_settings.action_type;
+		function populateActionTypes(actionKind) {
+			if (actionTypeSelect.children('option').length === 0) {
+				const defaultOption = $('<option></option>').attr('value', '').text(onOffice_loc_settings.default_label_choose);
+				actionTypeSelect.append(defaultOption);
+				const selectedActionTypes = actionTypes[actionKind];
+				if (selectedActionTypes) {
+					Object.entries(selectedActionTypes).forEach(([value, label]) => {
+						if (value !== '') {
+							const option = $('<option></option>').attr('value', value).text(label);
+							actionTypeSelect.append(option);
+						}
+					});
+				}
+			}
+		}
+
+		actionKindSelect.on('change', function() {
+			actionTypeSelect.empty();
+			const selectedActionKind = $(this).val();
+			populateActionTypes(selectedActionKind);
+		});
+
+		const initialActionKind = actionKindSelect.val();
+		populateActionTypes(initialActionKind);
+	}
+});

plugin/DataFormConfiguration/DataFormConfiguration.php

@@ -81,6 +81,28 @@ class DataFormConfiguration
 
 	/** @var array */
 	private $_hiddenFields = [];
+
+	/** @var bool */
+	private $_writeActivity = false;
+
+	/** @var string */
+	private $_actionKind = '';
+
+	/** @var string */
+	private $_actionType = '';
+
+	/** @var string */
+	private $_characteristic = '';
+
+	/** @var string */
+	private $_remark = '';
+
+	/** @var string */
+	private $_originContact = '';
+
+	/** @var string */
+	private $_advisorylevel = '';
+
 	/**
 	 *
 	 * Override to set default fields for new, empty forms
@@ -249,4 +271,60 @@ public function getRecipientByUserSelection(): string {
 
 		return $this->_recipient;
 	}
+
+	/** @return bool */
+	public function getWriteActivity(): bool
+		{ return $this->_writeActivity; }
+
+	/** @param bool $writeActivity */
+	public function setWriteActivity(bool $writeActivity)
+		{ $this->_writeActivity = $writeActivity; }
+
+	/** @return string */
+	public function getActionKind(): string
+		{ return $this->_actionKind; }
+
+	/** @param string $actionKind */
+	public function setActionKind(string $actionKind)
+		{ $this->_actionKind = $actionKind; }
+
+	/** @return string */
+	public function getActionType(): string
+		{ return $this->_actionType; }
+
+	/** @param string $actionType */
+	public function setActionType(string $actionType)
+		{ $this->_actionType = $actionType; }
+
+	/** @return string */
+	public function getCharacteristic(): string
+		{ return $this->_characteristic; }
+
+	/** @param string $characteristic */
+	public function setCharacteristic(string $characteristic)
+		{ $this->_characteristic = $characteristic; }
+
+	/** @return string */
+	public function getRemark(): string
+		{ return $this->_remark; }
+
+	/** @param string $remark */
+	public function setRemark(string $remark)
+		{ $this->_remark = $remark; }
+
+	/** @return string */
+	public function getOriginContact(): string
+		{ return $this->_originContact; }
+
+	/** @param string $originContact */
+	public function setOriginContact(string $originContact)
+		{ $this->_originContact = $originContact; }
+
+	/** @return string */
+	public function getAdvisorylevel(): string
+		{ return $this->_advisorylevel; }
+
+	/** @param string $advisorylevel */
+	public function setAdvisorylevel(string $advisorylevel)
+		{ $this->_advisorylevel = $advisorylevel; }
 }

plugin/DataFormConfiguration/DataFormConfigurationFactory.php

@@ -180,6 +180,11 @@ private function createByRow(array $row)
 		$this->_pGeoPositionFieldHandler->readValues($pConfig);
 		$rowFields = $this->configureGeoFields($rowFields);
 
+		if ($this->_type !== Form::TYPE_APPLICANT_SEARCH){
+			$rowActivityConfig = $this->_pRecordManagerRead->readActivityConfigByFormId($formId);
+			$this->configureActivity($pConfig, $rowActivityConfig);
+		}
+
 		foreach ($rowFields as $fieldRow) {
 			$this->configureFieldsByRow($fieldRow, $pConfig);
 		}
@@ -188,6 +193,26 @@ private function createByRow(array $row)
 	}
 
 
+	/**
+	 * @param DataFormConfiguration\DataFormConfiguration $pFormConfiguration
+	 * @param array|null $row
+	 * @return void
+	 */
+	private function configureActivity(DataFormConfiguration\DataFormConfiguration $pFormConfiguration, array $row = null)
+	{
+		if (empty($row)) {
+			return;
+		}
+		$pFormConfiguration->setWriteActivity((bool)$row['write_activity'] ?? false);
+		$pFormConfiguration->setActionKind($row['action_kind'] ?? '');
+		$pFormConfiguration->setActionType($row['action_type'] ?? '');
+		$pFormConfiguration->setCharacteristic($row['characteristic'] ?? '');
+		$pFormConfiguration->setRemark($row['remark'] ?? '');
+		$pFormConfiguration->setOriginContact($row['origin_contact'] ?? '');
+		$pFormConfiguration->setAdvisorylevel($row['advisory_level'] ?? '');
+	}
+
+
 	/**
 	 *
 	 * @param array $row

plugin/Form/FormAddressCreator.php

@@ -37,6 +37,7 @@
 use onOffice\WPlugin\Types\FieldsCollection;
 use onOffice\WPlugin\Types\FieldTypes;
 use onOffice\WPlugin\Language;
+use onOffice\WPlugin\DataFormConfiguration\DataFormConfiguration;
 
 /**
  *
@@ -403,4 +404,34 @@ private function getAddressDataForReadAddressApiCall(FormData $pFormData): array
 
 		return $addressData;
 	}
+
+	/**
+	 * @param DataFormConfiguration $pFormConfig
+	 * @param int $addressId
+	 * @param int|null $estateId
+	 */
+	public function createAgentsLog(DataFormConfiguration $pFormConfig, int $addressId, int $estateId = null)
+	{
+		if (empty($pFormConfig->getActionKind()) && empty($pFormConfig->getActionType()) && empty($pFormConfig->getCharacteristic()) && empty($pFormConfig->getRemark())) {
+			return;
+		}
+		$requestParams = [
+			'addressids' => [$addressId],
+			'actionkind' => $pFormConfig->getActionKind() ?: null,
+			'actiontype' => $pFormConfig->getActionType() ?: null,
+			'origincontact' => $pFormConfig->getOriginContact() ?: null,
+			'features' => !empty($pFormConfig->getCharacteristic()) ? explode(',', $pFormConfig->getCharacteristic()) : null,
+			'note' => $pFormConfig->getRemark(),
+		];
+
+		if (!empty($estateId)) {
+			$requestParams['estateid'] = $estateId;
+			$requestParams['advisorylevel'] = $pFormConfig->getAdvisorylevel() ?: null;
+		}
+
+		$pApiClientAction = new APIClientActionGeneric
+			($this->_pSDKWrapper, onOfficeSDK::ACTION_ID_CREATE, 'agentslog');
+		$pApiClientAction->setParameters($requestParams);
+		$pApiClientAction->addRequestToQueue()->sendRequests();
+	}
 }

plugin/FormPostContact.php

@@ -145,6 +145,7 @@ private function createAddress(FormData $pFormData)
 	{
 		$pFormConfig = $pFormData->getDataFormConfiguration();
 		$checkDuplicate = $pFormConfig->getCheckDuplicateOnCreateAddress();
+		$writeActivity = $pFormConfig->getWriteActivity();
 		$contactType = $pFormConfig->getContactType();
 		$pWPQuery = $this->_pFormPostContactConfiguration->getWPQueryWrapper()->getWPQuery();
 		$estateId = $pWPQuery->get('estate_id', null);
@@ -156,6 +157,9 @@ private function createAddress(FormData $pFormData)
 			->createOrCompleteAddress($pFormData, $checkDuplicate, $contactType, $estateId);
 		$this->_messageDuplicateAddressData = $this->_pFormPostContactConfiguration->getFormAddressCreator()
 			->getMessageDuplicateAddressData($pFormData, $addressId, $latestAddressIdOnEnterPrise);
+		if ($writeActivity) {
+			$this->_pFormPostContactConfiguration->getFormAddressCreator()->createAgentsLog($pFormConfig, $addressId, $estateId);
+		}
 
 		if (!$this->_pFormPostContactConfiguration->getNewsletterAccepted()) {
 			// No subscription for newsletter, which is ok

plugin/FormPostInterest.php

@@ -89,6 +89,7 @@ protected function analyseFormContentByPrefix(FormData $pFormData)
 						$contactType = $pFormConfiguration->getContactType();
 				$pWPQuery = $this->_pFormPostInterestConfiguration->getWPQueryWrapper()->getWPQuery();
 				$estateId = $pWPQuery->get('estate_id', null);
+				$writeActivity = $pFormConfiguration->getWriteActivity();
 				$latestAddressIdOnEnterPrise = null;
 				if ($checkDuplicate) {
 					$latestAddressIdOnEnterPrise = $this->_pFormPostInterestConfiguration->getFormAddressCreator()->getLatestAddressIdInOnOfficeEnterprise();
@@ -98,6 +99,9 @@ protected function analyseFormContentByPrefix(FormData $pFormData)
 				$this->_messageDuplicateAddressData = $this->_pFormPostInterestConfiguration->getFormAddressCreator()
 						->getMessageDuplicateAddressData($pFormData, $addressId, $latestAddressIdOnEnterPrise);
 				$this->createSearchcriteria( $pFormData, $addressId );
+				if ($writeActivity) {
+					$this->_pFormPostInterestConfiguration->getFormAddressCreator()->createAgentsLog($pFormConfiguration, $addressId, null);
+				}
 				$this->setNewsletter( $addressId );
 			}
 		} finally {