N°2847 Add new entry form for activity panel (static atm)

2026-05-17 22:39:03 +02:00 · 2020-10-01 10:05:35 +02:00
parent 7f56911f41
commit c2fe1bc5cb
15 changed files with 276 additions and 5 deletions
--- a/css/backoffice/components/_all.scss
+++ b/css/backoffice/components/_all.scss
@@ -20,4 +20,5 @@
@import "input";
@import "fieldset";
@import "field";
-@import "toolbar";
+@import "toolbar";
+@import "richtext";
--- a/css/backoffice/layout/_all.scss
+++ b/css/backoffice/layout/_all.scss
@@ -26,3 +26,4 @@
@import "activity-panel/caselog-entry";
@import "activity-panel/edits-entry";
@import "activity-panel/transition-entry";
+@import "activity-panel/activitynewentryform";
--- a/css/backoffice/layout/activity-panel/_activity-entry.scss
+++ b/css/backoffice/layout/activity-panel/_activity-entry.scss
@@ -211,4 +211,26 @@ $ibo-activity-entry--sub-information--text-color: $ibo-color-grey-700 !default;
 	color: $ibo-activity-entry--sub-information--text-color;

 	@extend %ibo-font-ral-nor-50;
+}
+
+.ibo-activity-panel--body--add-caselog-entry--toggler{
+	@extend %ibo-baseline-centered-content;
+	border-radius: $ibo-border-radius-full;
+	width: 36px;
+	height: 36px;
+	background-color: $ibo-color-primary-600;
+	color: $ibo-color-white-100;
+	position: absolute;
+	right: 12px;
+	box-shadow: $ibo-elevation-100;
+	> i{
+		height: 100%;
+		width: 100%;
+		text-align: center;
+		font-size: 16px;
+		line-height: 33px;
+	}
+	&:hover {
+		color: $ibo-color-white-100;
+	}
 }
--- a/css/backoffice/layout/activity-panel/_activity-panel.scss
+++ b/css/backoffice/layout/activity-panel/_activity-panel.scss
@@ -106,6 +106,7 @@ $ibo-activity-panel--body--placeholder-hint--color: $ibo-color-grey-800 !default
 		}
 		.ibo-activity-panel--tab-toolbar{
 			display: flex;
+			flex-wrap: wrap;
 		}
 	}
 }
--- a/css/backoffice/layout/activity-panel/_activitynewentryform.scss
+++ b/css/backoffice/layout/activity-panel/_activitynewentryform.scss
@@ -0,0 +1,14 @@
+/*!
+ * copyright   Copyright (C) 2010-2020 Combodo SARL
+ * license     http://opensource.org/licenses/AGPL-3.0
+ */
+.ibo-activity-new-entry-form{
+	width: 100%;
+	background-color: $ibo-color-grey-200;
+	padding: 32px 14px 14px 32px;
+}	
+.ibo-activity-new-entry-form--actions{
+	margin-top: 5px;
+	display: flex;
+	justify-content: space-between;
+}
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -165,8 +165,9 @@ return array(
    'Combodo\\iTop\\Application\\UI\\Component\\Input\\Input' => $baseDir . '/sources/application/UI/Component/Input/Input.php',
    'Combodo\\iTop\\Application\\UI\\Component\\Input\\InputFactory' => $baseDir . '/sources/application/UI/Component/Input/InputFactory.php',
    'Combodo\\iTop\\Application\\UI\\Component\\Input\\InputWithLabel' => $baseDir . '/sources/application/UI/Component/Input/InputWithLabel.php',
-    'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select' => $baseDir . '/sources/application/UI/Component/Input/Select.php',
-    'Combodo\\iTop\\Application\\UI\\Component\\Input\\SelectOption' => $baseDir . '/sources/application/UI/Component/Input/SelectOption.php',
+    'Combodo\\iTop\\Application\\UI\\Component\\Input\\RichText\\RichText' => $baseDir . '/sources/application/UI/Component/Input/RichText/RichText.php',
+    'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select\\Select' => $baseDir . '/sources/application/UI/Component/Input/Select/Select.php',
+    'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select\\SelectOption' => $baseDir . '/sources/application/UI/Component/Input/Select/SelectOption.php',
    'Combodo\\iTop\\Application\\UI\\Component\\Panel\\Panel' => $baseDir . '/sources/application/UI/Component/Panel/Panel.php',
    'Combodo\\iTop\\Application\\UI\\Component\\Panel\\PanelFactory' => $baseDir . '/sources/application/UI/Component/Panel/PanelFactory.php',
    'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenu' => $baseDir . '/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php',
@@ -197,6 +198,8 @@ return array(
    'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CaseLogEntry' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php',
    'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\EditsEntry' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php',
    'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\TransitionEntry' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php',
+    'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityNewEntryFormFactory\\ActivityNewEntryFormFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php',
+    'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityNewEntryForm\\ActivityNewEntryForm' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryForm.php',
    'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityPanel' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php',
    'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityPanelFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php',
    'Combodo\\iTop\\Application\\UI\\Layout\\MultiColumn\\Column\\Column' => $baseDir . '/sources/application/UI/Layout/MultiColumn/Column/Column.php',
--- a/lib/composer/autoload_real.php
+++ b/lib/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b
        }
    }

+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
    public static function getLoader()
    {
        if (null !== self::$loader) {
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -395,8 +395,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Combodo\\iTop\\Application\\UI\\Component\\Input\\Input' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/Input.php',
        'Combodo\\iTop\\Application\\UI\\Component\\Input\\InputFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/InputFactory.php',
        'Combodo\\iTop\\Application\\UI\\Component\\Input\\InputWithLabel' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/InputWithLabel.php',
-        'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/Select.php',
-        'Combodo\\iTop\\Application\\UI\\Component\\Input\\SelectOption' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/SelectOption.php',
+        'Combodo\\iTop\\Application\\UI\\Component\\Input\\RichText\\RichText' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/RichText/RichText.php',
+        'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select\\Select' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/Select/Select.php',
+        'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select\\SelectOption' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/Select/SelectOption.php',
        'Combodo\\iTop\\Application\\UI\\Component\\Panel\\Panel' => __DIR__ . '/../..' . '/sources/application/UI/Component/Panel/Panel.php',
        'Combodo\\iTop\\Application\\UI\\Component\\Panel\\PanelFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Panel/PanelFactory.php',
        'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenu' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php',
@@ -427,6 +428,8 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CaseLogEntry' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php',
        'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\EditsEntry' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php',
        'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\TransitionEntry' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php',
+        'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityNewEntryFormFactory\\ActivityNewEntryFormFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php',
+        'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityNewEntryForm\\ActivityNewEntryForm' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryForm.php',
        'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityPanel' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php',
        'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityPanelFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php',
        'Combodo\\iTop\\Application\\UI\\Layout\\MultiColumn\\Column\\Column' => __DIR__ . '/../..' . '/sources/application/UI/Layout/MultiColumn/Column/Column.php',
--- a/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryForm.php
+++ b/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryForm.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryForm;
+use Combodo\iTop\Application\UI\Layout\UIContentBlock;
+use Combodo\iTop\Application\UI\UIBlock;
+/**
+ * Class ActivityNewEntryForm
+ *
+ * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryForm
+ */
+class ActivityNewEntryForm extends UIContentBlock
+{
+	// Overloaded constants
+	public const BLOCK_CODE = 'ibo-activitynewentryform';
+	public const HTML_TEMPLATE_REL_PATH = 'layouts/activity-panel/activitynewentryform/layout';
+	public const JS_TEMPLATE_REL_PATH = 'layouts/activity-panel/activitynewentryform/layout';
+
+	/** @var \Combodo\iTop\Application\UI\Component\Input\RichText\RichText $oFormTextInput */
+	protected $oFormTextInput;
+	/** @var array $aTextInputActionButtons */
+	protected $aTextInputActionButtons;
+	/** @var array $aFormActionButtons */
+	protected $aFormActionButtons;
+
+	/**
+	 * ActivityNewEntryForm constructor.
+	 *
+	 * @param null $sName
+	 */
+	public function __construct($sName = null)
+	{
+		parent::__construct($sName);
+		$this->aFormActionButtons = [];
+		$this->aTextInputActionButtons = [];
+	}
+
+
+	/**
+	 * @return \Combodo\iTop\Application\UI\Component\Input\RichText\RichText
+	 */
+	public function GetFormTextInput(): \Combodo\iTop\Application\UI\Component\Input\RichText\RichText
+	{
+		return $this->oFormTextInput;
+	}
+
+	/**
+	 * @param \Combodo\iTop\Application\UI\Component\Input\RichText\RichText $oFormTextInput
+	 * @return $this
+	 */
+	public function SetFormTextInput(\Combodo\iTop\Application\UI\Component\Input\RichText\RichText $oFormTextInput): ActivityNewEntryForm
+	{
+		$this->oFormTextInput = $oFormTextInput;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function GetTextInputActionButtons(): array
+	{
+		return $this->aTextInputActionButtons;
+	}
+
+	/**
+	 * @param array $aTextInputActionButtons
+	 * @return $this
+	 */
+	public function SetTextInputActionButtons(array $aTextInputActionButtons): ActivityNewEntryForm
+	{
+		$this->aTextInputActionButtons = $aTextInputActionButtons;
+		return $this;
+	}
+
+	/**
+	 * @param \Combodo\iTop\Application\UI\UIBlock $oTextInputActionButtons
+	 */
+	public function AddTextInputActionButtons(UIBlock $oTextInputActionButtons): void
+	{
+		$this->aTextInputActionButtons[] = $oTextInputActionButtons;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function GetFormActionButtons()
+	{
+		return $this->aFormActionButtons;
+	}
+
+	/**
+	 * @param array $aFormActionButtons
+	 * @return $this
+	 */
+	public function SetFormActionButtons(array $aFormActionButtons): ActivityNewEntryForm
+	{
+		$this->aFormActionButtons = $aFormActionButtons;
+		return $this;
+	}
+	
+	/**
+	 * @param UIBlock $oFormActionButtons
+	 */
+	public function AddFormActionButtons(UIBlock $oFormActionButtons): void
+	{
+		$this->aFormActionButtons[] = $oFormActionButtons;
+	}
+
+
+	public function GetSubBlocks() : array
+	{
+		$aSubBlocks = [];
+		$aSubBlocks[$this->GetFormTextInput()->GetId()] = $this->GetFormTextInput();
+		foreach ($this->GetTextInputActionButtons() as $oTextInputActionButton)
+		{
+			$aSubBlocks[$oTextInputActionButton->GetId()] = $oTextInputActionButton;
+		}		
+		foreach ($this->GetFormActionButtons() as $oFormActionButton)
+		{
+			$aSubBlocks[$oFormActionButton->GetId()] = $oFormActionButton;
+		}
+		return $aSubBlocks;
+	}
+	
+}
--- a/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php
+++ b/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryFormFactory;
+
+
+use Combodo\iTop\Application\UI\Component\Button\ButtonFactory;
+use Combodo\iTop\Application\UI\Component\Input\RichText\RichText;
+use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryForm\ActivityNewEntryForm;
+
+/**
+ * Class ActivityNewEntryFormFactory
+ *
+ * @internal
+ * @author Stephen Abello <stephen.abello@combodo.com>
+ * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryFormFactory
+ * @since 2.8.0
+ */
+class ActivityNewEntryFormFactory
+{
+	public static function MakeForObjectDetailsActivityPanel(): ActivityNewEntryForm
+	{
+		$oActivityNewEntryForm = new ActivityNewEntryForm();
+		$oActivityNewEntryForm->SetFormTextInput(new RichText());
+		$oActivityNewEntryForm->AddFormActionButtons(ButtonFactory::MakeForSecondaryAction('Cancel'));
+		$oActivityNewEntryForm->AddFormActionButtons(ButtonFactory::MakeForValidationAction('Send'));
+		$oActivityNewEntryForm->AddFormActionButtons(ButtonFactory::MakeForValidationAction('Send....'));
+		$oActivityNewEntryForm->AddTextInputActionButtons(ButtonFactory::MakeForSecondaryAction('Templates')->SetColor('blue'));
+		return $oActivityNewEntryForm;
+	}
+}
--- a/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php
+++ b/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php
@@ -21,8 +21,11 @@ namespace Combodo\iTop\Application\UI\Layout\ActivityPanel;


 use AttributeDateTime;
+use Combodo\iTop\Application\UI\Component\Button\ButtonFactory;
+use Combodo\iTop\Application\UI\Component\Input\RichText\RichText;
 use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntry;
 use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CaseLogEntry;
+use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryForm\ActivityNewEntryForm;
 use Combodo\iTop\Application\UI\UIBlock;
 use DBObject;
 use MetaModel;
@@ -55,6 +58,8 @@ class ActivityPanel extends UIBlock
 	protected $bAreEntriesSorted;
 	/** @var bool $bHasLifecycle True if the host object has a lifecycle */
 	protected $bHasLifecycle;
+	/** @var \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryForm\ActivityNewEntryForm $NewEntryForm */
+	protected $oNewEntryForm;

 	/**
 	 * ActivityPanel constructor.
@@ -417,4 +422,31 @@ class ActivityPanel extends UIBlock
 		$oDateTimeFormat = AttributeDateTime::GetFormat();
 		return $oDateTimeFormat->ToMomentJS();
 	}
+	
+	public function GetNewEntryForm()
+	{
+		return $this->oNewEntryForm;
+	}
+	
+	public function SetNewEntryForm($oNewEntryForm)
+	{
+		$this->oNewEntryForm = $oNewEntryForm;
+		return $this;
+	}
+	
+	public function HasNewEntryForm()
+	{
+		return $this->oNewEntryForm !== null;
+	}
+
+	public function GetSubBlocks()
+	{
+		$aSubBlocks = array();
+		if ($this->HasNewEntryForm())
+		{
+			$oNewEntryForm = $this->GetNewEntryForm();
+			$aSubBlocks[$oNewEntryForm->GetId()] = $oNewEntryForm;
+		}
+		return $aSubBlocks;
+	}
 }
--- a/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php
+++ b/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php
@@ -21,8 +21,12 @@ namespace Combodo\iTop\Application\UI\Layout\ActivityPanel;


 use CMDBChangeOpSetAttributeCaseLog;
+use Combodo\iTop\Application\UI\Component\Button\ButtonFactory;
+use Combodo\iTop\Application\UI\Component\Input\RichText\RichText;
 use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntryFactory;
 use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\EditsEntry;
+use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryForm\ActivityNewEntryForm;
+use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryFormFactory\ActivityNewEntryFormFactory;
 use DBObject;
 use DBObjectSearch;
 use DBObjectSet;
@@ -67,6 +71,10 @@ class ActivityPanelFactory
 			}
 		}

+		if($oActivityPanel->HasCaseLogTabs())
+		{
+			$oActivityPanel->SetNewEntryForm(ActivityNewEntryFormFactory::MakeForObjectDetailsActivityPanel());
+		}
 		// Retrieve history changes (including case logs entries)
 		// - Prepare query to retrieve changes
 		$oChangesSearch = DBObjectSearch::FromOQL('SELECT CMDBChangeOp WHERE objclass = :obj_class AND objkey = :obj_key');
--- a/templates/layouts/activity-panel/activitynewentryform/layout.html.twig
+++ b/templates/layouts/activity-panel/activitynewentryform/layout.html.twig
@@ -0,0 +1,17 @@
+<div class="ibo-activity-new-entry-form">
+	<div class="ibo-activity-new-entry-form--text-input" data-role="ibo-activity-new-entry-form--text-input">
+		{{ render_block(oUIBlock.GetFormTextInput(), {aPage: aPage}) }}
+	</div>
+	<div class="ibo-activity-new-entry-form--actions">
+		<div class="ibo-activity-new-entry-form--action-buttons--left-actions">
+			{% for TextInputActionButton in oUIBlock.GetTextInputActionButtons() %}
+				{{ render_block(TextInputActionButton, {aPage: aPage}) }}
+			{% endfor %}
+		</div>
+		<div class="ibo-activity-new-entry-form--action-buttons--right-actions">
+			{% for FormActionButton in oUIBlock.GetFormActionButtons() %}
+				{{ render_block(FormActionButton, {aPage: aPage}) }}
+			{% endfor %}
+		</div>
+	</div>
+</div>
--- a/templates/layouts/activity-panel/activitynewentryform/layout.js.twig
+++ b/templates/layouts/activity-panel/activitynewentryform/layout.js.twig
--- a/templates/layouts/activity-panel/layout.html.twig
+++ b/templates/layouts/activity-panel/layout.html.twig
@@ -71,6 +71,10 @@
 			</a>
 		</div>
 	</div>
+	{% if oUIBlock.HasNewEntryForm() %}
+		{{ render_block(oUIBlock.GetNewEntryForm()) }}
+		<a href="#" class="ibo-activity-panel--body--add-caselog-entry--toggler" data-role="ibo-activity-panel--body--add-caselog-entry--toggler"><i class="fas fa-feather"></i></a>
+	{% endif %}
 	<div class="ibo-activity-panel--body">
 		{% if oUIBlock.GetGroupedEntries()|length > 0 %}
 			{% for aEntryGroup in oUIBlock.GetGroupedEntries() %}