@openui5/sap.ui.mdc 1.97.1 → 1.100.0

package/src/sap/ui/mdc/p13n/panels/ChartItemPanel.js

@@ -4,10 +4,35 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"./BasePanel", "sap/m/Label", "sap/m/ColumnListItem", "sap/m/Select", "sap/m/Text", "sap/ui/core/Item", "sap/ui/mdc/library"
-], function (BasePanel, Label, ColumnListItem, Select, Text, Item, MDCLib) {
+	"sap/m/p13n/BasePanel",
+	"sap/m/Label",
+	"sap/m/ColumnListItem",
+	"sap/m/Select",
+	"sap/m/Text",
+	"sap/ui/core/Item",
+	"sap/ui/mdc/library",
+	"sap/m/Button",
+	'sap/m/Column',
+	"sap/m/Table",
+	"sap/ui/model/Filter",
+	"sap/ui/model/FilterOperator",
+	"sap/m/VBox",
+	"sap/m/HBox",
+	"sap/m/ComboBox",
+	"sap/ui/model/Sorter",
+	"sap/base/Log",
+	"sap/m/library",
+	"sap/ui/Device",
+	"sap/ui/core/ResizeHandler",
+	"sap/ui/core/CustomData",
+	"sap/ui/thirdparty/jquery"
+], function (BasePanel, Label, ColumnListItem, Select, Text, Item, MDCLib, Button, Column, Table, Filter, FilterOperator, VBox, HBox, ComboBox, Sorter, Log, mLibrary, Device, ResizeHandler, CustomData, jQuery) {
 	"use strict";
 
+    // shortcut for sap.m.FlexJustifyContent
+	var FlexJustifyContent = mLibrary.FlexJustifyContent;
+	var core = sap.ui.getCore();
+
 	/**
 	 * Constructor for ChartItemPanel
 	 *
@@ -16,77 +41,790 @@ sap.ui.define([
 	 * @class TODO
 	 *        <h3><b>Note:</b></h3>
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
-	 * @extends sap.ui.mdc.p13n.panels.BasePanel
+	 * @extends sap.m.p13n.BasePanel
 	 * @author SAP SE
+	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @experimental
-	 * @since 1.66
+	 * @since 1.97
 	 * @alias sap.ui.mdc.p13n.panels.ChartItemPanel
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var ChartItemPanel = BasePanel.extend("sap.ui.mdc.p13n.panels.ChartItemPanel", {
 		metadata: {
-			library: "sap.ui.mdc"
+			library: "sap.ui.mdc",
+			properties: {
+				/*This provides the panel the necessary information to build the UI for MDC/Comp.
+				* The object contains the following information:
+				* {
+				*	allowedLayoutOptions : [] -> an array of strings with the allowed layout options for the current chart type, e.g. "axis1", "axis2", "category", "series", ...
+					templateConfig : [        -> array containing information how the templating rows should look like
+						{kind: "Groupable"},  -> object containing information for which tyoe should be a termplate row created (may contain additional config in the future e.g. only one measure allwoed)
+						{kind: "Aggregatable"}
+					]
+				* }
+				*/
+				panelConfig: {
+					type: "object"
+				}
+			},
+			events: {
+				// TODO
+				/**
+				 * Event raised when one or more <code>DimMeasureItems</code> has been updated.
+				 * Aggregation <code>DimMeasureItems</code> should be updated outside...
+				 * @since 1.50.0
+				 */
+				changeItems: {}
+			}
 		},
 		init: function () {
+
+			this._bMobileMode = Device.system.phone;
+
 			// Initialize the BasePanel
 			BasePanel.prototype.init.apply(this, arguments);
-			var oChartItemPanelTemplate = new ColumnListItem({
-				selected: "{" + this.P13N_MODEL + ">visible}",
-				cells: [
-					new Label({
-						wrapping: true,
-						text: "{" + this.P13N_MODEL + ">label}",
-						tooltip: "{" + this.P13N_MODEL + ">tooltip}"
-					}),
-					new Text({
-						wrapping: true,
-						text: "{" + this.P13N_MODEL + ">kind}"
-					}),
-					new Select({
-						width: "100%",
-						selectedKey: "{" + this.P13N_MODEL + ">role}",
-						change: [this.onChangeOfRole, this],
-						forceSelection: false,
-						enabled: {
-							path: this.P13N_MODEL + ">visible",
-							formatter: function(bEnabled) {
-								return !!bEnabled;
-							}
-						},
-						items: {
-							path: this.P13N_MODEL + ">availableRoles",
-							templateShareable: false,
-							template: new Item({
-								key: "{" + this.P13N_MODEL + ">key}",
-								text: "{" + this.P13N_MODEL + ">text}"
-							})
-						}
-					})
-				]
-			});
 
-			this.setTemplate(oChartItemPanelTemplate);
-			this.setPanelColumns([
-				this.getResourceText("chart.PERSONALIZATION_DIALOG_COLUMN_DESCRIPTION"), this.getResourceText("chart.PERSONALIZATION_DIALOG_COLUMN_TYPE"), this.getResourceText("chart.PERSONALIZATION_DIALOG_COLUMN_ROLE")
-			]);
+			this._bindListItems();
+
 		},
 		renderer: {}
 	});
 
-	ChartItemPanel.prototype.setP13nModel = function(oP13nModel){
-		BasePanel.prototype.setP13nModel.apply(this, arguments);
+	ChartItemPanel.prototype._setInnerLayout = function() {
+
+		this._oInnerControl = new VBox({
+			items: [
+				this._oListControl
+			]
+		});
+
+		this.setAggregation("_content", this._oInnerControl);
+
+		this._fnHandleResize = function() {
+			//var bChangeResult = false, iScrollContainerHeightOld, iScrollContainerHeightNew;
+			if (this.getParent) {
+				var $dialogCont = null;
+				var oParent = this.getParent();
+				if (oParent && oParent.$) {
+					$dialogCont = oParent.$("cont");
+					if ($dialogCont.children().length > 0) {
+						var iScrollContainerWidth = this._oInnerControl.$()[0].clientWidth;
+						var iMinWidth = 570;
+
+						if (!this._bMobileMode && iScrollContainerWidth <= iMinWidth) {
+							this._switchMobileMode(true);
+						} else if (this._bMobileMode && iScrollContainerWidth > iMinWidth) {
+							this._switchMobileMode(false);
+						}
+
+					}
+				}
+			}
+			//return bChangeResult;
+		};
+
+
+		if (Device.system.desktop) {
+			this._sContainerResizeListener = ResizeHandler.register(this._oInnerControl , this._fnHandleResize.bind(this));
+		}
+
+	};
+
+	ChartItemPanel.prototype._switchMobileMode = function(bMobile) {
+
+		if (this._bMobileMode == bMobile) {
+			return;
+		}
+
+		this._bMobileMode = bMobile;
+
+		if (this._sContainerResizeListener) {
+			ResizeHandler.deregister(this._sContainerResizeListener);
+			this._sContainerResizeListener = null;
+		}
+
+		this._oListControl.destroy();
+		this._oDragDropInfo = null;
+
+		// list is necessary to set the template + model on
+		this._oListControl = this._createInnerListControl();
+
+		// disable 'select all'
+		this._oListControl.setMultiSelectMode("ClearAll");
+
+		this._setInnerLayout();
+		this._bindListItems();
+
+	};
+
+	ChartItemPanel.prototype._createInnerListControl = function() {
+
+		var sId = this._bMobileMode ? this.getId() + "-innerP13nListMobile" : this.getId() + "-innerP13nList";
+
+		var oTable = new Table(sId, Object.assign(this._getListControlConfig(), {}));
+		this.setEnableReorder(true); //We always want reordering to be active in this panel
+
+		oTable.addEventDelegate({
+			onAfterRendering: this._checkFocusAfterTableRerender.bind(this)
+		});
+
+		return oTable;
+	};
+
+	ChartItemPanel.prototype._checkFocusAfterTableRerender = function(){
+
+		if (this._oFocusInfo && this._oFocusInfo.tableItem){
+			//Focus table item directly
+			this._oFocusInfo.tableItem.focus();
+		}
+
+		//Reset focus info
+		this._oFocusInfo = null;
+	};
+
+	ChartItemPanel.prototype._bindListItems = function(mBindingInfo) {
+			var oSorter;
+			var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+
+			if ( this.getPanelConfig() && this.getPanelConfig().sorter) {
+				oSorter = this.getPanelConfig().sorter;
+			} else {
+
+					var oMeasuresGroup = { text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_MEASURE_GROUP_HEADER')};
+					var oDimensionsGroup = { text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_DIMENSION_GROUP_HEADER')};
+
+					var mGroupInfo = {
+						"Aggregatable": oMeasuresGroup,
+						"Groupable" : oDimensionsGroup,
+						"Measure": oMeasuresGroup,
+						"Dimension" : oDimensionsGroup
+					};
+
+					var fGrouper = function(oContext) {
+						var group = oContext.getProperty("kind");
+						return { key: group, text: mGroupInfo[group].text };
+					};
+
+					var fSorter = function(a,b) {
+						if (a === b) {
+							return 0;
+						}
+
+						if (a === "MEASURE" || a === "AGGREGATABLE"){
+							return 1;
+						}
+
+						return -1;
+					};
+
+				oSorter = new Sorter("kind", false, fGrouper, fSorter);
+			}
+
+
+			var oFactoryFunction;
+			this._mTemplatesMap = new Map();
+			if (this._bMobileMode) {
+				oFactoryFunction = this._createListItemMobile;
+			} else {
+				oFactoryFunction = this._createListItem;
+			}
+
+			this._oListControl.bindItems(Object.assign({
+				path: this.P13N_MODEL + ">/items",
+				key: "name", //TODO: Bind with combined key (name + kind)?
+				filters: [new Filter({
+					filters: [
+						new Filter("visible", FilterOperator.EQ, true),
+						new Filter("template", FilterOperator.EQ, true)
+					],
+					and: false
+				  })],
+				  factory: oFactoryFunction.bind(this),
+				sorter : oSorter
+			}, mBindingInfo));
+	};
+
+	ChartItemPanel.prototype._getTemplateComboBox = function(sKind){
+		var oVisibleFilter = new Filter("visible", FilterOperator.EQ, false);
+
+		var oComboBox = new ComboBox({
+			id: "p13nPanel-templateComboBox-" + sKind,
+			width: "100%",
+			placeholder: this._getPlaceholderTextForTemplate(sKind),
+			items: {
+				path: this.P13N_MODEL + ">/items",
+				template: new Item({
+					key: "{" + this.P13N_MODEL + ">name}",
+					text: "{" + this.P13N_MODEL + ">label}"
+				}),
+				templateShareable : false,
+				filters: [oVisibleFilter, new Filter("kind", FilterOperator.EQ, sKind)]
+			},
+			change: [this.onChangeOfTemplateName, this]
+		});
+
+		this._mTemplatesMap.set(sKind, oComboBox);
+
+		return oComboBox;
+	};
+
+	ChartItemPanel.prototype._getPlaceholderTextForTemplate = function(sKind) {
+		var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+		return MDCRb.getText('chart.PERSONALIZATION_DIALOG_TEMPLATE_PLACEHOLDER');
+	};
+
+	ChartItemPanel.prototype._getRoleSelect = function() {
+		return new Select({
+			width: "100%",
+			selectedKey: "{" + this.P13N_MODEL + ">role}",
+			change: [this.onChangeOfRole, this],
+			forceSelection: false,
+			items: {
+				path: this.P13N_MODEL + ">availableRoles",
+				templateShareable: false,
+				template: new Item({
+					key: "{" + this.P13N_MODEL + ">key}",
+					text: "{" + this.P13N_MODEL + ">text}"
+				})
+			},
+			visible: {
+				path: this.P13N_MODEL + ">availableRoles",
+				formatter: function(aRoles) {
+
+					if (!aRoles) {
+						return false;
+					}
+
+					return aRoles.length > 1;
+				}
+			}
+		});
+	};
+
+	ChartItemPanel.prototype._getNameComboBox = function(sKind, sName) {
+		var oNameFilterPersistent = new Filter({
+			filters: [
+				new Filter("visible", FilterOperator.EQ, false),
+				new Filter("name", FilterOperator.EQ, sName)
+			],
+			and: false
+		});
+
+		return new ComboBox({
+			width: "100%",
+			items: {
+				path: this.P13N_MODEL + ">/items",
+				template: new Item({
+					key: "{" + this.P13N_MODEL + ">name}",
+					text: "{" + this.P13N_MODEL + ">label}"
+				}),
+				templateShareable : false,
+				filters: [oNameFilterPersistent, new Filter("kind", FilterOperator.EQ, sKind)]
+			},
+			change: [this.onChangeOfItemName, this],
+			selectedKey: "{" + this.P13N_MODEL + ">tempName}",
+			customData: [new CustomData({key: "prevName", value: sName}),
+						 new CustomData({key: "prevKind", value: sKind})]
+		});
+	};
+
+	ChartItemPanel.prototype._createListItem = function(sId, oObject){
+
+		var sRemoveBtnId, aCells = [];
+
+
+		if (oObject.getObject() && oObject.getObject().template){
+			aCells.push(this._getTemplateComboBox(oObject.getObject().kind));
+		} else {
+			aCells.push(this._getNameComboBox(oObject.getObject().kind, oObject.getObject().name));
+			aCells.push(this._getRoleSelect());
+			sRemoveBtnId = this.getId() + oObject.getObject().kind + "-RemoveBtn-" + oObject.getObject().name;
+
+			aCells.push(new HBox({
+				justifyContent: FlexJustifyContent.End,
+				items: [
+				new Button({
+					id: sRemoveBtnId,
+					press: [this._onPressHide, this],
+					type: "Transparent",
+					icon: "sap-icon://decline",
+					tooltip: this._getResourceTextMDC("chart.PERSONALIZATION_DIALOG_REMOVE_ENTRY"),
+					customData: [new CustomData({key: "propertyName", value: "{" + this.P13N_MODEL + ">name}"}),
+								 new CustomData({key: "propertyKind", value: "{" + this.P13N_MODEL + ">kind}"})]
+				})
+			]}));
+		}
+
+		var oListItem;
+		if (oObject.getObject() && oObject.getObject().template) {
+			var sKind = oObject.getObject().kind;
+			oListItem = new ColumnListItem({
+				cells: aCells,
+				visible: {
+					path: this.P13N_MODEL + ">/items",
+					formatter: function(aItems){
+						aItems = aItems.filter(function(oItem){return oItem.visible === false && oItem.template === false && oItem.kind === sKind;});
+						return aItems.length != 0;
+					}
+				}
+			});
+		} else {
+			oListItem = new ColumnListItem({
+				cells: aCells
+			});
+		}
+
+		oListItem.addEventDelegate({
+			onmouseover: this._hoverHandler.bind(this),
+			onfocusin: this._focusHandler.bind(this),
+			onkeydown: this._handleOnKeyDown.bind(this)
+		});
+
+		return oListItem;
+	};
+
+	ChartItemPanel.prototype._createListItemMobile = function(sId, oObject){
+
+		var sRemoveBtnId, aCells = [];
+
+		if (oObject.getObject() && oObject.getObject().template){
+			aCells.push(this._getTemplateComboBox(oObject.getObject().kind));
+		} else {
+
+			var oVBox = new VBox({
+				items: [
+					this._getNameComboBox(oObject.getObject().kind, oObject.getObject().name),
+					this._getRoleSelect()
+				]
+			});
+
+			sRemoveBtnId = oObject.getObject().kind + "-RemoveBtn-" + oObject.getObject().name;
+			aCells.push(oVBox);
+
+		}
+
+		var oRemoveColumn = new HBox({
+			justifyContent: FlexJustifyContent.End,
+			items: [new Button({
+			id: sRemoveBtnId,
+			press: [this._onPressHide, this],
+			type: "Transparent", icon: "sap-icon://decline",
+			visible: {
+				path: this.P13N_MODEL + ">template",
+				formatter: function(bEnabled) {
+					return !bEnabled;
+				}
+			},
+			customData: [new CustomData({key: "propertyName", value: "{" + this.P13N_MODEL + ">name}"}),
+						 new CustomData({key: "propertyKind", value: "{" + this.P13N_MODEL + ">kind}"})]
+		})]});
+
+		aCells.push(oRemoveColumn);
+
+
+		var oListItem;
+		if (oObject.getObject() && oObject.getObject().template) {
+			var sKind = oObject.getObject().kind;
+			oListItem = new ColumnListItem({
+				cells: aCells,
+				visible: {
+					path: this.P13N_MODEL + ">/items",
+					formatter: function(aItems){
+						aItems = aItems.filter(function(oItem){return oItem.visible === false && oItem.template === false && oItem.kind === sKind;});
+						return aItems.length != 0;
+					}
+				}
+			});
+		} else {
+			oListItem = new ColumnListItem({
+				cells: aCells
+			});
+		}
+
+		oListItem.addEventDelegate({
+			onmouseover: this._hoverHandler.bind(this),
+			onfocusin: this._focusHandler.bind(this),
+			onkeydown: this._handleOnKeyDown.bind(this)
+		});
+
+		return oListItem;
+	};
+
+	//ACC realted stuff
+	ChartItemPanel.prototype._handleOnKeyDown = function(oEvent){
+		if (oEvent.keyCode === 38 && oEvent.ctrlKey){
+			//Ctrl+Arrow Up
+			//Move Up
+			//Disabled for now until further clarification
+			/*
+			if (this._oMoveUpButton && this._oMoveUpButton.getEnabled() && this._getMoveButtonContainer()){
+				this._onPressButtonMoveUp(oEvent, core.byId(oEvent.currentTarget.id));
+			}*/
+		} else if (oEvent.keyCode === 40 && oEvent.ctrlKey){
+			//Ctrl+Arrow Down
+			//Move Down
+			//Disabled for now until further clarification
+			/*
+			if (this._oMoveUpButton && this._oMoveDownButton.getEnabled() && this._getMoveButtonContainer()){
+				this._onPressButtonMoveDown(oEvent, core.byId(oEvent.currentTarget.id));
+			}*/
+		} else if (oEvent.keyCode === 68 && oEvent.ctrlKey){
+			//Ctrl+D
+			//Remove
+			var oRemoveBtn, oListItem = core.byId(oEvent.currentTarget.id);
+
+			if (this._bMobileMode) {
+				oRemoveBtn = oListItem.getCells()[1].getItems()[oListItem.getCells()[1].getItems().length - 1];
+			} else {
+				oRemoveBtn = oListItem.getCells()[2].getItems()[oListItem.getCells()[2].getItems().length - 1];
+			}
+
+			if (oRemoveBtn){
+				this._onPressHide(oEvent, oRemoveBtn);
+				oEvent.preventDefault();
+			}
+
+		}
+
+	};
+
+	ChartItemPanel.prototype._focusHandler = function(oEvt) {
+
+		var oTarget = core.byId(oEvt.target.id);
+
+		//Don't handle focus on button presses as this messes up event propagation
+		if (oTarget instanceof Button){
+			return;
+		}
+
+		BasePanel.prototype._focusHandler.apply(this, arguments);
+	};
+
+	ChartItemPanel.prototype._handleActivated = function(oHoveredItem) {
+		var oItem = this._getModelItemByTableItem(oHoveredItem);
+		if (oItem && oItem.template) {
+			this.removeMoveButtons();
+		}
+
+        this._oHoveredItem = oHoveredItem;
+		this._updateEnableOfMoveButtons(oHoveredItem, false);
+        this._addMoveButtons(oHoveredItem);
+		this._setMoveButtonVisibility(true);
+
+    };
+
+	ChartItemPanel.prototype.onChangeOfItemName = function(oEvent) {
+		var sPrevName = oEvent.getSource().data().prevName;
+		var sKind = oEvent.getSource().data().prevKind; //Can only select fields within same kind
+		var sNewName = oEvent.getSource().getSelectedKey();
+
+		var oPrevItem = this._getP13nModel().getProperty("/items").find(function(it){ return it.name === sPrevName && it.kind === sKind;});
+		var oNewItem = this._getP13nModel().getProperty("/items").find(function(it){ return it.name === sNewName && it.kind === sKind;});
+
+		this.removeMoveButtons();
+
+		if (oPrevItem && oNewItem) {
+
+			oPrevItem.visible = false;
+			oNewItem.visible = true;
+
+			oPrevItem.tempName = oPrevItem.name;
+
+			oNewItem.role = oPrevItem.role;
+			this._moveItemsByIndex(this._getItemIndex(oNewItem), this._getItemIndex(oPrevItem));
+
+			this._getP13nModel().refresh(true);
+
+			this._fireChangeItems();
+		}
+
+	};
+
+	ChartItemPanel.prototype._getItemIndexByNameAndKind = function(sName, sKind) {
+		var aFields = this._getP13nModel().getProperty("/items");
+		var oField = aFields.find(function(it){return (it.name === sName && it.kind === sKind && !it.template);});
+
+		return this._getItemIndex(oField);
+	};
+
+	ChartItemPanel.prototype._getItemIndex = function(oItem) {
+		return this._getP13nModel().getProperty("/items").indexOf(oItem);
+	};
+
+    ChartItemPanel.prototype.removeMoveButtons = function() {
+        var oMoveButtonBox = this._getMoveButtonContainer();
+
+        if (oMoveButtonBox){
+			oMoveButtonBox.removeItem(this._getMoveBottomButton());
+			oMoveButtonBox.removeItem(this._getMoveDownButton());
+			oMoveButtonBox.removeItem(this._getMoveUpButton());
+            oMoveButtonBox.removeItem(this._getMoveTopButton());
+        }
+
+    };
+
+	//Called on exit of panel; resets templates
+	ChartItemPanel.prototype.getP13nData = function() {
+
+		var aItems = this._getCleanP13nItems();
+
+		this._getP13nModel().setProperty("/items", aItems);
+
+		return aItems;
+	};
+
+    ChartItemPanel.prototype._getMoveButtonContainer = function() {
+        if (this._oMoveUpButton &&
+            this._oMoveUpButton.getParent() &&
+            this._oMoveUpButton.getParent().isA("sap.m.FlexBox")
+        ){
+            return this._oMoveUpButton.getParent();
+        }
+
+		return undefined;
+    };
+
+	ChartItemPanel.prototype._addMoveButtons = function(oItem) {
+        var oTableItem = oItem;
+        if (!oTableItem){
+            return;
+        }
+
+        var bIgnore = this._getP13nModel().getProperty(oTableItem.getBindingContextPath()) ? this._getP13nModel().getProperty(oTableItem.getBindingContextPath()).template : true;
+
+        if (!bIgnore){
+			if (this._bMobileMode){
+				oTableItem.getCells()[1].insertItem(this._getMoveDownButton(), 0);
+				oTableItem.getCells()[1].insertItem(this._getMoveUpButton(), 0);
+			} else {
+				oTableItem.getCells()[2].insertItem(this._getMoveBottomButton(), 0);
+				oTableItem.getCells()[2].insertItem(this._getMoveDownButton(), 0);
+				oTableItem.getCells()[2].insertItem(this._getMoveUpButton(), 0);
+				oTableItem.getCells()[2].insertItem(this._getMoveTopButton(), 0);
+			}
+
+        }
+    };
+
+	ChartItemPanel.prototype._moveSelectedItem = function(){
+		this._oSelectedItem = this._getMoveButtonContainer().getParent();
+
+        BasePanel.prototype._moveSelectedItem.apply(this, arguments);
+    };
+
+
+	ChartItemPanel.prototype._updateAvailableRolesForItems = function() {
+		var aItems = this._getP13nModel().getProperty("/items");
+		var aAllowedRoles = [];
+		if (this.getPanelConfig() && this.getPanelConfig().allowedLayoutOptions) {
+			aAllowedRoles = this.getPanelConfig().allowedLayoutOptions;
+		} else {
+			Log.warning("No allowedLayoutOptions configured for chart type. This will not show any p13n options!");
+		}
+
+
+		aItems.forEach(function(oItem){
+
+			if (!oItem.availableRoles) {
+				return;
+			}
+
+			oItem.availableRoles = oItem.availableRoles.filter(function(it){return aAllowedRoles.indexOf(it.key) != -1;});
+		});
+
+		this._getP13nModel().setProperty("/items", aItems);
+		this._getP13nModel().refresh(true);
+	};
+
+	ChartItemPanel.prototype._onPressHide = function(oEvent, oRemoveBtn) {
+
+		var sPropertyName;
+		if (oRemoveBtn) {
+			sPropertyName = oRemoveBtn.data().propertyName;
+		} else {
+			sPropertyName = oEvent.getSource().data().propertyName;
+		}
+
+		var aItems = jQuery.extend([], this._getP13nModel().getProperty("/items"), true);
+
+		aItems.filter(function(it){return it.name === sPropertyName;}).forEach(function(oItem){
+			oItem.visible = false;
+			//Used to set focus on template row after re-render of table
+			if (this._mTemplatesMap.has(oItem.kind) && this._mTemplatesMap.get(oItem.kind).getVisible()){
+				this._mTemplatesMap.get(oItem.kind).focus();
+			}
+		}.bind(this));
+
+		this._getP13nModel().setProperty("/items", aItems);
+		this._getP13nModel().refresh(true);
+		this._fireChangeItems();
+		this._updateVisibleIndexes();
+	};
+
+	ChartItemPanel.prototype.setP13nData = function(aP13nData){
+
+		//Clear previous templates (if any)
+		aP13nData = aP13nData.filter(function(it){return !it.template;});
+
+		BasePanel.prototype.setP13nData.apply(this, arguments);
 
 		var aItems = [];
+		var aAddableItems = [];
 
-		this.getP13nModel().getProperty("/items").forEach(function(oItem){
+		this.getP13nData().forEach(function(oItem, iIndex){
 			if (!oItem.availableRoles) {
 				oItem.availableRoles = this._getChartItemTextByKey(oItem.kind);
 			}
+
+			if (this.getPanelConfig() && this.getPanelConfig().allowedLayoutOptions) {
+				var aAllowedRoles = this.getPanelConfig().allowedLayoutOptions;
+
+				if (aAllowedRoles && aAllowedRoles.length >= 1) {
+					oItem.availableRoles = oItem.availableRoles.filter(function(it){return aAllowedRoles.indexOf(it.key) != -1;});
+
+					//Reset if an invalid role is selected
+					if (aAllowedRoles.indexOf(oItem.role) === -1) {
+						oItem.role = aAllowedRoles[0];
+					}
+				}
+			}
+
+			oItem.template = false;
+			//Used for comboboxes renaming
+			oItem.tempName = oItem.name;
+
+			if (!oItem.visible){
+				aAddableItems.push(oItem);
+			}
+
+			if (!oItem.index) {
+				oItem.index = iIndex;
+			}
+
 			aItems.push(oItem);
 		}.bind(this));
 
-		this.getP13nModel().setProperty("/items", aItems);
+		aItems = aItems.concat(this._getTemplateItems());
+
+		this._getP13nModel().setProperty("/items", aItems);
+		this._updateVisibleIndexes();
+	};
+
+	ChartItemPanel.prototype._updateVisibleIndexes = function() {
+		this._mVisibleIndexes = new Map();
+
+		this._getP13nModel().getProperty("/items").forEach(function(oItem, _iIndex){
+
+			if (oItem.template || !oItem.visible) {
+				return;
+			}
+
+			if (this._mVisibleIndexes.has(oItem.kind)){
+				this._mVisibleIndexes.get(oItem.kind).push(_iIndex);
+			} else {
+				var aIndexes = [_iIndex];
+				this._mVisibleIndexes.set(oItem.kind, aIndexes);
+			}
+		}.bind(this));
+
+	};
+
+	ChartItemPanel.prototype.onChangeOfTemplateName = function(oEvent){
+
+		var sSelectedName = oEvent.getSource().getSelectedKey();
+
+		var oSelectedItem = this._getCleanP13nItems().find(function(it){ return it.name === sSelectedName;});
+
+		if (oSelectedItem){
+			oSelectedItem.visible = true;
+
+			oEvent.getSource().setSelectedKey(undefined);
+			this._getP13nModel().refresh(true);
+
+			var aIndexes = this._mVisibleIndexes.has(oSelectedItem.kind) ? this._mVisibleIndexes.get(oSelectedItem.kind) : [];
+			var iOldIndex = this._getItemIndexByNameAndKind(oSelectedItem.name, oSelectedItem.kind);
+			var iNewIndex = aIndexes[aIndexes.length - 1];
+
+			if (iOldIndex > iNewIndex) {
+				iNewIndex += 1;
+			}
+
+			if (iNewIndex && iOldIndex != iNewIndex) {
+				this._moveItemsByIndex(iOldIndex, iNewIndex, true);
+			} else {
+				this._fireChangeItems(); //Otherwise already fired by _moveItemsByIndex
+			}
+
+
+			this._updateVisibleIndexes();
+		} else {
+			oEvent.getSource().setSelectedKey(undefined);
+		}
+
+	};
+
+	ChartItemPanel.prototype._getTemplateItems = function() {
+		var aItems = [];
+
+		if (!this.getPanelConfig() || !this.getPanelConfig().templateConfig){
+			return [];
+		}
+
+		this.getPanelConfig().templateConfig.forEach(function(oTemplateConfig){
+			var oItem = {template: true, kind: oTemplateConfig.kind};
+
+			aItems.push(oItem);
+		});
+
+		return aItems;
+	};
+
+	ChartItemPanel.prototype._getListControlConfig = function(){
+		var oConfig = BasePanel.prototype._getListControlConfig.apply(this, arguments);
+
+		if (this._bMobileMode){
+			oConfig.columns = [new Column({
+				header: new Text({
+					text: this._getResourceTextMDC("chart.PERSONALIZATION_DIALOG_COLUMN_DESCRIPTION") + " / " + this._getResourceTextMDC("chart.PERSONALIZATION_DIALOG_COLUMN_ROLE")
+				})
+			}), new Column()];
+		} else {
+
+			var oDescColumn = new Column({
+				header: new Text({
+					text: this._getResourceTextMDC("chart.PERSONALIZATION_DIALOG_COLUMN_DESCRIPTION")
+				})
+			});
+
+			var oRoleColumn = new Column({
+				header: new Text({
+					text: this._getResourceTextMDC("chart.PERSONALIZATION_DIALOG_COLUMN_ROLE")
+				})
+			});
+			oConfig.columns = [oDescColumn, oRoleColumn, new Column()];
+		}
+
+		oConfig.mode = "None";
+		return oConfig;
+	};
+
+	ChartItemPanel.prototype._getCleanP13nItems = function() {
+		return this._getP13nModel().getProperty("/items").filter(function(it){return !it.template;});
+	};
+
+	ChartItemPanel.prototype._fireChangeItems = function() {
+
+		this.fireChangeItems({
+			items: this._getCleanP13nItems().map(function(oMItem) {
+				return {
+					columnKey: oMItem.name,
+					visible: oMItem.visible,
+					index: oMItem.index,
+					role: oMItem.role
+				};
+			})
+		});
 
 	};
 
@@ -94,11 +832,313 @@ sap.ui.define([
 		var oSelectedItem = oEvent.getParameter("selectedItem");
 		// Fire event only for valid selection
 		if (oSelectedItem) {
-			var oTableItem = oEvent.getSource().getParent();
+
+			var oTableItem;
+
+			if (this._bMobileMode){
+				oTableItem = oEvent.getSource().getParent().getParent();
+			} else {
+				oTableItem = oEvent.getSource().getParent();
+			}
 
 			this.fireChange();
 			this._updateEnableOfMoveButtons(oTableItem);
 		}
+
+		this._fireChangeItems();
+	};
+
+	ChartItemPanel.prototype._updateEnableOfMoveButtons = function(oTableItem, bFocus) {
+
+		if (!oTableItem) {
+			return;
+		}
+
+		var aIndexes, oMItem = this._getModelItemByTableItem(oTableItem);
+		var iTableItemPos = this._getP13nModel().getProperty("/items").indexOf(oMItem);
+		var bUpEnabled = true, bDownEnabled = true;
+
+		if (!oMItem || oMItem.template) {
+			return;
+		}
+
+		aIndexes = this._mVisibleIndexes.has(oMItem.kind) ? this._mVisibleIndexes.get(oMItem.kind) : [];
+
+		if (iTableItemPos == 0 || aIndexes.indexOf(iTableItemPos) === 0 ) {
+			// disable move buttons upwards, if the item is at the top
+			bUpEnabled = false;
+		}
+
+		if (aIndexes.indexOf(iTableItemPos) === aIndexes.length - 1 ) {
+			bDownEnabled = false;
+		}
+
+		this._getMoveTopButton().setEnabled(bUpEnabled);
+		this._getMoveUpButton().setEnabled(bUpEnabled);
+		this._getMoveDownButton().setEnabled(bDownEnabled);
+		this._getMoveBottomButton().setEnabled(bDownEnabled);
+
+		if (bFocus) {
+			//Table re-renders after reorder; this is used in onAfterRendering
+			this._oFocusInfo = {tableItem : oTableItem};
+		}
+	};
+
+	ChartItemPanel.prototype._getListItemFromMoveButton = function (oBtn) {
+		if (oBtn && oBtn.getParent() && oBtn.getParent().getParent()) {
+			return oBtn.getParent().getParent();
+		}
+
+		return undefined;
+	};
+
+	ChartItemPanel.prototype._onPressButtonMoveToTop = function(oEvent) {
+		var oListItem = this._getListItemFromMoveButton(oEvent.getSource());
+		if (!oListItem){
+			return;
+		}
+		var  oMItem = this._getP13nModel().getProperty(oListItem.getBindingContextPath());
+		var oTopIndex = this._mVisibleIndexes.get(oMItem.kind)[0];
+
+		this._oSelectedItem = oListItem;
+
+		this._moveSelectedItem(oTopIndex);
+	};
+
+	ChartItemPanel.prototype._onPressButtonMoveUp = function(oEvent, oListItem) {
+		if (!oListItem){
+			oListItem = this._getListItemFromMoveButton(oEvent.getSource());
+		}
+
+		if (!oListItem){
+			return;
+		}
+		var oMItem = this._getP13nModel().getProperty(oListItem.getBindingContextPath());
+		var aIndexes = this._mVisibleIndexes.get(oMItem.kind);
+		var iTableItemPos = this._getP13nModel().getProperty("/items").indexOf(oMItem);
+
+		this._oSelectedItem = oListItem;
+
+		//TODO: Get current index
+		var oNewIndex = aIndexes[aIndexes.indexOf(iTableItemPos) - 1];
+
+		this._moveSelectedItem(oNewIndex);
+	};
+
+	ChartItemPanel.prototype._onPressButtonMoveDown = function(oEvent, oListItem) {
+		if (!oListItem){
+			oListItem = this._getListItemFromMoveButton(oEvent.getSource());
+		}
+
+		if (!oListItem){
+			return;
+		}
+		var oMItem = this._getP13nModel().getProperty(oListItem.getBindingContextPath());
+		var aIndexes = this._mVisibleIndexes.get(oMItem.kind);
+		var iTableItemPos = this._getP13nModel().getProperty("/items").indexOf(oMItem);
+
+		this._oSelectedItem = oListItem;
+
+		//TODO: Get current index
+		var oNewIndex = aIndexes[aIndexes.indexOf(iTableItemPos) + 1];
+
+		this._moveSelectedItem(oNewIndex);
+	};
+
+	ChartItemPanel.prototype._onPressButtonMoveToBottom = function(oEvent) {
+
+		var oListItem = this._getListItemFromMoveButton(oEvent.getSource());
+		if (!oListItem){
+			return;
+		}
+		var  oMItem = this._getP13nModel().getProperty(oListItem.getBindingContextPath());
+		var oBottomIndex = this._mVisibleIndexes.get(oMItem.kind)[this._mVisibleIndexes.get(oMItem.kind).length - 1];
+
+		this._oSelectedItem = oListItem;
+		this._moveSelectedItem(oBottomIndex);
+	};
+
+	ChartItemPanel.prototype._moveTableItem = function(oItem, iNewIndex) {
+		var aFields = this._getP13nModel().getProperty("/items");
+
+		// index of the item in the model not the index in the aggregation
+		var iOldIndex = aFields.indexOf(oItem.getBindingContext(this.P13N_MODEL).getObject());
+
+		this._moveItemsByIndex(iOldIndex, iNewIndex);
+	};
+
+	ChartItemPanel.prototype._moveItemsByIndex = function(iOldIndex, iNewIndex, bPreventFocusHandling) {
+		var aFields = this._getP13nModel().getProperty("/items");
+
+		// limit the minumum and maximum index
+		iNewIndex = (iNewIndex <= 0) ? 0 : Math.min(iNewIndex, aFields.length - 1);
+
+		if (iNewIndex == iOldIndex) {
+			return;
+		}
+
+		// remove data from old position and insert it into new position
+		aFields.splice(iNewIndex, 0, aFields.splice(iOldIndex, 1)[0]);
+		aFields.forEach(function(oField, iIndex){
+			if (!oField.template) {
+				oField.index = iIndex;
+			}
+		});
+		this._getP13nModel().setProperty("/items", aFields);
+
+		if (!bPreventFocusHandling){
+			// store the moved item again due to binding
+			this._oSelectedItem = this._oListControl.getItems().find(function(it){
+				var oItem = this._getModelItemByTableItem(it);
+
+				return oItem && oItem === aFields[iNewIndex];
+
+			}.bind(this));
+
+			this._updateEnableOfMoveButtons(this._oSelectedItem, !bPreventFocusHandling);
+
+			this._handleActivated(this._oSelectedItem);
+		}
+
+		this._fireChangeItems();
+	};
+
+	ChartItemPanel.prototype._getModelItemByTableItem = function (oTableItem) {
+		return this._getP13nModel().getProperty(oTableItem.getBindingContextPath());
+	};
+	//TODO: Check from here on for kind
+
+	ChartItemPanel.prototype._getMoveConfigForTableItem = function(oTableItem) {
+
+		var oModelItem = this._getModelItemByTableItem(oTableItem);
+
+		if (!oModelItem) {
+			return undefined;
+		}
+
+		return {
+			currentIndex: this._getP13nModel().getProperty("/items").indexOf(oModelItem),
+			aggregationRole: oModelItem.kind,
+			template: oModelItem.template
+		};
+	};
+
+	ChartItemPanel.prototype._getDragDropConfig = function () {
+		if (!this._oDragDropInfo) {
+			var oDndConfig = BasePanel.prototype._getDragDropConfig.apply(this, arguments);
+
+			oDndConfig.attachDragStart(this._checkDragStart.bind(this));
+			oDndConfig.attachDragEnter(this._checkDrag.bind(this));
+			oDndConfig.attachDragEnd(function() {
+				this._oDraggedItem = null;
+			}.bind(this));
+
+			return oDndConfig;
+		}
+
+		return this._oDragDropInfo;
+	};
+
+	ChartItemPanel.prototype._checkDrag = function(oEvent) {
+		var oEventItem = oEvent.getParameter("target");
+		var oMoveConfigEvent = this._getMoveConfigForTableItem(oEventItem);
+		var oMoveConfigDragged = this._getMoveConfigForTableItem(this._oDraggedItem);
+
+		//Prevents template from being draggable
+		if (!oMoveConfigEvent || oMoveConfigEvent.template || oMoveConfigDragged.aggregationRole != oMoveConfigEvent.aggregationRole) {
+			oEvent.preventDefault();
+			return;
+		}
+	};
+
+	ChartItemPanel.prototype._checkDragStart = function(oEvent) {
+		this._oDraggedItem = oEvent.getParameter("target");
+
+		this._checkDrag(oEvent);
+	};
+
+	ChartItemPanel.prototype._onRearrange = function(oEvent) {
+		var oDraggedItem = oEvent.getParameter("draggedControl");
+		var oDroppedItem = oEvent.getParameter("droppedControl");
+		var sDropPosition = oEvent.getParameter("dropPosition");
+
+		var oMoveConfigDragged = this._getMoveConfigForTableItem(oDraggedItem);
+		var oMoveConfigDropped = this._getMoveConfigForTableItem(oDroppedItem);
+
+		if (!oMoveConfigDragged || oMoveConfigDragged.template || !oMoveConfigDropped) {
+			oEvent.preventDefault();
+			return;
+		}
+
+		var iDraggedIndex = oMoveConfigDragged.currentIndex;
+		var iDroppedIndex = oMoveConfigDropped.currentIndex;
+
+		if (oMoveConfigDropped.template && sDropPosition == "After") {
+			oEvent.preventDefault();
+			return;
+		}
+
+		if (!oMoveConfigDropped.template &&
+			(
+				oMoveConfigDragged.aggregationRole != undefined &&
+				oMoveConfigDragged.aggregationRole != oMoveConfigDropped.aggregationRole)) {
+			oEvent.preventDefault();
+			return;
+		}
+
+		//When an item gets dragged into the same "direction" it come from inside the array, an offset is needed
+		if (iDraggedIndex < iDroppedIndex) {
+			if (sDropPosition == "Before" && iDroppedIndex != 0) {
+				iDroppedIndex -= 1;
+			}
+
+		//Max index not needed here since draggedIndex must be greater than dropped index -> can't be dropped at max
+		} else if (sDropPosition == "After") {
+
+			iDroppedIndex += 1;
+		}
+
+		this._moveItemsByIndex(iDraggedIndex, iDroppedIndex);
+
+		this._getP13nModel().refresh(true);
+		this._updateVisibleIndexes();
+
+	};
+
+	ChartItemPanel.prototype._getMoveTopButton = function() {
+
+		if (this._oMoveTopBtn && this._oMoveTopBtn.isDestroyed()) {
+			this._oMoveTopBtn = null;
+		}
+
+		return BasePanel.prototype._getMoveTopButton.apply(this, arguments);
+	};
+
+	ChartItemPanel.prototype._getMoveUpButton = function() {
+
+		if (this._oMoveUpButton && this._oMoveUpButton.isDestroyed()) {
+			this._oMoveUpButton = null;
+		}
+
+		return BasePanel.prototype._getMoveUpButton.apply(this, arguments);
+	};
+
+	ChartItemPanel.prototype._getMoveDownButton = function() {
+
+		if (this._oMoveDownButton && this._oMoveDownButton.isDestroyed()) {
+			this._oMoveDownButton = null;
+		}
+
+		return BasePanel.prototype._getMoveDownButton.apply(this, arguments);
+	};
+
+	ChartItemPanel.prototype._getMoveBottomButton = function() {
+
+		if (this._oMoveBottomButton && this._oMoveBottomButton.isDestroyed()) {
+			this._oMoveBottomButton = null;
+		}
+
+		return BasePanel.prototype._getMoveBottomButton.apply(this, arguments);
 	};
 
 	ChartItemPanel.prototype._getChartItemTextByKey = function (sKey) {
@@ -132,6 +1172,11 @@ sap.ui.define([
 		return oAvailableRoles[sKey];
 	};
 
+	ChartItemPanel.prototype._getResourceTextMDC = function(sText, vValue) {
+		this.oResourceBundleMDC = this.oResourceBundleMDC ? this.oResourceBundleMDC : sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+		return sText ? this.oResourceBundleMDC.getText(sText, vValue) : this.oResourceBundleMDC;
+	};
+
 	return ChartItemPanel;
 
-});
+});