From 8c8f711fe850b03e256bac6d0ccc825756eafac6 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Mon, 16 Aug 2021 15:16:08 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03551=20-=20Migrate=20module=20to=20new?=
 =?UTF-8?q?=20UIBlock=20system=20:=20Customer=20Survey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vendors/_jquery-multiselect.scss          | 24 +++++++++++++++++++
 js/jquery.multiselect.js                      |  2 ++
 setup/wizardcontroller.class.inc.php          | 10 ++++----
 .../components/datatable/layout.ready.js.twig |  2 +-
 webservices/export.php                        | 10 ++++----
 5 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/css/backoffice/vendors/_jquery-multiselect.scss b/css/backoffice/vendors/_jquery-multiselect.scss
index 7e2d0b394..450909cf4 100644
--- a/css/backoffice/vendors/_jquery-multiselect.scss
+++ b/css/backoffice/vendors/_jquery-multiselect.scss
@@ -112,6 +112,30 @@ button.ui-multiselect > span {
   text-decoration:none 
 }
 
+/**for multiselect in 3.0*/
+.ui-dialog-titlebar.ui-multiselect-header {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+.ui-dialog-titlebar.ui-multiselect-header ul {
+  padding-left: 0px;
+  width:100%;
+}
+.ui-dialog-titlebar.ui-multiselect-header a{
+  color:$ibo-color-grey-900;
+  font-weight:normal;
+}
+.ui-multiselect, .ui-multiselect-menu, .ui-multiselect-header{
+  background-color: $ibo-color-grey-100;
+}
+button.ui-multiselect {
+  padding-right:10px !important;
+}
+button.ui-multiselect .fas{
+  float:right;
+  padding-left:10px;
+}
+
 /**for multiselect in 3.0*/
 .ui-dialog-titlebar.ui-multiselect-header {
   padding-left: 20px;
diff --git a/js/jquery.multiselect.js b/js/jquery.multiselect.js
index 9cac48d7d..d882b97ce 100644
--- a/js/jquery.multiselect.js
+++ b/js/jquery.multiselect.js
@@ -644,6 +644,8 @@
     },
 
     checkAll: function(e) {
+	   /* currentTarget.addClass();
+	    currentTarget.removeClass();*/
       this._toggleChecked(true);
       this._trigger('checkAll');
     },
diff --git a/setup/wizardcontroller.class.inc.php b/setup/wizardcontroller.class.inc.php
index 5c6a54f3c..19b075232 100644
--- a/setup/wizardcontroller.class.inc.php
+++ b/setup/wizardcontroller.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2021 Combodo SARL
+// Copyright (C) 2010-2012 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -25,7 +25,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
  * The WizardController provides the "<< Back" feature by storing a stack
  * of the previous screens. The WizardController also maintains from page
  * to page a list of "parameters" to be dispayed/edited by each of the steps.
- * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -233,9 +233,9 @@ $('form').each(function () {
 		width: 0
 	}));
 });
-$('#btn_back').on('click', function() { $('#wiz_form').data('back', true); });
+$('#btn_back').click(function() { $('#wiz_form').data('back', true); });
 
-$('#wiz_form').on('submit', function() {
+$('#wiz_form').submit(function() {
 	if ($(this).data('back'))
 	{
 		return CanMoveBackward();
@@ -346,7 +346,7 @@ on the page's parameters
  * If a step needs to maintain an internal "state" (for complex steps)
  * then it's up to the derived class to implement the behavior based on
  * the internal 'sCurrentState' variable.
- * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
diff --git a/templates/base/components/datatable/layout.ready.js.twig b/templates/base/components/datatable/layout.ready.js.twig
index 419d512b1..0281aad96 100644
--- a/templates/base/components/datatable/layout.ready.js.twig
+++ b/templates/base/components/datatable/layout.ready.js.twig
@@ -186,7 +186,7 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
         {% if oUIBlock.GetOption("select_mode") is not empty %}
         updateDataTableSelection('{{ sListId }}', '{{ oUIBlock.GetId() }}');
         {% if oUIBlock.GetOption("select_mode") != "single" %}
-        this.api().on('select', function (oEvent, dt, type, indexes) {
+            this.api().on('select', function (oEvent, dt, type, indexes) {
             if (bSelectAllowed{{ oUIBlock.GetId() }})
             {
                 let aData = oTable{{ sListIDForVarSuffix }}.rows(indexes).data().toArray();
diff --git a/webservices/export.php b/webservices/export.php
index 6d580a694..9c0064fdc 100644
--- a/webservices/export.php
+++ b/webservices/export.php
@@ -20,9 +20,11 @@
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/excelexporter.class.inc.php');
 
 require_once(APPROOT.'/application/startup.inc.php');
 
+
 const EXIT_CODE_ERROR = -1;
 const EXIT_CODE_FATAL = -2;
 
@@ -226,11 +228,11 @@ if (!empty($sExpression))
 						);
 					} else {
 						$aExtraParams = array(
-							'menu'            => false,
-							'toolkit_menu'    => false,
-							'display_limit'   => false,
+							'menu' => false,
+							'toolkit_menu' => false,
+							'display_limit' => false,
 							'localize_values' => $bLocalize,
-							'zlist'           => 'details',
+							'zlist' => 'details',
 						);
 					}