From 0b5ce04b31133882f901a019c9d8b89dcb33578e Mon Sep 17 00:00:00 2001
From: Alexis Ragot <alexis.ragot@maarch.org>
Date: Mon, 26 Feb 2018 16:03:54 +0100
Subject: [PATCH 01/25] #7267 - default values for the security policy

---
 data/maarchRM/conf/configuration.ini.default | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/maarchRM/conf/configuration.ini.default b/data/maarchRM/conf/configuration.ini.default
index d888df82b..bea0be42f 100755
--- a/data/maarchRM/conf/configuration.ini.default
+++ b/data/maarchRM/conf/configuration.ini.default
@@ -116,10 +116,10 @@ securityPolicy = "{
     'loginAttempts' : 3,
     'passwordValidity' : 0,
     'newPasswordValidity' : 1,
-    'passwordMinLength' : 0,
-    'passwordRequiresSpecialChars' : 0,
-    'passwordRequiresDigits' : 0,
-    'passwordRequiresMixedCase' : 0,
+    'passwordMinLength' : 8,
+    'passwordRequiresSpecialChars' : 1,
+    'passwordRequiresDigits' : 1,
+    'passwordRequiresMixedCase' : 1,
     'sessionTimeout' : 3600,
     'lockDelay' : 30
 }"
-- 
GitLab


From e4374aad1094674359fd795a53a9778efbada280 Mon Sep 17 00:00:00 2001
From: Alexis Ragot <alexis.ragot@maarch.org>
Date: Mon, 26 Feb 2018 16:48:39 +0100
Subject: [PATCH 02/25] #7266 - the feedback message on the the forgot account
 feature is the same when the values are good on not

---
 .../auth/Controller/ForgotAccountTrait.php    | 45 ++++++++++---------
 .../maarchRM/Presenter/auth/user.php          |  2 +-
 .../Resources/locale/fr/auth/messages.po      |  4 +-
 .../auth/userAccount/login/forgotAccount.html | 23 ++++++----
 4 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/bundle/auth/Controller/ForgotAccountTrait.php b/src/bundle/auth/Controller/ForgotAccountTrait.php
index af5f71bb4..d84c310f4 100644
--- a/src/bundle/auth/Controller/ForgotAccountTrait.php
+++ b/src/bundle/auth/Controller/ForgotAccountTrait.php
@@ -41,35 +41,40 @@ trait ForgotAccountTrait
      */
     public function forgotAccount($username, $email)
     {
-        if (!$this->sdoFactory->exists("auth/account", array("accountName" => $username))) {
-             throw \laabs::newException('auth/authenticationException', 'Invalid username or email.', 401);
-        }
+        $result = null;
 
-        $userAccount = $this->sdoFactory->read("auth/account", array("accountName" => $username));
+        try {
+            if (!$this->sdoFactory->exists("auth/account", array("accountName" => $username))) {
+                 throw \laabs::newException('auth/authenticationException', 'Invalid username or email.', 401);
+            }
 
-        if ($userAccount->enabled != true) {
-            throw \laabs::newException('auth/authenticationException', 'User %1$s is disabled', 403, null, array($username));
-        }
+            $userAccount = $this->sdoFactory->read("auth/account", array("accountName" => $username));
 
-        if ($email != $userAccount->emailAddress) {
-            throw \laabs::newException('auth/authenticationException', 'Invalid username or email.', 401);
-        }
+            if ($userAccount->enabled != true) {
+                throw \laabs::newException('auth/authenticationException', 'User %1$s is disabled', 403, null, array($username));
+            }
 
-        $data = new \stdClass();
-        $data->accountId = $userAccount->accountId;
-        $data->tokenDate = \laabs::newTimestamp();
+            if ($email != $userAccount->emailAddress) {
+                throw \laabs::newException('auth/authenticationException', 'Invalid username or email.', 401);
+            }
 
-        $userAccount->tokenDate = $data->tokenDate;
-        $this->sdoFactory->update($userAccount, "auth/account");
+            $data = new \stdClass();
+            $data->accountId = $userAccount->accountId;
+            $data->tokenDate = \laabs::newTimestamp();
 
-        $token = $this->generateEncodedToken($data);
+            $userAccount->tokenDate = $data->tokenDate;
+            $this->sdoFactory->update($userAccount, "auth/account");
 
-        $message = $this->getForgotAccountMessage($token);
+            $token = $this->generateEncodedToken($data);
 
-        $notificationDependency = \laabs::newService("dependency/notification/Notification");
+            $message = $this->getForgotAccountMessage($token);
 
-        $title = "Maarch RM - user information";
-        $result = $notificationDependency->send($title, $message, array($userAccount->emailAddress));
+            $notificationDependency = \laabs::newService("dependency/notification/Notification");
+
+            $title = "Maarch RM - user information";
+            $result = $notificationDependency->send($title, $message, array($userAccount->emailAddress));
+        } catch (\bundle\auth\Exception\authenticationException $e) {
+        }
 
         return $result;
     }
diff --git a/src/presentation/maarchRM/Presenter/auth/user.php b/src/presentation/maarchRM/Presenter/auth/user.php
index 9a8259714..c161c0a14 100755
--- a/src/presentation/maarchRM/Presenter/auth/user.php
+++ b/src/presentation/maarchRM/Presenter/auth/user.php
@@ -306,7 +306,7 @@ class user
     public function forgotAccount()
     {
         $json = $this->json;
-        $json->message = "A reset email has been send";
+        $json->message = "If the account exists, a reset email has been send";
         $json->message = $this->translator->getText($json->message);
 
         return $json->save();
diff --git a/src/presentation/maarchRM/Resources/locale/fr/auth/messages.po b/src/presentation/maarchRM/Resources/locale/fr/auth/messages.po
index 24919183d..235c396bc 100755
--- a/src/presentation/maarchRM/Resources/locale/fr/auth/messages.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/auth/messages.po
@@ -577,8 +577,8 @@ msgstr "Confirmer le mot de passe"
 msgid "Username and / or password invalid"
 msgstr "Nom d'utilisateur et / ou mot de passe invalide"
 
-msgid "A reset email has been send"
-msgstr "Un courriel de réinitialisation a été envoyé"
+msgid "If the account exists, a reset email has been send"
+msgstr "Si le compte existe, un courriel de réinitialisation a été envoyé"
 
 msgid "Password has been updated"
 msgstr "Le mot de passe a été mis à jour"
diff --git a/src/presentation/maarchRM/Resources/view/auth/userAccount/login/forgotAccount.html b/src/presentation/maarchRM/Resources/view/auth/userAccount/login/forgotAccount.html
index 22e11de9e..368206514 100755
--- a/src/presentation/maarchRM/Resources/view/auth/userAccount/login/forgotAccount.html
+++ b/src/presentation/maarchRM/Resources/view/auth/userAccount/login/forgotAccount.html
@@ -16,7 +16,7 @@
                     <div class="form-group">
                         <input type="text" placeholder="Email" class="form-control" name="forgotAccountEmail" id="forgotAccountEmail">
                     </div>
-                    <div class="form-group">
+                    <div class="form-group text-danger">
                         <p class="" id="forgotAccountMessage"></p>
                     </div>
                 </div>
@@ -31,7 +31,7 @@
         </form>
     </div>
 </div>
-
+<span class="hide" id="invalidEmail_text">Email malformed</span>
 <script type="text/javascript">
     $("#loginForm").on("click", "#forgotAccount", function() {
         ForgotAccount.show();
@@ -74,6 +74,13 @@
             if (username == "" || username == undefined || email == "" || email == undefined) {
                 return;
             }
+
+            var emailRegex = new RegExp("^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$");
+
+            if(!emailRegex.test(email)) {
+                $('#forgotAccountMessage').text($('#invalidEmail_text').text());
+                return;
+            }
             
             ajax($('#forgotAccountSendButton'),
                 {
@@ -83,13 +90,13 @@
                     contentType : 'application/json',
                     dataType    : 'json',
                     success     : function (response) {
-                        $('#forgotAccountMessage').removeClass("text-danger");
+
+                        $('#forgotAccountModal').on('hidden.bs.modal', function(){
+                            $('#forgotAccountMessage').text("");
+                            $('#signInMessage').text(response.message);
+                        });
                         ForgotAccount.hide();
-                    },
-                    error       : function (response) {
-                        var response = JSON.parse(response.responseText);
-                        $('#forgotAccountMessage').addClass("text-danger");
-                        $('#forgotAccountMessage').text(response.message);
+
                     }
                 }
             );
-- 
GitLab


From ee3628c25175a545a8b993d603ab84c31d1973d8 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Tue, 27 Feb 2018 10:29:12 +0100
Subject: [PATCH 03/25] #7268 - Format string for exceptions

---
 .../maarchRM/Presenter/Exception.php          | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/presentation/maarchRM/Presenter/Exception.php b/src/presentation/maarchRM/Presenter/Exception.php
index b1441e901..6c665b651 100755
--- a/src/presentation/maarchRM/Presenter/Exception.php
+++ b/src/presentation/maarchRM/Presenter/Exception.php
@@ -94,20 +94,23 @@ class Exception
         if (isset($exception->errors)) {
             $errors = [];
             foreach ($exception->errors as $error) {
-                $error->setMessage($this->translator->getText($error->getFormat()));
-
-                $variables = [];
-
-                $errorVariables = $error->getVariables();
-                if (is_array($errorVariables)) {
-                    foreach ($errorVariables as $name => $value) {
-                        $name = $this->translator->getText($name);
-                        $value = $this->translator->getText($value);
-                        $variables[$name] = $value;
+                if (is_object($error)) {
+                    $error->setMessage($this->translator->getText($error->getFormat()));
+
+                    $variables = [];
+
+                    $errorVariables = $error->getVariables();
+                    if (is_array($errorVariables)) {
+                        foreach ($errorVariables as $name => $value) {
+                            $name = $this->translator->getText($name);
+                            $value = $this->translator->getText($value);
+                            $variables[$name] = $value;
+                        }
                     }
+                    $error->setVariables($variables);
+                } else {
+                    $error = new \core\Error($error);
                 }
-                $error->setVariables($variables);
-                
                 $errors[] = $error;
             }
             $this->json->errors = $errors;
-- 
GitLab


From d71b1112b851b67c25eb440032b933eb3318fde2 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Tue, 27 Feb 2018 10:39:31 +0100
Subject: [PATCH 04/25] #7279 - Change pattern

---
 src/bundle/auth/Message/newUserAccount.php               | 2 +-
 src/bundle/auth/Message/userAccountUpdate.php            | 2 +-
 src/bundle/recordsManagement/Message/archivalProfile.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bundle/auth/Message/newUserAccount.php b/src/bundle/auth/Message/newUserAccount.php
index c19a7ed77..c8107fc69 100755
--- a/src/bundle/auth/Message/newUserAccount.php
+++ b/src/bundle/auth/Message/newUserAccount.php
@@ -31,7 +31,7 @@ class newUserAccount
 {
     /**
      * @var string
-     * @pattern #^[A-Za-z][A-Za-z0-9_.@-]*[A-Za-z]$#
+     * @pattern #^[A-Za-z][A-Za-z0-9_.@-]*$#
      * @notempty
      */
     public $accountName;
diff --git a/src/bundle/auth/Message/userAccountUpdate.php b/src/bundle/auth/Message/userAccountUpdate.php
index e2d34efbd..29b5c57d4 100755
--- a/src/bundle/auth/Message/userAccountUpdate.php
+++ b/src/bundle/auth/Message/userAccountUpdate.php
@@ -39,7 +39,7 @@ class userAccountUpdate
 
     /**
      * @var string
-     * @pattern #^[A-Za-z][A-Za-z0-9_.@-]*[A-Za-z]$#
+     * @pattern #^[A-Za-z][A-Za-z0-9_.@-]*$#
      * @notempty
      */
     public $accountName;
diff --git a/src/bundle/recordsManagement/Message/archivalProfile.php b/src/bundle/recordsManagement/Message/archivalProfile.php
index a1d6f0e0e..97fa2c519 100755
--- a/src/bundle/recordsManagement/Message/archivalProfile.php
+++ b/src/bundle/recordsManagement/Message/archivalProfile.php
@@ -38,7 +38,7 @@ class archivalProfile
      * The reference
      *
      * @var string
-     * @pattern #^[A-Za-z][A-Za-z0-9_.@-]*[A-Za-z]$#
+     * @pattern #^[A-Za-z][A-Za-z0-9_.@-]*$#
      * @notempty
      */
     public $reference;
-- 
GitLab


From 24d129ab707f8bee5dc9d26eae98fd53f8bd6451 Mon Sep 17 00:00:00 2001
From: Prosper de Laure <prosper.delaure@maarch.org>
Date: Tue, 27 Feb 2018 14:40:05 +0100
Subject: [PATCH 05/25] Correction of "ie-spacer.gif not found" error

---
 web/public/less/gritter_1.7.4/gritter.less | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/public/less/gritter_1.7.4/gritter.less b/web/public/less/gritter_1.7.4/gritter.less
index 633248af2..62a29ef2d 100755
--- a/web/public/less/gritter_1.7.4/gritter.less
+++ b/web/public/less/gritter_1.7.4/gritter.less
@@ -26,10 +26,10 @@
 .gritter-item-wrapper {
     position:relative;
     margin:0 0 10px 0;
-    background:url('../../img/gritter_1.7.4/ie-spacer.gif'); /* ie7/8 fix */
+    background:url('/public/img/gritter_1.7.4/ie-spacer.gif'); /* ie7/8 fix */
 }
 .gritter-top {
-    /*background:url('../../img/gritter_1.7.4/gritter.png') no-repeat left -30px;*/
+    /*background:url('/public/img/gritter_1.7.4/gritter.png') no-repeat left -30px;*/
     background:@light-clr-blue;
     height:10px;
 }
@@ -37,7 +37,7 @@
     background-position:right -30px;
 }
 .gritter-bottom {
-    /*background:url('../../img/gritter_1.7.4/gritter.png') no-repeat left bottom;*/
+    /*background:url('/public/img/gritter_1.7.4/gritter.png') no-repeat left bottom;*/
     background:@light-clr-blue;
     height:8px;
     margin:0;
@@ -47,7 +47,7 @@
 }
 .gritter-item {
     display:block;
-    /*background:url('../../img/gritter_1.7.4/gritter.png') no-repeat left -40px;*/
+    /*background:url('/public/img/gritter_1.7.4/gritter.png') no-repeat left -40px;*/
     background:@light-clr-blue;
     color:#eee;
     padding:2px 11px 8px 11px;
-- 
GitLab


From 37eb6548a02a71e08bc569e8cefb0f329e008b86 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Wed, 28 Feb 2018 17:25:36 +0100
Subject: [PATCH 06/25] Deleting screens log scheduling

---
 .../logScheduling/modalEvent.html             |  39 --
 .../batchProcessing/logScheduling/result.html |  48 ---
 .../batchProcessing/logScheduling/search.html | 349 ------------------
 3 files changed, 436 deletions(-)
 delete mode 100755 src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html
 delete mode 100755 src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/result.html
 delete mode 100755 src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/search.html

diff --git a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html
deleted file mode 100755
index 5ebb7f3e0..000000000
--- a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<div class="container-fluid" data-translate-catalog="batchProcessing/messages">
-    <div class="row">
-        <div class="col-xs-12">
-            <h1 class="page-header">
-                Log scheduling
-            </h1>
-        </div>
-    </div>
-</div>
-<div class="container-fluid" data-translate-catalog="batchProcessing/messages">
-    <div class="row">
-            <div class="panel">
-                <div class="row">
-                    <dl class="dl dl-horizontal">
-                        <dt><strong>Date</strong></dt> <dd ><?merge logScheduling.logDate ?></dd>
-                        <dt><strong>Name</strong></dt> <dd><?merge logScheduling.name ?></dd>
-                        <dt><strong>Executed by</strong></dt> <dd><?merge logScheduling.executedBy ?></dd>
-                        <dt><strong>Launched by</strong></dt> <dd><?merge logScheduling.launchedBy ?></dd>
-
-                    <dt><strong>Status</strong></dt>
-                    <dd>
-                        <?merge logScheduling.status.ifeq(1) ?><strong class="text-success fa fa-check" disabled="">&nbsp;</strong>
-                        <?merge logScheduling.status.ifne(1) ?><strong class="text-danger fa fa-times" disabled="">&nbsp;</strong>
-                    </dd>
-                    </dl>
-                    <div class="col-xs-12">
-                    <b>Info</b>
-                        <div class="panel well" id="audit_info">
-                            <?merge logScheduling.info ?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal" title="Close">Close</button>
-        </div>
-    </div>
-</div>
diff --git a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/result.html b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/result.html
deleted file mode 100755
index 8a01b1709..000000000
--- a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/result.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<div class="row" data-translate-catalog="batchProcessing/messages">
-    <div class="col-xs-12">
-        <div class="panel panel-primary">
-            <div  id="logSchedulingList" class="panel-body" style="padding: 0;">
-                <table id="list" class="table dataTable">
-                    <thead>
-                        <tr>
-                            <th class="date">Date</th>
-                            <th class="status">Status</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <?merge logSchedulings ?>
-                        <tr>
-                            <td class="date"><?merge .logDate ?></td>
-                            <td class="status">
-                                <?merge .status.ifeq(1) ?><strong class="text-success fa fa-check" disabled=""></strong>
-                                <?merge .status.ifeq("") ?><strong class="text-danger fa fa-times" disabled="">&nbsp;</strong>
-                            </td>
-                            <td>
-                                <button type="button" class="btn btn-warning btn-small pull-right fa fa-eye viewEvent"  title="View" data-logid="[?merge .logId ?]">
-                                </button>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-    <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" title="Close">Close</button>
-    </div>
-</div>
-
-<script>
-    $('#logSchedulingList').on('click', '.viewEvent', function(e) {
-        ajax($(this), {
-            type        : 'GET',
-            url         : '/batchProcessing/logScheduling/'+$(this).data('logid'),
-            contentType : 'application/json',
-            success     : function (response) {
-                $('#logSchedulingModal').modal().find('.modal-body').html(response);
-            }
-        });
-    });
-</script>
\ No newline at end of file
diff --git a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/search.html b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/search.html
deleted file mode 100755
index ad9f3c50a..000000000
--- a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/search.html
+++ /dev/null
@@ -1,349 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (C) 2015 Alexis Ragot <alexis.ragot@maarch.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<div id="contain" >
-    <div class="container-fluid" data-translate-catalog="batchProcessing/messages">
-        <div class="page-header">
-            <h1>
-                <i class="fa fa-history"></i>
-                Search logs scheduling
-            </h1>
-        </div>
-    </div>
-    <br/>
-    <div class="container-fluid" data-translate-catalog="batchProcessing/messages">
-        <div class="col-md-12">
-            <form id="searchForm" class="form-horizontal">
-                <div class="col-md-12">
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <div class="btn-group col-md-12" data-toggle="buttons" >
-                                <label class="btn btn-info active typeSearch" title="Name">
-                                    <input type="checkbox" id="typeName" name="typeSearch" value="name" checked>Name
-                                </label>
-                                <label class="btn btn-default typeSearch" title="Task">
-                                    <input type="checkbox" id="typeTask" name="typeSearch" value="task">Task
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-8">
-                        <div class="form-group">
-                            <div class="input-group input-group-lg">
-                                <select class="form-control selectName" name="name" id="name" >
-                                        <option value="">Select a scheduling name</option>
-                                        <?merge schedulings ?>
-                                        <option value="[?merge .name ?]"><?merge .name ?></option>
-                                </select>
-                                <select class="form-control selectTask" name="task" id="task" style="display: none;">
-                                        <option value="">Select a task</option>
-                                        <?merge tasks ?>
-                                        <option value="[?merge .description ?]"><?merge .description ?></option>
-                                </select>
-                                <div class="input-group-btn">
-                                    <button type="button" class="btn btn-info" id="search" title="Search"><span class="fa fa-search">&nbsp;</span></button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group pull-right">
-                            <div class="col-sm-8">
-                                    <button type="button" id="more" class="btn btn-success plus" ><i class="fa fa-plus fa-fw"></i></button>
-                                    <button type="button" id="less" class="btn btn-danger minus" style="display: none;"><i class="fa fa-minus fa-fw"></i></button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="option" style="display: none;">
-                    <div class="col-md-6">
-                        <br/>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label" for="fromDate">Start date</label>
-                            <div class="col-sm-6">
-                                <input type="text" class="form-control datePicker" name="fromDate" id="fromDate" placeholder="Start date"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label" for="executedBy">Executed by</label>
-                            <div class="col-sm-6">
-                                <input type="text" class="form-control" name="executedBy" id="executedByTypehead" data-attributeid="" placeholder="Executed by"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label" for="status">Status</label>
-                            <div class="btn-group col-sm-7" data-toggle="buttons" >
-                                <label class="btn btn-info active status" title="all">
-                                    <input type="checkbox" id="all" name="status" value="" checked>All
-                                </label>
-                                <label class="btn btn-default status" title="noErrors">
-                                    <input type="checkbox" id="true" name="status" value="1">Success
-                                </label>
-                                <label class="btn btn-default status" title="errors">
-                                    <input type="checkbox" id="false" name="status" value="0">Errors
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <br/>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label" for="toDate">End date</label>
-                            <div class="col-sm-6">
-                                <input type="text" class="form-control datePicker" name="toDate" id="toDate" placeholder="End date"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label" for="launchedBy">Launched by</label>
-                            <div class="col-sm-6">
-                                <input type="text" class="form-control" name="launchedBy" id="launchedByTypehead" data-attributeid="" placeholder="Launched by"/>
-                            </div>
-                        </div> 
-                    </div>
-                </div>
-            </form>
-        </div>
-    </div>
-    <hr>
-    <br>
-    <div class="container-fluid" id="logList"></div>
-    <div class="modal fade" id="modalEvent" data-backdrop="static" data-keyboard="false" tabindex="999"  data-focus-on="input:first" role="dialog" aria-hidden="true">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content" id="modalEvent_content">
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    status = "";
-    $('#contain').keypress(function(e){
-        if (e.which != 13) {
-             return;
-        }
-        // Prevent form submit
-        e.preventDefault();
-        $("#search").click();
-    });
-    
-        
-    $('#search').on('click', function(){
-        $.ajax({
-            type        : 'GET',
-            url         : '/Batchprocessing/Logs',
-            data        : serializeLog(),
-            dataType    : 'html',
-            async       : true,
-            success     : function(response) {
-                $('#logList').html('');
-                $('#logList').append(response);
-            }
-        });
-    }); 
-    
-    $("#contain").on('click', '.viewEvent', function () {
-
-            var logId = $(this).data('logid');
-            ajax($(this), {
-                type: 'GET',
-                url: '/Batchprocessing/Log/' + logId,
-                dataType: 'html',
-                contentType: 'application/json',
-                async: true,
-                success: function (response) {
-                    $('#modalEvent_content').html(response);
-
-                    $('#modalEvent').modal();
-                }
-            });
-    });
-
-    $("#searchForm").on('click', '.typeSearch', function () {
-            
-        if ($(this).attr('class').indexOf('btn-default') != -1) {
-            $('#searchForm ').find('.typeSearch').removeClass('btn-info active').addClass('btn-default');
-            $(this).removeClass('btn-default').addClass('btn-info');
-            
-            if ($(this).find('input').attr('id') == "typeTask") {
-                $(".selectTask").css('display','');
-                $(".selectName").css('display','none');
-                $(".selectName").val("");
-            } else {
-                $(".selectName").css('display','');
-                $(".selectTask").css('display','none');
-                $(".selectTask").val("");
-            }
-        }
-    });
-    
-    $("#searchForm").on('click', '.status', function () {
-        if ($(this).attr('class').indexOf('btn-default') != -1) {
-            status = $(this).find('input').val();
-            $('#searchForm ').find('.status').removeClass('btn-info active').addClass('btn-default');
-            $(this).removeClass('btn-default').addClass('btn-info');
-
-        } else {
-            $('#searchForm ').find('.status').removeClass('btn-info active').addClass('btn-default');
-            $(this).removeClass('btn-default').addClass('btn-info');
-
-            $(this).removeClass('btn-info').addClass('btn-default');
-        }
-    });
-    
-    $("#more").on('click',function(){
-        $('.option').css('display',''); 
-
-        $(".minus").css('display','');
-        $(".plus").css('display','none');
-        
-    });
-    
-    $("#less").on('click',function(){
-        
-        $('.option').css('display','none');
-        
-        $(".minus").css('display','none');
-        $(".plus").css('display','');
-        
-    });
-        
-    $("#contain").on("click",'[data-form-reset]', function () {
-        $("#searchForm").find('input').val('');
-        $("#type").prop('selectedIndex', 0);
-        $('#logList').html('');
-    });
-    
-    var personsSource = new Bloodhound({
-            datumTokenizer: Bloodhound.tokenizers.obj.whitespace('displayName'),
-            queryTokenizer: Bloodhound.tokenizers.whitespace,
-            remote: {
-                url: '/userAccounts/%QUERY',
-                ajax : {
-                    async: false
-                }
-            },
-            limit: 100
-        });
-        personsSource.initialize();
-
-        // initialize typeahead
-        $('#executedByTypehead').typeahead(
-            {
-                hint: true,
-                highlight: true,
-                minLength: 3
-            }, 
-            // data source contacts
-            {
-                name: 'users',
-                displayKey: 'displayName',
-                templates: {
-                    empty: function() {
-                        return "<span class='well well-sm'>No user found</span>";
-                    },
-                    suggestion: function(person) {
-                        var display = 
-                            "<span>"
-                                + "<span class='fa fa-user' >&nbsp;</span>"
-                                + "<span style='font-family:Helvetica, sans-serif;'>" 
-                                + person.displayName;
-                        display += 
-                                "</span>";
-                        display += 
-                            "</span>";
-                        $("#replacingUser").attr('data-replacinguseraccountid', person.accountId);   
-                        return display;
-                    }
-                },
-                source: function(query, cb) {
-                    personsSource.get(query, function(suggestions) {
-                        cb(suggestions);
-                    });
-                },
-                skipCache: true
-            }
-        ).on('typeahead:selected', function($event, suggestion, source) {
-            $("#executedByTypehead").data('user', suggestion.accountId);
-        });
-        
-        $('#launchedByTypehead').typeahead(
-            {
-                hint: true,
-                highlight: true,
-                minLength: 3
-            }, 
-            // data source contacts
-            {
-                name: 'users',
-                displayKey: 'displayName',
-                templates: {
-                    empty: function() {
-                        return "<span class='well well-sm'>No user found</span>";
-                    },
-                    suggestion: function(person) {
-                        var display = 
-                            "<span>"
-                                + "<span class='fa fa-user' >&nbsp;</span>"
-                                + "<span style='font-family:Helvetica, sans-serif;'>" 
-                                + person.displayName;
-                        display += 
-                                "</span>";
-                        display += 
-                            "</span>";
-                        $("#replacingUser").attr('data-replacinguseraccountid', person.accountId);   
-                        return display;
-                    }
-                },
-                source: function(query, cb) {
-                    personsSource.get(query, function(suggestions) {
-                        cb(suggestions);
-                    });
-                },
-                skipCache: true
-            }
-        ).on('typeahead:selected', function($event, suggestion, source) {
-            $("#launchedByTypehead").data('user', suggestion.accountId);
-        });
-    
-        function serializeLog() {
-            serializedObject = {
-                fromDate: $('#fromDate').val(),
-                toDate: $('#toDate').val()
-            };
-            
-            if ($('#name').val()) {
-                serializedObject.name = $('#name').val();
-            }
-            
-            if ($('#task').val()) {
-                serializedObject.task = $('#task').val();
-            }
-            
-            if (status) {
-                serializedObject.status = status;
-            }
-            
-            if ($('#executedByTypehead').data('user')) {
-                serializedObject.executedBy = $('#executedByTypehead').data('user');
-            }
-            
-            if ($('#launchedByTypehead').data('user')) {
-                serializedObject.launchedBy = $('#launchedByTypehead').data('user');
-            }
-        return serializedObject;
-    }
-</script>
-- 
GitLab


From 8bf1c116da705dd2261845e8fbaad987909bbb86 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Wed, 28 Feb 2018 17:33:14 +0100
Subject: [PATCH 07/25] #7264 - MAJ typeahead

---
 dependency/html/Document.php                  |    2 +-
 .../Resources/locale/fr/audit/messages.po     |    9 +
 .../locale/fr/medona/archivalAgreement.po     |    3 +
 .../public/less/dashboard/style.less          |    3 -
 .../maarchRM/Resources/view/audit/search.html |   31 +-
 .../view/auth/authorization/edit.html         |   15 +-
 .../view/auth/serviceAccount/edit.html        |    7 +-
 .../userAccount/admin/modalsForDisabling.html |   26 +-
 .../organisationsAdministrationForm.html      |    5 +-
 .../mainScreen/archiveInformation.html        |    2 -
 .../digitalResource/contentType/edit.html     |   37 +-
 .../digitalResource/searchResource.html       |    1 -
 .../view/digitalResource/format/index.html    |    1 -
 .../repository/flawedAddressList.html         |    1 -
 .../view/organization/deleteModal.html        |    1 -
 .../view/organization/userPositionForm.html   |    6 +-
 .../archive/modalAccessRule.html              |    1 -
 .../archive/modalArchiveInfo.html             |    1 -
 .../recordsManagement/archive/search.html     |    5 +-
 web/public/js/typeahead_0.10.2/typeahead.js   | 1704 ------------
 web/public/js/typeahead_0.11.1/typeahead.js   | 2446 +++++++++++++++++
 web/public/less/dashboard/style.less          |    3 -
 .../less/typeahead_0.10.2/typeahead.less      |   49 -
 23 files changed, 2516 insertions(+), 1843 deletions(-)
 delete mode 100755 web/public/js/typeahead_0.10.2/typeahead.js
 create mode 100644 web/public/js/typeahead_0.11.1/typeahead.js
 delete mode 100755 web/public/less/typeahead_0.10.2/typeahead.less

diff --git a/dependency/html/Document.php b/dependency/html/Document.php
index 7ef173ccf..d4b7e27cc 100755
--- a/dependency/html/Document.php
+++ b/dependency/html/Document.php
@@ -281,7 +281,7 @@ class Document extends \dependency\xml\Document
         $this->addScript("/public/js/gritter_1.7.4/gritter.js");
 
         //typeahead
-        $this->addScript("/public/js/typeahead_0.10.2/typeahead.js");
+        $this->addScript("/public/js/typeahead_0.11.1/typeahead.js");
 
         //$this->addScript("/public/js/bootstrap-daterangepicker/moment.min.js");
         //$this->addScript("/public/js/bootstrap-daterangepicker/daterangepicker.js");
diff --git a/src/presentation/maarchRM/Resources/locale/fr/audit/messages.po b/src/presentation/maarchRM/Resources/locale/fr/audit/messages.po
index 262e17cf9..776164311 100755
--- a/src/presentation/maarchRM/Resources/locale/fr/audit/messages.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/audit/messages.po
@@ -146,6 +146,15 @@ msgstr "Terme"
 msgid "Term"
 msgstr "Terme"
 
+msgid "User"
+msgstr "Utilisateur"
+
+msgid "Service"
+msgstr "Compte de service"
+
+msgid "No account found"
+msgstr "Aucun compte trouvé"
+
 msgid "recordsManagement/accessRule/readIndex"
 msgstr "Lecture des règles de communicabilité"
 
diff --git a/src/presentation/maarchRM/Resources/locale/fr/medona/archivalAgreement.po b/src/presentation/maarchRM/Resources/locale/fr/medona/archivalAgreement.po
index b020bc060..9e2bf671b 100755
--- a/src/presentation/maarchRM/Resources/locale/fr/medona/archivalAgreement.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/medona/archivalAgreement.po
@@ -155,6 +155,9 @@ msgstr "Indexation plein texte"
 msgid "Media info"
 msgstr "Information média"
 
+msgid "No format found"
+msgstr "Aucun format trouvé"
+
 msgid "Mbytes"
 msgstr "Mo"
 
diff --git a/src/presentation/maarchRM/Resources/public/less/dashboard/style.less b/src/presentation/maarchRM/Resources/public/less/dashboard/style.less
index a8a044122..c4d2ff29a 100755
--- a/src/presentation/maarchRM/Resources/public/less/dashboard/style.less
+++ b/src/presentation/maarchRM/Resources/public/less/dashboard/style.less
@@ -54,9 +54,6 @@
 @import "../dependency/html/public/less/bootstrap_3.1.1/utilities.less";
 @import "../dependency/html/public/less/bootstrap_3.1.1/responsive-utilities.less";
 
-// Typeahead
-@import "../dependency/html/public/less/typeahead_0.10.2/typeahead.less";
-
 // Fontawesome
 @import "../dependency/html/public/less/font-awesome-4.4.0/variables.less";
 @import "../dependency/html/public/less/font-awesome-4.4.0/mixins.less";
diff --git a/src/presentation/maarchRM/Resources/view/audit/search.html b/src/presentation/maarchRM/Resources/view/audit/search.html
index 6ceed385c..6c83bc99a 100755
--- a/src/presentation/maarchRM/Resources/view/audit/search.html
+++ b/src/presentation/maarchRM/Resources/view/audit/search.html
@@ -124,7 +124,11 @@
         </div>
         <span id="selectAnEvent_text" class="hide">Select an event</span>
     </div>
-
+    <div style="display:none" data-translate-catalog="audit/messages">
+        <span id="user_text">User</span>
+        <span id="service_text">Service</span>
+        <span id="noAccountFound">No account found</span>
+    </div>
     <script type="text/javascript">
 
         $('#contain').ready(function() {
@@ -202,7 +206,7 @@
                 {
                     hint: true,
                     highlight: true,
-                    minLength: 3
+                    minLength: 2
                 },
         {
             name: 'users',
@@ -211,32 +215,31 @@
             },
             templates: {
                 empty: function () {
-                    return "<span class='well well-sm'>No user found</span>";
+                    return "<span class='well well-sm'>"+$('#noAccountFound').html()+"</span>";
                 },
                 suggestion: function (account) {
                     var name = account.displayName;
                     if (account.accountType == 'service') {
-                        var icone = "<span class='fa fa-laptop' >&nbsp;</span>";
+                        var type = $('#service_text').html();
                     } else {
-                        var icone = "<span class='fa fa-user' >&nbsp;</span>";
+                        var type = $('#user_text').html();
                     }
                     var display =
-                            "<span>"
-                            + icone
-                            + "<span style='font-family:Helvetica, sans-serif;'>"
-                            + account.displayName
-                            + "</span>"
-                            + "</span>";
-                    
+                        "<span>"
+                        + "<span style='font-family:Helvetica, sans-serif;'>"
+                        + type
+                        + " - "
+                        + name
+                        + "</span></span><br>";
                     return display;
                 }
             },
             source: function (query, cb) {
                 var listSuggestion = "";
-                services.get(query, function (suggestions) {
+                services.search(query, function (suggestions) {
                     listSuggestion = suggestions;
                 });
-                users.get(query, function (suggestions) {
+                users.search(query, function (suggestions) {
                     $.extend(listSuggestion, suggestions);
                 });
                 cb(listSuggestion);
diff --git a/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html b/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
index 4806cb207..c9829b231 100755
--- a/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
+++ b/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
@@ -350,20 +350,17 @@
                         return "<span class='well well-sm'>"+$('#noUserFound').html()+"</span>";
                     },
                     suggestion: function(user) {
-                        var display = 
+                        var display =
                             "<span>"
-                                + "<span class='fa fa-user' >&nbsp;</span>"
-                                + "<span style='font-family:Helvetica, sans-serif;'>" 
-                                + user.displayName
-                                + "</span>"
-                                + "</span>";
-
+                            + "<span style='font-family:Helvetica, sans-serif;'>"
+                            + user.displayName
+                            + "</span></span><br>";
                         return display;
                     }
                 },
                 source: function(query, cb) {
-                    users.get(query, function(suggestions) {
-                        var i = suggestions.length
+                    users.search(query, function(suggestions) {
+                        var i = suggestions.length;
                         while (i--) {
                             // if ($.inArray(suggestions[i].puid, boundFormats()) > -1)
                             if ($('#members').find('[data-memberid="'+ suggestions[i].accountId +'"]').length)
diff --git a/src/presentation/maarchRM/Resources/view/auth/serviceAccount/edit.html b/src/presentation/maarchRM/Resources/view/auth/serviceAccount/edit.html
index 8916f5c49..deb5f37b2 100755
--- a/src/presentation/maarchRM/Resources/view/auth/serviceAccount/edit.html
+++ b/src/presentation/maarchRM/Resources/view/auth/serviceAccount/edit.html
@@ -266,17 +266,16 @@
                             + organization.ownerOrgName
                             + " > "
                             + organization.displayName
-                            + "</span>"
-                            + "</span>";
+                            + "</span></span><br>";
                     }
                     else {
-                        display = this.empty();
+                        return "";
                     }
                     return display;
                 }
             },
             source: function(query, cb) {
-                organizations.get(query, function(suggestions) {
+                organizations.search(query, function(suggestions) {
                     var i = suggestions.length
                     while (i--) {
                         if ($('#orgs').find('[data-orgid="'+ suggestions[i].orgId +'"]').length)
diff --git a/src/presentation/maarchRM/Resources/view/auth/userAccount/admin/modalsForDisabling.html b/src/presentation/maarchRM/Resources/view/auth/userAccount/admin/modalsForDisabling.html
index d41ca8609..ae3b3b053 100755
--- a/src/presentation/maarchRM/Resources/view/auth/userAccount/admin/modalsForDisabling.html
+++ b/src/presentation/maarchRM/Resources/view/auth/userAccount/admin/modalsForDisabling.html
@@ -39,22 +39,17 @@
     </div>
 </div>
 
-
+<span class="hide" id="no_user_found_text">No user found</span>
 <script >
 $('#app_maarchRM_main').ready(function(){
         // Define data source for person typeahead
-        var personsSource = new Bloodhound({
+        var users = new Bloodhound({
             datumTokenizer: Bloodhound.tokenizers.obj.whitespace('displayName'),
             queryTokenizer: Bloodhound.tokenizers.whitespace,
-            remote: {
-                url: '/userAccounts/%QUERY',
-                ajax : {
-                    async: false
-                }
-            },
+            prefetch: {url: '/user/todisplay', ttl: '0'},
             limit: 100
         });
-        personsSource.initialize();
+        users.initialize();
 
         // initialize typeahead
         $('#replacingUser').typeahead(
@@ -69,24 +64,23 @@ $('#app_maarchRM_main').ready(function(){
                 displayKey: 'displayName',
                 templates: {
                     empty: function() {
-                        return "<span class='well well-sm'>No user found</span>";
+                        return "<span class='well well-sm'>"+$('#no_user_found_text').text()+"</span>";
                     },
-                    suggestion: function(person) {
+                    suggestion: function(user) {
                         var display = 
                             "<span>"
-                                + "<span class='fa fa-user' >&nbsp;</span>"
                                 + "<span style='font-family:Helvetica, sans-serif;'>" 
-                                + person.displayName;
+                                + user.displayName;
                         display += 
                                 "</span>";
                         display += 
-                            "</span>";
-                        $("#replacingUser").attr('data-replacinguseraccountid', person.accountId);   
+                            "</span><br>";
+                        $("#replacingUser").attr('data-replacinguseraccountid', user.accountId);
                         return display;
                     }
                 },
                 source: function(query, cb) {
-                    personsSource.get(query, function(suggestions) {
+                    users.search(query, function(suggestions) {
                         cb(suggestions);
                     });
                 },
diff --git a/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html b/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
index eacdf2262..5d34db804 100755
--- a/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
+++ b/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
@@ -62,8 +62,7 @@
                             + organization.ownerOrgName
                             + " > "
                             + organization.displayName
-                            + "</span>"
-                            + "</span>";
+                            + "</span></span><br><br>";
                     }
                     else {
                         display = this.empty();
@@ -72,7 +71,7 @@
                 }
             },
             source: function(query, cb) {
-                organizations.get(query, function(suggestions) {
+                organizations.search(query, function(suggestions) {
                     var i = suggestions.length
                     while (i--) {
                         if ($('#orgs').find('[data-orgid="'+ suggestions[i].orgId +'"]').length)
diff --git a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveInformation.html b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveInformation.html
index 524f32584..6caad9af7 100755
--- a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveInformation.html
+++ b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveInformation.html
@@ -406,8 +406,6 @@
                 var name = input.attr('name');
                 var type = $(e).find('th').data('type');
 
-                console.log(type);
-
                 switch (valueInput.attr("type")) {
                     case "name" :
                     case "text" :
diff --git a/src/presentation/maarchRM/Resources/view/digitalResource/contentType/edit.html b/src/presentation/maarchRM/Resources/view/digitalResource/contentType/edit.html
index c899c4b9a..6a290c9d5 100755
--- a/src/presentation/maarchRM/Resources/view/digitalResource/contentType/edit.html
+++ b/src/presentation/maarchRM/Resources/view/digitalResource/contentType/edit.html
@@ -98,12 +98,15 @@
             datumTokenizer: Bloodhound.tokenizers.obj.whitespace('puid'),
             queryTokenizer: Bloodhound.tokenizers.whitespace,
             remote: {
+                wildcard: '%QUERY',
                 url: '/digitalResource/format/find/%QUERY',
-                rateLimitWait: 500
+                rateLimitWait: 500,
+                transform: function(response) {
+                    return response;
+                }
             },
             limit: 100
         });
-        typesSource.initialize();
 
         // initialize typeahead
         $('#formatTypeahead').typeahead(
@@ -115,36 +118,24 @@
         // data source contacts
         {
             name: 'format',
-            displayKey: 'name',
             templates: {
                 empty: function () {
-                    return "<span class='well well-sm'>No format found</span>";
+                    return "<span class='well well-sm'>" + $('#noFormatFound').text() + "</span>";
                 },
                 suggestion: function (type) {
-                    var displayName = '[' + type['puid'] + '] ' + type['name'];
-                    if (type['version'] != undefined) {
-                        displayName += ' ' + type['version'];
+                    var displayName = '[' + type.puid + '] ' + type.name;
+                    if (type.version != undefined) {
+                        displayName += ' ' + type.version;
                     }
                     var display = "<span>"
-                            + "<span style='font-family:Helvetica, sans-serif;'>"
-                            + displayName
-                            + "</span>"
-                            + "</span>";
-
+                        + "<span style='font-family:Helvetica, sans-serif;'>"
+                        + displayName
+                        + "</span></span><br><br>";
                     return display;
                 }
             },
-            source: function (query, cb) {
-                typesSource.get(query, function (suggestions) {
-                    var i = suggestions.length
-                    while (i--) {
-                        if ($.inArray(suggestions[i].puid, boundFormats()) > -1)
-                            suggestions.splice(i, 1);
-                    }
-                    cb(suggestions);
-                });
-            },
-            skipCache: true
+            display: 'name',
+            source: typesSource
         }).on('typeahead:selected', function ($event, suggestion, source) {
             $("#formatTypeahead").data('format', suggestion);
             $('#addFormat').removeClass('disabled');
diff --git a/src/presentation/maarchRM/Resources/view/digitalResource/digitalResource/searchResource.html b/src/presentation/maarchRM/Resources/view/digitalResource/digitalResource/searchResource.html
index 9d6729bf4..db61d26e7 100755
--- a/src/presentation/maarchRM/Resources/view/digitalResource/digitalResource/searchResource.html
+++ b/src/presentation/maarchRM/Resources/view/digitalResource/digitalResource/searchResource.html
@@ -240,7 +240,6 @@
             }
         });
         
-        console.log(metadatas);
 
         return metadatas;
     }
diff --git a/src/presentation/maarchRM/Resources/view/digitalResource/format/index.html b/src/presentation/maarchRM/Resources/view/digitalResource/format/index.html
index 1ab99b1dd..42013dc93 100755
--- a/src/presentation/maarchRM/Resources/view/digitalResource/format/index.html
+++ b/src/presentation/maarchRM/Resources/view/digitalResource/format/index.html
@@ -250,7 +250,6 @@ file that was distributed with this source code.
             contentType : 'application/json',
             dataType    : 'json',
             success     : function (response) {
-                console.log(response);
                 if(!response.status) {
                     gritter.show(response.message, response.status, response.errors);
                 } else {
diff --git a/src/presentation/maarchRM/Resources/view/digitalResource/repository/flawedAddressList.html b/src/presentation/maarchRM/Resources/view/digitalResource/repository/flawedAddressList.html
index 6ad8728e2..2a79311fa 100755
--- a/src/presentation/maarchRM/Resources/view/digitalResource/repository/flawedAddressList.html
+++ b/src/presentation/maarchRM/Resources/view/digitalResource/repository/flawedAddressList.html
@@ -55,7 +55,6 @@ file that was distributed with this source code.
 
 <script type="application/javascript">    
     $("#addressList").on("click", '.checkIntegrity', function() {
-        console.log($(this).data('address'));
         $.ajax({
             type        : 'PUT',
             url         : '/checkAddressIntegrity',
diff --git a/src/presentation/maarchRM/Resources/view/organization/deleteModal.html b/src/presentation/maarchRM/Resources/view/organization/deleteModal.html
index e93237d3e..7d6a1e69e 100755
--- a/src/presentation/maarchRM/Resources/view/organization/deleteModal.html
+++ b/src/presentation/maarchRM/Resources/view/organization/deleteModal.html
@@ -32,7 +32,6 @@
                 Tree.removeNode($('#'+orgId).closest('li'));
             },
             error    : function(response) {
-                console.log(response);
                 gritter.show(response.responseJSON.message, response.responseJSON.status, response.responseJSON.errors);
             }
         });
diff --git a/src/presentation/maarchRM/Resources/view/organization/userPositionForm.html b/src/presentation/maarchRM/Resources/view/organization/userPositionForm.html
index 5674e0257..36d1daa76 100755
--- a/src/presentation/maarchRM/Resources/view/organization/userPositionForm.html
+++ b/src/presentation/maarchRM/Resources/view/organization/userPositionForm.html
@@ -89,17 +89,15 @@
                     suggestion: function(user) {
                         var display = 
                             "<span>"
-                                + "<span class='fa fa-user' >&nbsp;</span>"
                                 + "<span style='font-family:Helvetica, sans-serif;'>" 
                                 + user.displayName
-                                + "</span>"
-                                + "</span>";
+                                + "</span></span><br>";
 
                         return display;
                     }
                 },
                 source: function(query, cb) {
-                    users.get(query, function(suggestions) {
+                    users.search(query, function(suggestions) {
                         var i = suggestions.length
                         while (i--) {
                             if ($('#organization_userPositionList').find('#'+ suggestions[i].accountId).length)
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalAccessRule.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalAccessRule.html
index eed011130..747a216cd 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalAccessRule.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalAccessRule.html
@@ -198,7 +198,6 @@
             var inputs = $('#accessRuleModal').find('input, select');
             var retentionRule = $('#accessRuleModal').find('select').find('option:selected').data('json');
 
-            console.log(retentionRule);
 
             $.each(inputs, function() {
                 var a = $(this);
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalArchiveInfo.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalArchiveInfo.html
index 3ee200524..0e6c224cf 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalArchiveInfo.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalArchiveInfo.html
@@ -110,7 +110,6 @@
          },
 
          addClosingButton: function() {
-            console.log("ok");
             var pageHeader = $('#modalArchiveInfo').find('.page-header');
             var button = $('<button/>').addClass('close').attr('data-dismiss', 'modal').prependTo(pageHeader);
             var span = $('<span/>').prop('aria-hidden', 'true').html('&times;').appendTo(button);
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html
index 4ccf19857..a30ab0fad 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html
@@ -330,13 +330,14 @@
                     }
                        display += organization.displayName
                         + "</span>"
-                        + "</span>";
+                        + "</span>"
+                        + "<br><br>";
 
                     return display;
                 }
             },
             source: function(query, cb) {
-                organizations.get(query, function(suggestions) {
+                organizations.search(query, function(suggestions) {
                     var i = suggestions.length
                     while (i--) {
                         if ($('#orgs').find('[data-orgid="'+ suggestions[i].orgId +'"]').length)
diff --git a/web/public/js/typeahead_0.10.2/typeahead.js b/web/public/js/typeahead_0.10.2/typeahead.js
deleted file mode 100755
index 9fafdd7f6..000000000
--- a/web/public/js/typeahead_0.10.2/typeahead.js
+++ /dev/null
@@ -1,1704 +0,0 @@
-/*!
- * typeahead.js 0.10.2
- * https://github.com/twitter/typeahead.js
- * Copyright 2013-2014 Twitter, Inc. and other contributors; Licensed MIT
- */
-
-(function($) {
-    var _ = {
-        isMsie: function() {
-            return /(msie|trident)/i.test(navigator.userAgent) ? navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false;
-        },
-        isBlankString: function(str) {
-            return !str || /^\s*$/.test(str);
-        },
-        escapeRegExChars: function(str) {
-            return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-        },
-        isString: function(obj) {
-            return typeof obj === "string";
-        },
-        isNumber: function(obj) {
-            return typeof obj === "number";
-        },
-        isArray: $.isArray,
-        isFunction: $.isFunction,
-        isObject: $.isPlainObject,
-        isUndefined: function(obj) {
-            return typeof obj === "undefined";
-        },
-        bind: $.proxy,
-        each: function(collection, cb) {
-            $.each(collection, reverseArgs);
-            function reverseArgs(index, value) {
-                return cb(value, index);
-            }
-        },
-        map: $.map,
-        filter: $.grep,
-        every: function(obj, test) {
-            var result = true;
-            if (!obj) {
-                return result;
-            }
-            $.each(obj, function(key, val) {
-                if (!(result = test.call(null, val, key, obj))) {
-                    return false;
-                }
-            });
-            return !!result;
-        },
-        some: function(obj, test) {
-            var result = false;
-            if (!obj) {
-                return result;
-            }
-            $.each(obj, function(key, val) {
-                if (result = test.call(null, val, key, obj)) {
-                    return false;
-                }
-            });
-            return !!result;
-        },
-        mixin: $.extend,
-        getUniqueId: function() {
-            var counter = 0;
-            return function() {
-                return counter++;
-            };
-        }(),
-        templatify: function templatify(obj) {
-            return $.isFunction(obj) ? obj : template;
-            function template() {
-                return String(obj);
-            }
-        },
-        defer: function(fn) {
-            setTimeout(fn, 0);
-        },
-        debounce: function(func, wait, immediate) {
-            var timeout, result;
-            return function() {
-                var context = this, args = arguments, later, callNow;
-                later = function() {
-                    timeout = null;
-                    if (!immediate) {
-                        result = func.apply(context, args);
-                    }
-                };
-                callNow = immediate && !timeout;
-                clearTimeout(timeout);
-                timeout = setTimeout(later, wait);
-                if (callNow) {
-                    result = func.apply(context, args);
-                }
-                return result;
-            };
-        },
-        throttle: function(func, wait) {
-            var context, args, timeout, result, previous, later;
-            previous = 0;
-            later = function() {
-                previous = new Date();
-                timeout = null;
-                result = func.apply(context, args);
-            };
-            return function() {
-                var now = new Date(), remaining = wait - (now - previous);
-                context = this;
-                args = arguments;
-                if (remaining <= 0) {
-                    clearTimeout(timeout);
-                    timeout = null;
-                    previous = now;
-                    result = func.apply(context, args);
-                } else if (!timeout) {
-                    timeout = setTimeout(later, remaining);
-                }
-                return result;
-            };
-        },
-        noop: function() {}
-    };
-    var VERSION = "0.10.2";
-    var tokenizers = function(root) {
-        return {
-            nonword: nonword,
-            whitespace: whitespace,
-            obj: {
-                nonword: getObjTokenizer(nonword),
-                whitespace: getObjTokenizer(whitespace)
-            }
-        };
-        function whitespace(s) {
-            return s.split(/\s+/);
-        }
-        function nonword(s) {
-            return s.split(/\W+/);
-        }
-        function getObjTokenizer(tokenizer) {
-            return function setKey(key) {
-                return function tokenize(o) {
-                    return tokenizer(o[key]);
-                };
-            };
-        }
-    }();
-    var LruCache = function() {
-        function LruCache(maxSize) {
-            this.maxSize = maxSize || 100;
-            this.size = 0;
-            this.hash = {};
-            this.list = new List();
-        }
-        _.mixin(LruCache.prototype, {
-            set: function set(key, val) {
-                var tailItem = this.list.tail, node;
-                if (this.size >= this.maxSize) {
-                    this.list.remove(tailItem);
-                    delete this.hash[tailItem.key];
-                }
-                if (node = this.hash[key]) {
-                    node.val = val;
-                    this.list.moveToFront(node);
-                } else {
-                    node = new Node(key, val);
-                    this.list.add(node);
-                    this.hash[key] = node;
-                    this.size++;
-                }
-            },
-            get: function get(key) {
-                var node = this.hash[key];
-                if (node) {
-                    this.list.moveToFront(node);
-                    return node.val;
-                }
-            }
-        });
-        function List() {
-            this.head = this.tail = null;
-        }
-        _.mixin(List.prototype, {
-            add: function add(node) {
-                if (this.head) {
-                    node.next = this.head;
-                    this.head.prev = node;
-                }
-                this.head = node;
-                this.tail = this.tail || node;
-            },
-            remove: function remove(node) {
-                node.prev ? node.prev.next = node.next : this.head = node.next;
-                node.next ? node.next.prev = node.prev : this.tail = node.prev;
-            },
-            moveToFront: function(node) {
-                this.remove(node);
-                this.add(node);
-            }
-        });
-        function Node(key, val) {
-            this.key = key;
-            this.val = val;
-            this.prev = this.next = null;
-        }
-        return LruCache;
-    }();
-    var PersistentStorage = function() {
-        var ls, methods;
-        try {
-            ls = window.localStorage;
-            ls.setItem("~~~", "!");
-            ls.removeItem("~~~");
-        } catch (err) {
-            ls = null;
-        }
-        function PersistentStorage(namespace) {
-            this.prefix = [ "__", namespace, "__" ].join("");
-            this.ttlKey = "__ttl__";
-            this.keyMatcher = new RegExp("^" + this.prefix);
-        }
-        if (ls && window.JSON) {
-            methods = {
-                _prefix: function(key) {
-                    return this.prefix + key;
-                },
-                _ttlKey: function(key) {
-                    return this._prefix(key) + this.ttlKey;
-                },
-                get: function(key) {
-                    if (this.isExpired(key)) {
-                        this.remove(key);
-                    }
-                    return decode(ls.getItem(this._prefix(key)));
-                },
-                set: function(key, val, ttl) {
-                    if (_.isNumber(ttl)) {
-                        ls.setItem(this._ttlKey(key), encode(now() + ttl));
-                    } else {
-                        ls.removeItem(this._ttlKey(key));
-                    }
-                    return ls.setItem(this._prefix(key), encode(val));
-                },
-                remove: function(key) {
-                    ls.removeItem(this._ttlKey(key));
-                    ls.removeItem(this._prefix(key));
-                    return this;
-                },
-                clear: function() {
-                    var i, key, keys = [], len = ls.length;
-                    for (i = 0; i < len; i++) {
-                        if ((key = ls.key(i)).match(this.keyMatcher)) {
-                            keys.push(key.replace(this.keyMatcher, ""));
-                        }
-                    }
-                    for (i = keys.length; i--; ) {
-                        this.remove(keys[i]);
-                    }
-                    return this;
-                },
-                isExpired: function(key) {
-                    var ttl = decode(ls.getItem(this._ttlKey(key)));
-                    return _.isNumber(ttl) && now() > ttl ? true : false;
-                }
-            };
-        } else {
-            methods = {
-                get: _.noop,
-                set: _.noop,
-                remove: _.noop,
-                clear: _.noop,
-                isExpired: _.noop
-            };
-        }
-        _.mixin(PersistentStorage.prototype, methods);
-        return PersistentStorage;
-        function now() {
-            return new Date().getTime();
-        }
-        function encode(val) {
-            return JSON.stringify(_.isUndefined(val) ? null : val);
-        }
-        function decode(val) {
-            return JSON.parse(val);
-        }
-    }();
-    var Transport = function() {
-        var pendingRequestsCount = 0, pendingRequests = {}, maxPendingRequests = 6, requestCache = new LruCache(10);
-        function Transport(o) {
-            o = o || {};
-            this._send = o.transport ? callbackToDeferred(o.transport) : $.ajax;
-            this._get = o.rateLimiter ? o.rateLimiter(this._get) : this._get;
-        }
-        Transport.setMaxPendingRequests = function setMaxPendingRequests(num) {
-            maxPendingRequests = num;
-        };
-        Transport.resetCache = function clearCache() {
-            requestCache = new LruCache(10);
-        };
-        _.mixin(Transport.prototype, {
-            _get: function(url, o, cb) {
-                var that = this, jqXhr;
-                if (jqXhr = pendingRequests[url]) {
-                    jqXhr.done(done).fail(fail);
-                } else if (pendingRequestsCount < maxPendingRequests) {
-                    pendingRequestsCount++;
-                    pendingRequests[url] = this._send(url, o).done(done).fail(fail).always(always);
-                } else {
-                    this.onDeckRequestArgs = [].slice.call(arguments, 0);
-                }
-                function done(resp) {
-                    cb && cb(null, resp);
-                    requestCache.set(url, resp);
-                }
-                function fail() {
-                    cb && cb(true);
-                }
-                function always() {
-                    pendingRequestsCount--;
-                    delete pendingRequests[url];
-                    if (that.onDeckRequestArgs) {
-                        that._get.apply(that, that.onDeckRequestArgs);
-                        that.onDeckRequestArgs = null;
-                    }
-                }
-            },
-            get: function(url, o, cb) {
-                var resp;
-                if (_.isFunction(o)) {
-                    cb = o;
-                    o = {};
-                }
-                if (resp = requestCache.get(url)) {
-                    _.defer(function() {
-                        cb && cb(null, resp);
-                    });
-                } else {
-                    this._get(url, o, cb);
-                }
-                return !!resp;
-            }
-        });
-        return Transport;
-        function callbackToDeferred(fn) {
-            return function customSendWrapper(url, o) {
-                var deferred = $.Deferred();
-                fn(url, o, onSuccess, onError);
-                return deferred;
-                function onSuccess(resp) {
-                    _.defer(function() {
-                        deferred.resolve(resp);
-                    });
-                }
-                function onError(err) {
-                    _.defer(function() {
-                        deferred.reject(err);
-                    });
-                }
-            };
-        }
-    }();
-    var SearchIndex = function() {
-        function SearchIndex(o) {
-            o = o || {};
-            if (!o.datumTokenizer || !o.queryTokenizer) {
-                $.error("datumTokenizer and queryTokenizer are both required");
-            }
-            this.datumTokenizer = o.datumTokenizer;
-            this.queryTokenizer = o.queryTokenizer;
-            this.reset();
-        }
-        _.mixin(SearchIndex.prototype, {
-            bootstrap: function bootstrap(o) {
-                this.datums = o.datums;
-                this.trie = o.trie;
-            },
-            add: function(data) {
-                var that = this;
-                data = _.isArray(data) ? data : [ data ];
-                _.each(data, function(datum) {
-                    var id, tokens;
-                    id = that.datums.push(datum) - 1;
-                    tokens = normalizeTokens(that.datumTokenizer(datum));
-                    _.each(tokens, function(token) {
-                        var node, chars, ch;
-                        node = that.trie;
-                        chars = token.split("");
-                        while (ch = chars.shift()) {
-                            node = node.children[ch] || (node.children[ch] = newNode());
-                            node.ids.push(id);
-                        }
-                    });
-                });
-            },
-            get: function get(query) {
-                var that = this, tokens, matches;
-                tokens = normalizeTokens(this.queryTokenizer(query));
-                _.each(tokens, function(token) {
-                    var node, chars, ch, ids;
-                    if (matches && matches.length === 0) {
-                        return false;
-                    }
-                    node = that.trie;
-                    chars = token.split("");
-                    while (node && (ch = chars.shift())) {
-                        node = node.children[ch];
-                    }
-                    if (node && chars.length === 0) {
-                        ids = node.ids.slice(0);
-                        matches = matches ? getIntersection(matches, ids) : ids;
-                    } else {
-                        matches = [];
-                        return false;
-                    }
-                });
-                return matches ? _.map(unique(matches), function(id) {
-                    return that.datums[id];
-                }) : [];
-            },
-            reset: function reset() {
-                this.datums = [];
-                this.trie = newNode();
-            },
-            serialize: function serialize() {
-                return {
-                    datums: this.datums,
-                    trie: this.trie
-                };
-            }
-        });
-        return SearchIndex;
-        function normalizeTokens(tokens) {
-            tokens = _.filter(tokens, function(token) {
-                return !!token;
-            });
-            tokens = _.map(tokens, function(token) {
-                return token.toLowerCase();
-            });
-            return tokens;
-        }
-        function newNode() {
-            return {
-                ids: [],
-                children: {}
-            };
-        }
-        function unique(array) {
-            var seen = {}, uniques = [];
-            for (var i = 0; i < array.length; i++) {
-                if (!seen[array[i]]) {
-                    seen[array[i]] = true;
-                    uniques.push(array[i]);
-                }
-            }
-            return uniques;
-        }
-        function getIntersection(arrayA, arrayB) {
-            var ai = 0, bi = 0, intersection = [];
-            arrayA = arrayA.sort(compare);
-            arrayB = arrayB.sort(compare);
-            while (ai < arrayA.length && bi < arrayB.length) {
-                if (arrayA[ai] < arrayB[bi]) {
-                    ai++;
-                } else if (arrayA[ai] > arrayB[bi]) {
-                    bi++;
-                } else {
-                    intersection.push(arrayA[ai]);
-                    ai++;
-                    bi++;
-                }
-            }
-            return intersection;
-            function compare(a, b) {
-                return a - b;
-            }
-        }
-    }();
-    var oParser = function() {
-        return {
-            local: getLocal,
-            prefetch: getPrefetch,
-            remote: getRemote
-        };
-        function getLocal(o) {
-            return o.local || null;
-        }
-        function getPrefetch(o) {
-            var prefetch, defaults;
-            defaults = {
-                url: null,
-                thumbprint: "",
-                ttl: 24 * 60 * 60 * 1e3,
-                filter: null,
-                ajax: {}
-            };
-            if (prefetch = o.prefetch || null) {
-                prefetch = _.isString(prefetch) ? {
-                    url: prefetch
-                } : prefetch;
-                prefetch = _.mixin(defaults, prefetch);
-                prefetch.thumbprint = VERSION + prefetch.thumbprint;
-                prefetch.ajax.type = prefetch.ajax.type || "GET";
-                prefetch.ajax.dataType = prefetch.ajax.dataType || "json";
-                !prefetch.url && $.error("prefetch requires url to be set");
-            }
-            return prefetch;
-        }
-        function getRemote(o) {
-            var remote, defaults;
-            defaults = {
-                url: null,
-                wildcard: "%QUERY",
-                replace: null,
-                rateLimitBy: "debounce",
-                rateLimitWait: 300,
-                send: null,
-                filter: null,
-                ajax: {}
-            };
-            if (remote = o.remote || null) {
-                remote = _.isString(remote) ? {
-                    url: remote
-                } : remote;
-                remote = _.mixin(defaults, remote);
-                remote.rateLimiter = /^throttle$/i.test(remote.rateLimitBy) ? byThrottle(remote.rateLimitWait) : byDebounce(remote.rateLimitWait);
-                remote.ajax.type = remote.ajax.type || "GET";
-                remote.ajax.dataType = remote.ajax.dataType || "json";
-                delete remote.rateLimitBy;
-                delete remote.rateLimitWait;
-                !remote.url && $.error("remote requires url to be set");
-            }
-            return remote;
-            function byDebounce(wait) {
-                return function(fn) {
-                    return _.debounce(fn, wait);
-                };
-            }
-            function byThrottle(wait) {
-                return function(fn) {
-                    return _.throttle(fn, wait);
-                };
-            }
-        }
-    }();
-    (function(root) {
-        var old, keys;
-        old = root.Bloodhound;
-        keys = {
-            data: "data",
-            protocol: "protocol",
-            thumbprint: "thumbprint"
-        };
-        root.Bloodhound = Bloodhound;
-        function Bloodhound(o) {
-            if (!o || !o.local && !o.prefetch && !o.remote) {
-                $.error("one of local, prefetch, or remote is required");
-            }
-            this.limit = o.limit || 5;
-            this.sorter = getSorter(o.sorter);
-            this.dupDetector = o.dupDetector || ignoreDuplicates;
-            this.local = oParser.local(o);
-            this.prefetch = oParser.prefetch(o);
-            this.remote = oParser.remote(o);
-            this.cacheKey = this.prefetch ? this.prefetch.cacheKey || this.prefetch.url : null;
-            this.index = new SearchIndex({
-                datumTokenizer: o.datumTokenizer,
-                queryTokenizer: o.queryTokenizer
-            });
-            this.storage = this.cacheKey ? new PersistentStorage(this.cacheKey) : null;
-        }
-        Bloodhound.noConflict = function noConflict() {
-            root.Bloodhound = old;
-            return Bloodhound;
-        };
-        Bloodhound.tokenizers = tokenizers;
-        _.mixin(Bloodhound.prototype, {
-            _loadPrefetch: function loadPrefetch(o) {
-                var that = this, serialized, deferred;
-                if (serialized = this._readFromStorage(o.thumbprint)) {
-                    this.index.bootstrap(serialized);
-                    deferred = $.Deferred().resolve();
-                } else {
-                    deferred = $.ajax(o.url, o.ajax).done(handlePrefetchResponse);
-                }
-                return deferred;
-                function handlePrefetchResponse(resp) {
-                    that.clear();
-                    that.add(o.filter ? o.filter(resp) : resp);
-                    that._saveToStorage(that.index.serialize(), o.thumbprint, o.ttl);
-                }
-            },
-            _getFromRemote: function getFromRemote(query, cb) {
-                var that = this, url, uriEncodedQuery;
-                query = query || "";
-                uriEncodedQuery = encodeURIComponent(query);
-                url = this.remote.replace ? this.remote.replace(this.remote.url, query) : this.remote.url.replace(this.remote.wildcard, uriEncodedQuery);
-                return this.transport.get(url, this.remote.ajax, handleRemoteResponse);
-                function handleRemoteResponse(err, resp) {
-                    err ? cb([]) : cb(that.remote.filter ? that.remote.filter(resp) : resp);
-                }
-            },
-            _saveToStorage: function saveToStorage(data, thumbprint, ttl) {
-                if (this.storage) {
-                    this.storage.set(keys.data, data, ttl);
-                    this.storage.set(keys.protocol, location.protocol, ttl);
-                    this.storage.set(keys.thumbprint, thumbprint, ttl);
-                }
-            },
-            _readFromStorage: function readFromStorage(thumbprint) {
-                var stored = {}, isExpired;
-                if (this.storage) {
-                    stored.data = this.storage.get(keys.data);
-                    stored.protocol = this.storage.get(keys.protocol);
-                    stored.thumbprint = this.storage.get(keys.thumbprint);
-                }
-                isExpired = stored.thumbprint !== thumbprint || stored.protocol !== location.protocol;
-                return stored.data && !isExpired ? stored.data : null;
-            },
-            _initialize: function initialize() {
-                var that = this, local = this.local, deferred;
-                deferred = this.prefetch ? this._loadPrefetch(this.prefetch) : $.Deferred().resolve();
-                local && deferred.done(addLocalToIndex);
-                this.transport = this.remote ? new Transport(this.remote) : null;
-                return this.initPromise = deferred.promise();
-                function addLocalToIndex() {
-                    that.add(_.isFunction(local) ? local() : local);
-                }
-            },
-            initialize: function initialize(force) {
-                return !this.initPromise || force ? this._initialize() : this.initPromise;
-            },
-            add: function add(data) {
-                this.index.add(data);
-            },
-            get: function get(query, cb) {
-                var that = this, matches = [], cacheHit = false;
-                matches = this.index.get(query);
-                matches = this.sorter(matches).slice(0, this.limit);
-                if (matches.length < this.limit && this.transport) {
-                    cacheHit = this._getFromRemote(query, returnRemoteMatches);
-                }
-                if (!cacheHit) {
-                    (matches.length > 0 || !this.transport) && cb && cb(matches);
-                }
-                function returnRemoteMatches(remoteMatches) {
-                    var matchesWithBackfill = matches.slice(0);
-                    _.each(remoteMatches, function(remoteMatch) {
-                        var isDuplicate;
-                        isDuplicate = _.some(matchesWithBackfill, function(match) {
-                            return that.dupDetector(remoteMatch, match);
-                        });
-                        !isDuplicate && matchesWithBackfill.push(remoteMatch);
-                        return matchesWithBackfill.length < that.limit;
-                    });
-                    cb && cb(that.sorter(matchesWithBackfill));
-                }
-            },
-            clear: function clear() {
-                this.index.reset();
-            },
-            clearPrefetchCache: function clearPrefetchCache() {
-                this.storage && this.storage.clear();
-            },
-            clearRemoteCache: function clearRemoteCache() {
-                this.transport && Transport.resetCache();
-            },
-            ttAdapter: function ttAdapter() {
-                return _.bind(this.get, this);
-            }
-        });
-        return Bloodhound;
-        function getSorter(sortFn) {
-            return _.isFunction(sortFn) ? sort : noSort;
-            function sort(array) {
-                return array.sort(sortFn);
-            }
-            function noSort(array) {
-                return array;
-            }
-        }
-        function ignoreDuplicates() {
-            return false;
-        }
-    })(this);
-    var html = {
-        wrapper: '<div class="tt-wrapper"></div>',
-        dropdown: '<span class="tt-dropdown-menu"></span>',
-        dataset: '<div class="tt-dataset-%CLASS%"></div>',
-        suggestions: '<span class="tt-suggestions"></span>',
-        suggestion: '<a class="tt-suggestion"></a>'
-    };
-    var css = {
-        wrapper: {
-        },
-        hint: {
-            position: "absolute",
-            top: "0",
-            left: "0",
-            borderColor: "transparent",
-            boxShadow: "none"
-        },
-        input: {
-            position: "relative",
-        },
-        inputWithNoHint: {
-            position: "relative",
-            verticalAlign: "top"
-        },
-        dropdown: {
-        },
-        suggestions: {
-        },
-        suggestion: {
-        },
-        suggestionChild: {
-            whiteSpace: "normal"
-        },
-        ltr: {
-            left: "0",
-            right: "auto"
-        },
-        rtl: {
-            left: "auto",
-            right: " 0"
-        }
-    };
-    if (_.isMsie()) {
-        _.mixin(css.input, {
-            backgroundImage: "url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"
-        });
-    }
-    if (_.isMsie() && _.isMsie() <= 7) {
-        _.mixin(css.input, {
-            marginTop: "-1px"
-        });
-    }
-    var EventBus = function() {
-        var namespace = "typeahead:";
-        function EventBus(o) {
-            if (!o || !o.el) {
-                $.error("EventBus initialized without el");
-            }
-            this.$el = $(o.el);
-        }
-        _.mixin(EventBus.prototype, {
-            trigger: function(type) {
-                var args = [].slice.call(arguments, 1);
-                this.$el.trigger(namespace + type, args);
-            }
-        });
-        return EventBus;
-    }();
-    var EventEmitter = function() {
-        var splitter = /\s+/, nextTick = getNextTick();
-        return {
-            onSync: onSync,
-            onAsync: onAsync,
-            off: off,
-            trigger: trigger
-        };
-        function on(method, types, cb, context) {
-            var type;
-            if (!cb) {
-                return this;
-            }
-            types = types.split(splitter);
-            cb = context ? bindContext(cb, context) : cb;
-            this._callbacks = this._callbacks || {};
-            while (type = types.shift()) {
-                this._callbacks[type] = this._callbacks[type] || {
-                    sync: [],
-                    async: []
-                };
-                this._callbacks[type][method].push(cb);
-            }
-            return this;
-        }
-        function onAsync(types, cb, context) {
-            return on.call(this, "async", types, cb, context);
-        }
-        function onSync(types, cb, context) {
-            return on.call(this, "sync", types, cb, context);
-        }
-        function off(types) {
-            var type;
-            if (!this._callbacks) {
-                return this;
-            }
-            types = types.split(splitter);
-            while (type = types.shift()) {
-                delete this._callbacks[type];
-            }
-            return this;
-        }
-        function trigger(types) {
-            var type, callbacks, args, syncFlush, asyncFlush;
-            if (!this._callbacks) {
-                return this;
-            }
-            types = types.split(splitter);
-            args = [].slice.call(arguments, 1);
-            while ((type = types.shift()) && (callbacks = this._callbacks[type])) {
-                syncFlush = getFlush(callbacks.sync, this, [ type ].concat(args));
-                asyncFlush = getFlush(callbacks.async, this, [ type ].concat(args));
-                syncFlush() && nextTick(asyncFlush);
-            }
-            return this;
-        }
-        function getFlush(callbacks, context, args) {
-            return flush;
-            function flush() {
-                var cancelled;
-                for (var i = 0; !cancelled && i < callbacks.length; i += 1) {
-                    cancelled = callbacks[i].apply(context, args) === false;
-                }
-                return !cancelled;
-            }
-        }
-        function getNextTick() {
-            var nextTickFn;
-            if (window.setImmediate) {
-                nextTickFn = function nextTickSetImmediate(fn) {
-                    setImmediate(function() {
-                        fn();
-                    });
-                };
-            } else {
-                nextTickFn = function nextTickSetTimeout(fn) {
-                    setTimeout(function() {
-                        fn();
-                    }, 0);
-                };
-            }
-            return nextTickFn;
-        }
-        function bindContext(fn, context) {
-            return fn.bind ? fn.bind(context) : function() {
-                fn.apply(context, [].slice.call(arguments, 0));
-            };
-        }
-    }();
-    var highlight = function(doc) {
-        var defaults = {
-            node: null,
-            pattern: null,
-            tagName: "strong",
-            className: null,
-            wordsOnly: false,
-            caseSensitive: false
-        };
-        return function hightlight(o) {
-            var regex;
-            o = _.mixin({}, defaults, o);
-            if (!o.node || !o.pattern) {
-                return;
-            }
-            o.pattern = _.isArray(o.pattern) ? o.pattern : [ o.pattern ];
-            regex = getRegex(o.pattern, o.caseSensitive, o.wordsOnly);
-            traverse(o.node, hightlightTextNode);
-            function hightlightTextNode(textNode) {
-                var match, patternNode;
-                if (match = regex.exec(textNode.data)) {
-                    wrapperNode = doc.createElement(o.tagName);
-                    o.className && (wrapperNode.className = o.className);
-                    patternNode = textNode.splitText(match.index);
-                    patternNode.splitText(match[0].length);
-                    wrapperNode.appendChild(patternNode.cloneNode(true));
-                    textNode.parentNode.replaceChild(wrapperNode, patternNode);
-                }
-                return !!match;
-            }
-            function traverse(el, hightlightTextNode) {
-                var childNode, TEXT_NODE_TYPE = 3;
-                for (var i = 0; i < el.childNodes.length; i++) {
-                    childNode = el.childNodes[i];
-                    if (childNode.nodeType === TEXT_NODE_TYPE) {
-                        i += hightlightTextNode(childNode) ? 1 : 0;
-                    } else {
-                        traverse(childNode, hightlightTextNode);
-                    }
-                }
-            }
-        };
-        function getRegex(patterns, caseSensitive, wordsOnly) {
-            var escapedPatterns = [], regexStr;
-            for (var i = 0; i < patterns.length; i++) {
-                escapedPatterns.push(_.escapeRegExChars(patterns[i]));
-            }
-            regexStr = wordsOnly ? "\\b(" + escapedPatterns.join("|") + ")\\b" : "(" + escapedPatterns.join("|") + ")";
-            return caseSensitive ? new RegExp(regexStr) : new RegExp(regexStr, "i");
-        }
-    }(window.document);
-    var Input = function() {
-        var specialKeyCodeMap;
-        specialKeyCodeMap = {
-            9: "tab",
-            27: "esc",
-            37: "left",
-            39: "right",
-            13: "enter",
-            38: "up",
-            40: "down"
-        };
-        function Input(o) {
-            var that = this, onBlur, onFocus, onKeydown, onInput;
-            o = o || {};
-            if (!o.input) {
-                $.error("input is missing");
-            }
-            onBlur = _.bind(this._onBlur, this);
-            onFocus = _.bind(this._onFocus, this);
-            onKeydown = _.bind(this._onKeydown, this);
-            onInput = _.bind(this._onInput, this);
-            this.$hint = $(o.hint);
-            this.$input = $(o.input).on("blur.tt", onBlur).on("focus.tt", onFocus).on("keydown.tt", onKeydown);
-            if (this.$hint.length === 0) {
-                this.setHint = this.getHint = this.clearHint = this.clearHintIfInvalid = _.noop;
-            }
-            if (!_.isMsie()) {
-                this.$input.on("input.tt", onInput);
-            } else {
-                this.$input.on("keydown.tt keypress.tt cut.tt paste.tt", function($e) {
-                    if (specialKeyCodeMap[$e.which || $e.keyCode]) {
-                        return;
-                    }
-                    _.defer(_.bind(that._onInput, that, $e));
-                });
-            }
-            this.query = this.$input.val();
-            this.$overflowHelper = buildOverflowHelper(this.$input);
-        }
-        Input.normalizeQuery = function(str) {
-            return (str || "").replace(/^\s*/g, "").replace(/\s{2,}/g, " ");
-        };
-        _.mixin(Input.prototype, EventEmitter, {
-            _onBlur: function onBlur() {
-                this.resetInputValue();
-                this.trigger("blurred");
-            },
-            _onFocus: function onFocus() {
-                this.trigger("focused");
-            },
-            _onKeydown: function onKeydown($e) {
-                var keyName = specialKeyCodeMap[$e.which || $e.keyCode];
-                this._managePreventDefault(keyName, $e);
-                if (keyName && this._shouldTrigger(keyName, $e)) {
-                    this.trigger(keyName + "Keyed", $e);
-                }
-            },
-            _onInput: function onInput() {
-                this._checkInputValue();
-            },
-            _managePreventDefault: function managePreventDefault(keyName, $e) {
-                var preventDefault, hintValue, inputValue;
-                switch (keyName) {
-                  case "tab":
-                    hintValue = this.getHint();
-                    inputValue = this.getInputValue();
-                    preventDefault = hintValue && hintValue !== inputValue && !withModifier($e);
-                    break;
-
-                  case "up":
-                  case "down":
-                    preventDefault = !withModifier($e);
-                    break;
-
-                  default:
-                    preventDefault = false;
-                }
-                preventDefault && $e.preventDefault();
-            },
-            _shouldTrigger: function shouldTrigger(keyName, $e) {
-                var trigger;
-                switch (keyName) {
-                  case "tab":
-                    trigger = !withModifier($e);
-                    break;
-
-                  default:
-                    trigger = true;
-                }
-                return trigger;
-            },
-            _checkInputValue: function checkInputValue() {
-                var inputValue, areEquivalent, hasDifferentWhitespace;
-                inputValue = this.getInputValue();
-                areEquivalent = areQueriesEquivalent(inputValue, this.query);
-                hasDifferentWhitespace = areEquivalent ? this.query.length !== inputValue.length : false;
-                if (!areEquivalent) {
-                    this.trigger("queryChanged", this.query = inputValue);
-                } else if (hasDifferentWhitespace) {
-                    this.trigger("whitespaceChanged", this.query);
-                }
-            },
-            focus: function focus() {
-                this.$input.focus();
-            },
-            blur: function blur() {
-                this.$input.blur();
-            },
-            getQuery: function getQuery() {
-                return this.query;
-            },
-            setQuery: function setQuery(query) {
-                this.query = query;
-            },
-            getInputValue: function getInputValue() {
-                return this.$input.val();
-            },
-            setInputValue: function setInputValue(value, silent) {
-                this.$input.val(value);
-                silent ? this.clearHint() : this._checkInputValue();
-            },
-            resetInputValue: function resetInputValue() {
-                this.setInputValue(this.query, true);
-            },
-            getHint: function getHint() {
-                return this.$hint.val();
-            },
-            setHint: function setHint(value) {
-                this.$hint.val(value);
-            },
-            clearHint: function clearHint() {
-                this.setHint("");
-            },
-            clearHintIfInvalid: function clearHintIfInvalid() {
-                var val, hint, valIsPrefixOfHint, isValid;
-                val = this.getInputValue();
-                hint = this.getHint();
-                valIsPrefixOfHint = val !== hint && hint.indexOf(val) === 0;
-                isValid = val !== "" && valIsPrefixOfHint && !this.hasOverflow();
-                !isValid && this.clearHint();
-            },
-            getLanguageDirection: function getLanguageDirection() {
-                return (this.$input.css("direction") || "ltr").toLowerCase();
-            },
-            hasOverflow: function hasOverflow() {
-                var constraint = this.$input.width() - 2;
-                this.$overflowHelper.text(this.getInputValue());
-                return this.$overflowHelper.width() >= constraint;
-            },
-            isCursorAtEnd: function() {
-                var valueLength, selectionStart, range;
-                valueLength = this.$input.val().length;
-                selectionStart = this.$input[0].selectionStart;
-                if (_.isNumber(selectionStart)) {
-                    return selectionStart === valueLength;
-                } else if (document.selection) {
-                    range = document.selection.createRange();
-                    range.moveStart("character", -valueLength);
-                    return valueLength === range.text.length;
-                }
-                return true;
-            },
-            destroy: function destroy() {
-                this.$hint.off(".tt");
-                this.$input.off(".tt");
-                this.$hint = this.$input = this.$overflowHelper = null;
-            }
-        });
-        return Input;
-        function buildOverflowHelper($input) {
-            return $('<pre aria-hidden="true"></pre>').css({
-                position: "absolute",
-                visibility: "hidden",
-                whiteSpace: "pre",
-                fontFamily: $input.css("font-family"),
-                fontSize: $input.css("font-size"),
-                fontStyle: $input.css("font-style"),
-                fontVariant: $input.css("font-variant"),
-                fontWeight: $input.css("font-weight"),
-                wordSpacing: $input.css("word-spacing"),
-                letterSpacing: $input.css("letter-spacing"),
-                textIndent: $input.css("text-indent"),
-                textRendering: $input.css("text-rendering"),
-                textTransform: $input.css("text-transform")
-            }).insertAfter($input);
-        }
-        function areQueriesEquivalent(a, b) {
-            return Input.normalizeQuery(a) === Input.normalizeQuery(b);
-        }
-        function withModifier($e) {
-            return $e.altKey || $e.ctrlKey || $e.metaKey || $e.shiftKey;
-        }
-    }();
-    var Dataset = function() {
-        var datasetKey = "ttDataset", valueKey = "ttValue", datumKey = "ttDatum";
-        function Dataset(o) {
-            o = o || {};
-            o.templates = o.templates || {};
-            if (!o.source) {
-                $.error("missing source");
-            }
-            if (o.name && !isValidName(o.name)) {
-                $.error("invalid dataset name: " + o.name);
-            }
-            this.query = null;
-            this.highlight = !!o.highlight;
-            this.name = o.name || _.getUniqueId();
-            this.source = o.source;
-            this.displayFn = getDisplayFn(o.display || o.displayKey);
-            this.templates = getTemplates(o.templates, this.displayFn);
-            this.$el = $(html.dataset.replace("%CLASS%", this.name));
-        }
-        Dataset.extractDatasetName = function extractDatasetName(el) {
-            return $(el).data(datasetKey);
-        };
-        Dataset.extractValue = function extractDatum(el) {
-            return $(el).data(valueKey);
-        };
-        Dataset.extractDatum = function extractDatum(el) {
-            return $(el).data(datumKey);
-        };
-        _.mixin(Dataset.prototype, EventEmitter, {
-            _render: function render(query, suggestions) {
-                if (!this.$el) {
-                    return;
-                }
-                var that = this, hasSuggestions;
-                this.$el.empty();
-                hasSuggestions = suggestions && suggestions.length;
-                if (!hasSuggestions && this.templates.empty) {
-                    this.$el.html(getEmptyHtml()).prepend(that.templates.header ? getHeaderHtml() : null).append(that.templates.footer ? getFooterHtml() : null);
-                } else if (hasSuggestions) {
-                    this.$el.html(getSuggestionsHtml()).prepend(that.templates.header ? getHeaderHtml() : null).append(that.templates.footer ? getFooterHtml() : null);
-                }
-                this.trigger("rendered");
-                function getEmptyHtml() {
-                    return that.templates.empty({
-                        query: query,
-                        isEmpty: true
-                    });
-                }
-                function getSuggestionsHtml() {
-                    var $suggestions, nodes;
-                    $suggestions = $(html.suggestions).css(css.suggestions);
-                    nodes = _.map(suggestions, getSuggestionNode);
-                    $suggestions.append.apply($suggestions, nodes);
-                    that.highlight && highlight({
-                        node: $suggestions[0],
-                        pattern: query
-                    });
-                    return $suggestions;
-                    function getSuggestionNode(suggestion) {
-                        var $el;
-                        $el = $(html.suggestion).append(that.templates.suggestion(suggestion)).data(datasetKey, that.name).data(valueKey, that.displayFn(suggestion)).data(datumKey, suggestion);
-                        $el.children().each(function() {
-                            $(this).css(css.suggestionChild);
-                        });
-                        return $el;
-                    }
-                }
-                function getHeaderHtml() {
-                    return that.templates.header({
-                        query: query,
-                        isEmpty: !hasSuggestions
-                    });
-                }
-                function getFooterHtml() {
-                    return that.templates.footer({
-                        query: query,
-                        isEmpty: !hasSuggestions
-                    });
-                }
-            },
-            getRoot: function getRoot() {
-                return this.$el;
-            },
-            update: function update(query) {
-                var that = this;
-                this.query = query;
-                this.canceled = false;
-                this.source(query, render);
-                function render(suggestions) {
-                    if (!that.canceled && query === that.query) {
-                        that._render(query, suggestions);
-                    }
-                }
-            },
-            cancel: function cancel() {
-                this.canceled = true;
-            },
-            clear: function clear() {
-                this.cancel();
-                this.$el.empty();
-                this.trigger("rendered");
-            },
-            isEmpty: function isEmpty() {
-                return this.$el.is(":empty");
-            },
-            destroy: function destroy() {
-                this.$el = null;
-            }
-        });
-        return Dataset;
-        function getDisplayFn(display) {
-            display = display || "value";
-            return _.isFunction(display) ? display : displayFn;
-            function displayFn(obj) {
-                return obj[display];
-            }
-        }
-        function getTemplates(templates, displayFn) {
-            return {
-                empty: templates.empty && _.templatify(templates.empty),
-                header: templates.header && _.templatify(templates.header),
-                footer: templates.footer && _.templatify(templates.footer),
-                suggestion: templates.suggestion || suggestionTemplate
-            };
-            function suggestionTemplate(context) {
-                return "<p>" + displayFn(context) + "</p>";
-            }
-        }
-        function isValidName(str) {
-            return /^[_a-zA-Z0-9-]+$/.test(str);
-        }
-    }();
-    var Dropdown = function() {
-        function Dropdown(o) {
-            var that = this, onSuggestionClick, onSuggestionMouseEnter, onSuggestionMouseLeave;
-            o = o || {};
-            if (!o.menu) {
-                $.error("menu is required");
-            }
-            this.isOpen = false;
-            this.isEmpty = true;
-            this.datasets = _.map(o.datasets, initializeDataset);
-            onSuggestionClick = _.bind(this._onSuggestionClick, this);
-            onSuggestionMouseEnter = _.bind(this._onSuggestionMouseEnter, this);
-            onSuggestionMouseLeave = _.bind(this._onSuggestionMouseLeave, this);
-            this.$menu = $(o.menu).on("click.tt", ".tt-suggestion", onSuggestionClick).on("mouseenter.tt", ".tt-suggestion", onSuggestionMouseEnter).on("mouseleave.tt", ".tt-suggestion", onSuggestionMouseLeave);
-            _.each(this.datasets, function(dataset) {
-                that.$menu.append(dataset.getRoot());
-                dataset.onSync("rendered", that._onRendered, that);
-            });
-        }
-        _.mixin(Dropdown.prototype, EventEmitter, {
-            _onSuggestionClick: function onSuggestionClick($e) {
-                this.trigger("suggestionClicked", $($e.currentTarget));
-            },
-            _onSuggestionMouseEnter: function onSuggestionMouseEnter($e) {
-                this._removeCursor();
-                this._setCursor($($e.currentTarget), true);
-            },
-            _onSuggestionMouseLeave: function onSuggestionMouseLeave() {
-                this._removeCursor();
-            },
-            _onRendered: function onRendered() {
-                this.isEmpty = _.every(this.datasets, isDatasetEmpty);
-                this.isEmpty ? this._hide() : this.isOpen && this._show();
-                this.trigger("datasetRendered");
-                function isDatasetEmpty(dataset) {
-                    return dataset.isEmpty();
-                }
-            },
-            _hide: function() {
-                this.$menu.hide();
-            },
-            _show: function() {
-                this.$menu.css("display", "block");
-            },
-            _getSuggestions: function getSuggestions() {
-                return this.$menu.find(".tt-suggestion");
-            },
-            _getCursor: function getCursor() {
-                return this.$menu.find(".tt-cursor").first();
-            },
-            _setCursor: function setCursor($el, silent) {
-                $el.first().addClass("tt-cursor");
-                !silent && this.trigger("cursorMoved");
-            },
-            _removeCursor: function removeCursor() {
-                this._getCursor().removeClass("tt-cursor");
-            },
-            _moveCursor: function moveCursor(increment) {
-                var $suggestions, $oldCursor, newCursorIndex, $newCursor;
-                if (!this.isOpen) {
-                    return;
-                }
-                $oldCursor = this._getCursor();
-                $suggestions = this._getSuggestions();
-                this._removeCursor();
-                newCursorIndex = $suggestions.index($oldCursor) + increment;
-                newCursorIndex = (newCursorIndex + 1) % ($suggestions.length + 1) - 1;
-                if (newCursorIndex === -1) {
-                    this.trigger("cursorRemoved");
-                    return;
-                } else if (newCursorIndex < -1) {
-                    newCursorIndex = $suggestions.length - 1;
-                }
-                this._setCursor($newCursor = $suggestions.eq(newCursorIndex));
-                this._ensureVisible($newCursor);
-            },
-            _ensureVisible: function ensureVisible($el) {
-                var elTop, elBottom, menuScrollTop, menuHeight;
-                elTop = $el.position().top;
-                elBottom = elTop + $el.outerHeight(true);
-                menuScrollTop = this.$menu.scrollTop();
-                menuHeight = this.$menu.height() + parseInt(this.$menu.css("paddingTop"), 10) + parseInt(this.$menu.css("paddingBottom"), 10);
-                if (elTop < 0) {
-                    this.$menu.scrollTop(menuScrollTop + elTop);
-                } else if (menuHeight < elBottom) {
-                    this.$menu.scrollTop(menuScrollTop + (elBottom - menuHeight));
-                }
-            },
-            close: function close() {
-                if (this.isOpen) {
-                    this.isOpen = false;
-                    this._removeCursor();
-                    this._hide();
-                    this.trigger("closed");
-                }
-            },
-            open: function open() {
-                if (!this.isOpen) {
-                    this.isOpen = true;
-                    !this.isEmpty && this._show();
-                    this.trigger("opened");
-                }
-            },
-            setLanguageDirection: function setLanguageDirection(dir) {
-                this.$menu.css(dir === "ltr" ? css.ltr : css.rtl);
-            },
-            moveCursorUp: function moveCursorUp() {
-                this._moveCursor(-1);
-            },
-            moveCursorDown: function moveCursorDown() {
-                this._moveCursor(+1);
-            },
-            getDatumForSuggestion: function getDatumForSuggestion($el) {
-                var datum = null;
-                if ($el.length) {
-                    datum = {
-                        raw: Dataset.extractDatum($el),
-                        value: Dataset.extractValue($el),
-                        datasetName: Dataset.extractDatasetName($el)
-                    };
-                }
-                return datum;
-            },
-            getDatumForCursor: function getDatumForCursor() {
-                return this.getDatumForSuggestion(this._getCursor().first());
-            },
-            getDatumForTopSuggestion: function getDatumForTopSuggestion() {
-                return this.getDatumForSuggestion(this._getSuggestions().first());
-            },
-            update: function update(query) {
-                _.each(this.datasets, updateDataset);
-                function updateDataset(dataset) {
-                    dataset.update(query);
-                }
-            },
-            empty: function empty() {
-                _.each(this.datasets, clearDataset);
-                this.isEmpty = true;
-                function clearDataset(dataset) {
-                    dataset.clear();
-                }
-            },
-            isVisible: function isVisible() {
-                return this.isOpen && !this.isEmpty;
-            },
-            destroy: function destroy() {
-                this.$menu.off(".tt");
-                this.$menu = null;
-                _.each(this.datasets, destroyDataset);
-                function destroyDataset(dataset) {
-                    dataset.destroy();
-                }
-            }
-        });
-        return Dropdown;
-        function initializeDataset(oDataset) {
-            return new Dataset(oDataset);
-        }
-    }();
-    var Typeahead = function() {
-        var attrsKey = "ttAttrs";
-        function Typeahead(o) {
-            var $menu, $input, $hint;
-            o = o || {};
-            if (!o.input) {
-                $.error("missing input");
-            }
-            this.isActivated = false;
-            this.autoselect = !!o.autoselect;
-            this.minLength = _.isNumber(o.minLength) ? o.minLength : 1;
-            this.$node = buildDomStructure(o.input, o.withHint);
-            $menu = this.$node.find(".tt-dropdown-menu");
-            $input = this.$node.find(".tt-input");
-            $hint = this.$node.find(".tt-hint");
-            $input.on("blur.tt", function($e) {
-                var active, isActive, hasActive;
-                active = document.activeElement;
-                isActive = $menu.is(active);
-                hasActive = $menu.has(active).length > 0;
-                if (_.isMsie() && (isActive || hasActive)) {
-                    $e.preventDefault();
-                    $e.stopImmediatePropagation();
-                    _.defer(function() {
-                        $input.focus();
-                    });
-                }
-            });
-            $menu.on("mousedown.tt", function($e) {
-                $e.preventDefault();
-            });
-            this.eventBus = o.eventBus || new EventBus({
-                el: $input
-            });
-            this.dropdown = new Dropdown({
-                menu: $menu,
-                datasets: o.datasets
-            }).onSync("suggestionClicked", this._onSuggestionClicked, this).onSync("cursorMoved", this._onCursorMoved, this).onSync("cursorRemoved", this._onCursorRemoved, this).onSync("opened", this._onOpened, this).onSync("closed", this._onClosed, this).onAsync("datasetRendered", this._onDatasetRendered, this);
-            this.input = new Input({
-                input: $input,
-                hint: $hint
-            }).onSync("focused", this._onFocused, this).onSync("blurred", this._onBlurred, this).onSync("enterKeyed", this._onEnterKeyed, this).onSync("tabKeyed", this._onTabKeyed, this).onSync("escKeyed", this._onEscKeyed, this).onSync("upKeyed", this._onUpKeyed, this).onSync("downKeyed", this._onDownKeyed, this).onSync("leftKeyed", this._onLeftKeyed, this).onSync("rightKeyed", this._onRightKeyed, this).onSync("queryChanged", this._onQueryChanged, this).onSync("whitespaceChanged", this._onWhitespaceChanged, this);
-            this._setLanguageDirection();
-        }
-        _.mixin(Typeahead.prototype, {
-            _onSuggestionClicked: function onSuggestionClicked(type, $el) {
-                var datum;
-                if (datum = this.dropdown.getDatumForSuggestion($el)) {
-                    this._select(datum);
-                }
-            },
-            _onCursorMoved: function onCursorMoved() {
-                var datum = this.dropdown.getDatumForCursor();
-                this.input.setInputValue(datum.value, true);
-                this.eventBus.trigger("cursorchanged", datum.raw, datum.datasetName);
-            },
-            _onCursorRemoved: function onCursorRemoved() {
-                this.input.resetInputValue();
-                this._updateHint();
-            },
-            _onDatasetRendered: function onDatasetRendered() {
-                this._updateHint();
-            },
-            _onOpened: function onOpened() {
-                this._updateHint();
-                this.eventBus.trigger("opened");
-            },
-            _onClosed: function onClosed() {
-                this.input.clearHint();
-                this.eventBus.trigger("closed");
-            },
-            _onFocused: function onFocused() {
-                this.isActivated = true;
-                this.dropdown.open();
-            },
-            _onBlurred: function onBlurred() {
-                this.isActivated = false;
-                this.dropdown.empty();
-                this.dropdown.close();
-            },
-            _onEnterKeyed: function onEnterKeyed(type, $e) {
-                var cursorDatum, topSuggestionDatum;
-                cursorDatum = this.dropdown.getDatumForCursor();
-                topSuggestionDatum = this.dropdown.getDatumForTopSuggestion();
-                if (cursorDatum) {
-                    this._select(cursorDatum);
-                    $e.preventDefault();
-                } else if (this.autoselect && topSuggestionDatum) {
-                    this._select(topSuggestionDatum);
-                    $e.preventDefault();
-                }
-            },
-            _onTabKeyed: function onTabKeyed(type, $e) {
-                var datum;
-                if (datum = this.dropdown.getDatumForCursor()) {
-                    this._select(datum);
-                    $e.preventDefault();
-                } else {
-                    this._autocomplete(true);
-                }
-            },
-            _onEscKeyed: function onEscKeyed() {
-                this.dropdown.close();
-                this.input.resetInputValue();
-            },
-            _onUpKeyed: function onUpKeyed() {
-                var query = this.input.getQuery();
-                this.dropdown.isEmpty && query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.moveCursorUp();
-                this.dropdown.open();
-            },
-            _onDownKeyed: function onDownKeyed() {
-                var query = this.input.getQuery();
-                this.dropdown.isEmpty && query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.moveCursorDown();
-                this.dropdown.open();
-            },
-            _onLeftKeyed: function onLeftKeyed() {
-                this.dir === "rtl" && this._autocomplete();
-            },
-            _onRightKeyed: function onRightKeyed() {
-                this.dir === "ltr" && this._autocomplete();
-            },
-            _onQueryChanged: function onQueryChanged(e, query) {
-                this.input.clearHintIfInvalid();
-                query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.empty();
-                this.dropdown.open();
-                this._setLanguageDirection();
-            },
-            _onWhitespaceChanged: function onWhitespaceChanged() {
-                this._updateHint();
-                this.dropdown.open();
-            },
-            _setLanguageDirection: function setLanguageDirection() {
-                var dir;
-                if (this.dir !== (dir = this.input.getLanguageDirection())) {
-                    this.dir = dir;
-                    this.$node.css("direction", dir);
-                    this.dropdown.setLanguageDirection(dir);
-                }
-            },
-            _updateHint: function updateHint() {
-                var datum, val, query, escapedQuery, frontMatchRegEx, match;
-                datum = this.dropdown.getDatumForTopSuggestion();
-                if (datum && this.dropdown.isVisible() && !this.input.hasOverflow()) {
-                    val = this.input.getInputValue();
-                    query = Input.normalizeQuery(val);
-                    escapedQuery = _.escapeRegExChars(query);
-                    frontMatchRegEx = new RegExp("^(?:" + escapedQuery + ")(.+$)", "i");
-                    match = frontMatchRegEx.exec(datum.value);
-                    match ? this.input.setHint(val + match[1]) : this.input.clearHint();
-                } else {
-                    this.input.clearHint();
-                }
-            },
-            _autocomplete: function autocomplete(laxCursor) {
-                var hint, query, isCursorAtEnd, datum;
-                hint = this.input.getHint();
-                query = this.input.getQuery();
-                isCursorAtEnd = laxCursor || this.input.isCursorAtEnd();
-                if (hint && query !== hint && isCursorAtEnd) {
-                    datum = this.dropdown.getDatumForTopSuggestion();
-                    datum && this.input.setInputValue(datum.value);
-                    this.eventBus.trigger("autocompleted", datum.raw, datum.datasetName);
-                }
-            },
-            _select: function select(datum) {
-                this.input.setQuery(datum.value);
-                this.input.setInputValue(datum.value, true);
-                this._setLanguageDirection();
-                this.eventBus.trigger("selected", datum.raw, datum.datasetName);
-                this.dropdown.close();
-                _.defer(_.bind(this.dropdown.empty, this.dropdown));
-            },
-            open: function open() {
-                this.dropdown.open();
-            },
-            close: function close() {
-                this.dropdown.close();
-            },
-            setVal: function setVal(val) {
-                if (this.isActivated) {
-                    this.input.setInputValue(val);
-                } else {
-                    this.input.setQuery(val);
-                    this.input.setInputValue(val, true);
-                }
-                this._setLanguageDirection();
-            },
-            getVal: function getVal() {
-                return this.input.getQuery();
-            },
-            destroy: function destroy() {
-                this.input.destroy();
-                this.dropdown.destroy();
-                destroyDomStructure(this.$node);
-                this.$node = null;
-            }
-        });
-        return Typeahead;
-        function buildDomStructure(input, withHint) {
-            var $input, $wrapper, $dropdown, $hint;
-            $input = $(input);
-            $wrapper = $(html.wrapper).css(css.wrapper);
-            $dropdown = $(html.dropdown).css(css.dropdown);
-            $hint = $input.clone().css(css.hint).css(getBackgroundStyles($input));
-            $hint.val("").removeData().addClass("tt-hint").removeAttr("id name placeholder").prop("disabled", true).attr({
-                autocomplete: "off",
-                spellcheck: "false"
-            });
-            $input.data(attrsKey, {
-                dir: $input.attr("dir"),
-                autocomplete: $input.attr("autocomplete"),
-                spellcheck: $input.attr("spellcheck"),
-                style: $input.attr("style")
-            });
-            $input.addClass("tt-input").attr({
-                autocomplete: "off",
-                spellcheck: false
-            }).css(withHint ? css.input : css.inputWithNoHint);
-            try {
-                !$input.attr("dir") && $input.attr("dir", "auto");
-            } catch (e) {}
-            return $input.wrap($wrapper).parent().prepend(withHint ? $hint : null).append($dropdown);
-        }
-        function getBackgroundStyles($el) {
-            return {
-                backgroundAttachment: $el.css("background-attachment"),
-                backgroundClip: $el.css("background-clip"),
-                backgroundColor: $el.css("background-color"),
-                backgroundImage: $el.css("background-image"),
-                backgroundOrigin: $el.css("background-origin"),
-                backgroundPosition: $el.css("background-position"),
-                backgroundRepeat: $el.css("background-repeat"),
-                backgroundSize: $el.css("background-size")
-            };
-        }
-        function destroyDomStructure($node) {
-            var $input = $node.find(".tt-input");
-            _.each($input.data(attrsKey), function(val, key) {
-                _.isUndefined(val) ? $input.removeAttr(key) : $input.attr(key, val);
-            });
-            $input.detach().removeData(attrsKey).removeClass("tt-input").insertAfter($node);
-            $node.remove();
-        }
-    }();
-    (function() {
-        var old, typeaheadKey, methods;
-        old = $.fn.typeahead;
-        typeaheadKey = "ttTypeahead";
-        methods = {
-            initialize: function initialize(o, datasets) {
-                datasets = _.isArray(datasets) ? datasets : [].slice.call(arguments, 1);
-                o = o || {};
-                return this.each(attach);
-                function attach() {
-                    var $input = $(this), eventBus, typeahead;
-                    _.each(datasets, function(d) {
-                        d.highlight = !!o.highlight;
-                    });
-                    typeahead = new Typeahead({
-                        input: $input,
-                        eventBus: eventBus = new EventBus({
-                            el: $input
-                        }),
-                        withHint: _.isUndefined(o.hint) ? true : !!o.hint,
-                        minLength: o.minLength,
-                        autoselect: o.autoselect,
-                        datasets: datasets
-                    });
-                    $input.data(typeaheadKey, typeahead);
-                }
-            },
-            open: function open() {
-                return this.each(openTypeahead);
-                function openTypeahead() {
-                    var $input = $(this), typeahead;
-                    if (typeahead = $input.data(typeaheadKey)) {
-                        typeahead.open();
-                    }
-                }
-            },
-            close: function close() {
-                return this.each(closeTypeahead);
-                function closeTypeahead() {
-                    var $input = $(this), typeahead;
-                    if (typeahead = $input.data(typeaheadKey)) {
-                        typeahead.close();
-                    }
-                }
-            },
-            val: function val(newVal) {
-                return !arguments.length ? getVal(this.first()) : this.each(setVal);
-                function setVal() {
-                    var $input = $(this), typeahead;
-                    if (typeahead = $input.data(typeaheadKey)) {
-                        typeahead.setVal(newVal);
-                    }
-                }
-                function getVal($input) {
-                    var typeahead, query;
-                    if (typeahead = $input.data(typeaheadKey)) {
-                        query = typeahead.getVal();
-                    }
-                    return query;
-                }
-            },
-            destroy: function destroy() {
-                return this.each(unattach);
-                function unattach() {
-                    var $input = $(this), typeahead;
-                    if (typeahead = $input.data(typeaheadKey)) {
-                        typeahead.destroy();
-                        $input.removeData(typeaheadKey);
-                    }
-                }
-            }
-        };
-        $.fn.typeahead = function(method) {
-            if (methods[method]) {
-                return methods[method].apply(this, [].slice.call(arguments, 1));
-            } else {
-                return methods.initialize.apply(this, arguments);
-            }
-        };
-        $.fn.typeahead.noConflict = function noConflict() {
-            $.fn.typeahead = old;
-            return this;
-        };
-    })();
-})(window.jQuery);
\ No newline at end of file
diff --git a/web/public/js/typeahead_0.11.1/typeahead.js b/web/public/js/typeahead_0.11.1/typeahead.js
new file mode 100644
index 000000000..22f00a95e
--- /dev/null
+++ b/web/public/js/typeahead_0.11.1/typeahead.js
@@ -0,0 +1,2446 @@
+/*!
+ * typeahead.js 0.11.1
+ * https://github.com/twitter/typeahead.js
+ * Copyright 2013-2015 Twitter, Inc. and other contributors; Licensed MIT
+ */
+
+(function(root, factory) {
+    if (typeof define === "function" && define.amd) {
+        define("bloodhound", [ "jquery" ], function(a0) {
+            return root["Bloodhound"] = factory(a0);
+        });
+    } else if (typeof exports === "object") {
+        module.exports = factory(require("jquery"));
+    } else {
+        root["Bloodhound"] = factory(jQuery);
+    }
+})(this, function($) {
+    var _ = function() {
+        "use strict";
+        return {
+            isMsie: function() {
+                return /(msie|trident)/i.test(navigator.userAgent) ? navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false;
+            },
+            isBlankString: function(str) {
+                return !str || /^\s*$/.test(str);
+            },
+            escapeRegExChars: function(str) {
+                return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            },
+            isString: function(obj) {
+                return typeof obj === "string";
+            },
+            isNumber: function(obj) {
+                return typeof obj === "number";
+            },
+            isArray: $.isArray,
+            isFunction: $.isFunction,
+            isObject: $.isPlainObject,
+            isUndefined: function(obj) {
+                return typeof obj === "undefined";
+            },
+            isElement: function(obj) {
+                return !!(obj && obj.nodeType === 1);
+            },
+            isJQuery: function(obj) {
+                return obj instanceof $;
+            },
+            toStr: function toStr(s) {
+                return _.isUndefined(s) || s === null ? "" : s + "";
+            },
+            bind: $.proxy,
+            each: function(collection, cb) {
+                $.each(collection, reverseArgs);
+                function reverseArgs(index, value) {
+                    return cb(value, index);
+                }
+            },
+            map: $.map,
+            filter: $.grep,
+            every: function(obj, test) {
+                var result = true;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (!(result = test.call(null, val, key, obj))) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            some: function(obj, test) {
+                var result = false;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (result = test.call(null, val, key, obj)) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            mixin: $.extend,
+            identity: function(x) {
+                return x;
+            },
+            clone: function(obj) {
+                return $.extend(true, {}, obj);
+            },
+            getIdGenerator: function() {
+                var counter = 0;
+                return function() {
+                    return counter++;
+                };
+            },
+            templatify: function templatify(obj) {
+                return $.isFunction(obj) ? obj : template;
+                function template() {
+                    return String(obj);
+                }
+            },
+            defer: function(fn) {
+                setTimeout(fn, 0);
+            },
+            debounce: function(func, wait, immediate) {
+                var timeout, result;
+                return function() {
+                    var context = this, args = arguments, later, callNow;
+                    later = function() {
+                        timeout = null;
+                        if (!immediate) {
+                            result = func.apply(context, args);
+                        }
+                    };
+                    callNow = immediate && !timeout;
+                    clearTimeout(timeout);
+                    timeout = setTimeout(later, wait);
+                    if (callNow) {
+                        result = func.apply(context, args);
+                    }
+                    return result;
+                };
+            },
+            throttle: function(func, wait) {
+                var context, args, timeout, result, previous, later;
+                previous = 0;
+                later = function() {
+                    previous = new Date();
+                    timeout = null;
+                    result = func.apply(context, args);
+                };
+                return function() {
+                    var now = new Date(), remaining = wait - (now - previous);
+                    context = this;
+                    args = arguments;
+                    if (remaining <= 0) {
+                        clearTimeout(timeout);
+                        timeout = null;
+                        previous = now;
+                        result = func.apply(context, args);
+                    } else if (!timeout) {
+                        timeout = setTimeout(later, remaining);
+                    }
+                    return result;
+                };
+            },
+            stringify: function(val) {
+                return _.isString(val) ? val : JSON.stringify(val);
+            },
+            noop: function() {}
+        };
+    }();
+    var VERSION = "0.11.1";
+    var tokenizers = function() {
+        "use strict";
+        return {
+            nonword: nonword,
+            whitespace: whitespace,
+            obj: {
+                nonword: getObjTokenizer(nonword),
+                whitespace: getObjTokenizer(whitespace)
+            }
+        };
+        function whitespace(str) {
+            str = _.toStr(str);
+            return str ? str.split(/\s+/) : [];
+        }
+        function nonword(str) {
+            str = _.toStr(str);
+            return str ? str.split(/\W+/) : [];
+        }
+        function getObjTokenizer(tokenizer) {
+            return function setKey(keys) {
+                keys = _.isArray(keys) ? keys : [].slice.call(arguments, 0);
+                return function tokenize(o) {
+                    var tokens = [];
+                    _.each(keys, function(k) {
+                        tokens = tokens.concat(tokenizer(_.toStr(o[k])));
+                    });
+                    return tokens;
+                };
+            };
+        }
+    }();
+    var LruCache = function() {
+        "use strict";
+        function LruCache(maxSize) {
+            this.maxSize = _.isNumber(maxSize) ? maxSize : 100;
+            this.reset();
+            if (this.maxSize <= 0) {
+                this.set = this.get = $.noop;
+            }
+        }
+        _.mixin(LruCache.prototype, {
+            set: function set(key, val) {
+                var tailItem = this.list.tail, node;
+                if (this.size >= this.maxSize) {
+                    this.list.remove(tailItem);
+                    delete this.hash[tailItem.key];
+                    this.size--;
+                }
+                if (node = this.hash[key]) {
+                    node.val = val;
+                    this.list.moveToFront(node);
+                } else {
+                    node = new Node(key, val);
+                    this.list.add(node);
+                    this.hash[key] = node;
+                    this.size++;
+                }
+            },
+            get: function get(key) {
+                var node = this.hash[key];
+                if (node) {
+                    this.list.moveToFront(node);
+                    return node.val;
+                }
+            },
+            reset: function reset() {
+                this.size = 0;
+                this.hash = {};
+                this.list = new List();
+            }
+        });
+        function List() {
+            this.head = this.tail = null;
+        }
+        _.mixin(List.prototype, {
+            add: function add(node) {
+                if (this.head) {
+                    node.next = this.head;
+                    this.head.prev = node;
+                }
+                this.head = node;
+                this.tail = this.tail || node;
+            },
+            remove: function remove(node) {
+                node.prev ? node.prev.next = node.next : this.head = node.next;
+                node.next ? node.next.prev = node.prev : this.tail = node.prev;
+            },
+            moveToFront: function(node) {
+                this.remove(node);
+                this.add(node);
+            }
+        });
+        function Node(key, val) {
+            this.key = key;
+            this.val = val;
+            this.prev = this.next = null;
+        }
+        return LruCache;
+    }();
+    var PersistentStorage = function() {
+        "use strict";
+        var LOCAL_STORAGE;
+        try {
+            LOCAL_STORAGE = window.localStorage;
+            LOCAL_STORAGE.setItem("~~~", "!");
+            LOCAL_STORAGE.removeItem("~~~");
+        } catch (err) {
+            LOCAL_STORAGE = null;
+        }
+        function PersistentStorage(namespace, override) {
+            this.prefix = [ "__", namespace, "__" ].join("");
+            this.ttlKey = "__ttl__";
+            this.keyMatcher = new RegExp("^" + _.escapeRegExChars(this.prefix));
+            this.ls = override || LOCAL_STORAGE;
+            !this.ls && this._noop();
+        }
+        _.mixin(PersistentStorage.prototype, {
+            _prefix: function(key) {
+                return this.prefix + key;
+            },
+            _ttlKey: function(key) {
+                return this._prefix(key) + this.ttlKey;
+            },
+            _noop: function() {
+                this.get = this.set = this.remove = this.clear = this.isExpired = _.noop;
+            },
+            _safeSet: function(key, val) {
+                try {
+                    this.ls.setItem(key, val);
+                } catch (err) {
+                    if (err.name === "QuotaExceededError") {
+                        this.clear();
+                        this._noop();
+                    }
+                }
+            },
+            get: function(key) {
+                if (this.isExpired(key)) {
+                    this.remove(key);
+                }
+                return decode(this.ls.getItem(this._prefix(key)));
+            },
+            set: function(key, val, ttl) {
+                if (_.isNumber(ttl)) {
+                    this._safeSet(this._ttlKey(key), encode(now() + ttl));
+                } else {
+                    this.ls.removeItem(this._ttlKey(key));
+                }
+                return this._safeSet(this._prefix(key), encode(val));
+            },
+            remove: function(key) {
+                this.ls.removeItem(this._ttlKey(key));
+                this.ls.removeItem(this._prefix(key));
+                return this;
+            },
+            clear: function() {
+                var i, keys = gatherMatchingKeys(this.keyMatcher);
+                for (i = keys.length; i--; ) {
+                    this.remove(keys[i]);
+                }
+                return this;
+            },
+            isExpired: function(key) {
+                var ttl = decode(this.ls.getItem(this._ttlKey(key)));
+                return _.isNumber(ttl) && now() > ttl ? true : false;
+            }
+        });
+        return PersistentStorage;
+        function now() {
+            return new Date().getTime();
+        }
+        function encode(val) {
+            return JSON.stringify(_.isUndefined(val) ? null : val);
+        }
+        function decode(val) {
+            return $.parseJSON(val);
+        }
+        function gatherMatchingKeys(keyMatcher) {
+            var i, key, keys = [], len = LOCAL_STORAGE.length;
+            for (i = 0; i < len; i++) {
+                if ((key = LOCAL_STORAGE.key(i)).match(keyMatcher)) {
+                    keys.push(key.replace(keyMatcher, ""));
+                }
+            }
+            return keys;
+        }
+    }();
+    var Transport = function() {
+        "use strict";
+        var pendingRequestsCount = 0, pendingRequests = {}, maxPendingRequests = 6, sharedCache = new LruCache(10);
+        function Transport(o) {
+            o = o || {};
+            this.cancelled = false;
+            this.lastReq = null;
+            this._send = o.transport;
+            this._get = o.limiter ? o.limiter(this._get) : this._get;
+            this._cache = o.cache === false ? new LruCache(0) : sharedCache;
+        }
+        Transport.setMaxPendingRequests = function setMaxPendingRequests(num) {
+            maxPendingRequests = num;
+        };
+        Transport.resetCache = function resetCache() {
+            sharedCache.reset();
+        };
+        _.mixin(Transport.prototype, {
+            _fingerprint: function fingerprint(o) {
+                o = o || {};
+                return o.url + o.type + $.param(o.data || {});
+            },
+            _get: function(o, cb) {
+                var that = this, fingerprint, jqXhr;
+                fingerprint = this._fingerprint(o);
+                if (this.cancelled || fingerprint !== this.lastReq) {
+                    return;
+                }
+                if (jqXhr = pendingRequests[fingerprint]) {
+                    jqXhr.done(done).fail(fail);
+                } else if (pendingRequestsCount < maxPendingRequests) {
+                    pendingRequestsCount++;
+                    pendingRequests[fingerprint] = this._send(o).done(done).fail(fail).always(always);
+                } else {
+                    this.onDeckRequestArgs = [].slice.call(arguments, 0);
+                }
+                function done(resp) {
+                    cb(null, resp);
+                    that._cache.set(fingerprint, resp);
+                }
+                function fail() {
+                    cb(true);
+                }
+                function always() {
+                    pendingRequestsCount--;
+                    delete pendingRequests[fingerprint];
+                    if (that.onDeckRequestArgs) {
+                        that._get.apply(that, that.onDeckRequestArgs);
+                        that.onDeckRequestArgs = null;
+                    }
+                }
+            },
+            get: function(o, cb) {
+                var resp, fingerprint;
+                cb = cb || $.noop;
+                o = _.isString(o) ? {
+                    url: o
+                } : o || {};
+                fingerprint = this._fingerprint(o);
+                this.cancelled = false;
+                this.lastReq = fingerprint;
+                if (resp = this._cache.get(fingerprint)) {
+                    cb(null, resp);
+                } else {
+                    this._get(o, cb);
+                }
+            },
+            cancel: function() {
+                this.cancelled = true;
+            }
+        });
+        return Transport;
+    }();
+    var SearchIndex = window.SearchIndex = function() {
+        "use strict";
+        var CHILDREN = "c", IDS = "i";
+        function SearchIndex(o) {
+            o = o || {};
+            if (!o.datumTokenizer || !o.queryTokenizer) {
+                $.error("datumTokenizer and queryTokenizer are both required");
+            }
+            this.identify = o.identify || _.stringify;
+            this.datumTokenizer = o.datumTokenizer;
+            this.queryTokenizer = o.queryTokenizer;
+            this.reset();
+        }
+        _.mixin(SearchIndex.prototype, {
+            bootstrap: function bootstrap(o) {
+                this.datums = o.datums;
+                this.trie = o.trie;
+            },
+            add: function(data) {
+                var that = this;
+                data = _.isArray(data) ? data : [ data ];
+                _.each(data, function(datum) {
+                    var id, tokens;
+                    that.datums[id = that.identify(datum)] = datum;
+                    tokens = normalizeTokens(that.datumTokenizer(datum));
+                    _.each(tokens, function(token) {
+                        var node, chars, ch;
+                        node = that.trie;
+                        chars = token.split("");
+                        while (ch = chars.shift()) {
+                            node = node[CHILDREN][ch] || (node[CHILDREN][ch] = newNode());
+                            node[IDS].push(id);
+                        }
+                    });
+                });
+            },
+            get: function get(ids) {
+                var that = this;
+                return _.map(ids, function(id) {
+                    return that.datums[id];
+                });
+            },
+            search: function search(query) {
+                var that = this, tokens, matches;
+                tokens = normalizeTokens(this.queryTokenizer(query));
+                _.each(tokens, function(token) {
+                    var node, chars, ch, ids;
+                    if (matches && matches.length === 0) {
+                        return false;
+                    }
+                    node = that.trie;
+                    chars = token.split("");
+                    while (node && (ch = chars.shift())) {
+                        node = node[CHILDREN][ch];
+                    }
+                    if (node && chars.length === 0) {
+                        ids = node[IDS].slice(0);
+                        matches = matches ? getIntersection(matches, ids) : ids;
+                    } else {
+                        matches = [];
+                        return false;
+                    }
+                });
+                return matches ? _.map(unique(matches), function(id) {
+                    return that.datums[id];
+                }) : [];
+            },
+            all: function all() {
+                var values = [];
+                for (var key in this.datums) {
+                    values.push(this.datums[key]);
+                }
+                return values;
+            },
+            reset: function reset() {
+                this.datums = {};
+                this.trie = newNode();
+            },
+            serialize: function serialize() {
+                return {
+                    datums: this.datums,
+                    trie: this.trie
+                };
+            }
+        });
+        return SearchIndex;
+        function normalizeTokens(tokens) {
+            tokens = _.filter(tokens, function(token) {
+                return !!token;
+            });
+            tokens = _.map(tokens, function(token) {
+                return token.toLowerCase();
+            });
+            return tokens;
+        }
+        function newNode() {
+            var node = {};
+            node[IDS] = [];
+            node[CHILDREN] = {};
+            return node;
+        }
+        function unique(array) {
+            var seen = {}, uniques = [];
+            for (var i = 0, len = array.length; i < len; i++) {
+                if (!seen[array[i]]) {
+                    seen[array[i]] = true;
+                    uniques.push(array[i]);
+                }
+            }
+            return uniques;
+        }
+        function getIntersection(arrayA, arrayB) {
+            var ai = 0, bi = 0, intersection = [];
+            arrayA = arrayA.sort();
+            arrayB = arrayB.sort();
+            var lenArrayA = arrayA.length, lenArrayB = arrayB.length;
+            while (ai < lenArrayA && bi < lenArrayB) {
+                if (arrayA[ai] < arrayB[bi]) {
+                    ai++;
+                } else if (arrayA[ai] > arrayB[bi]) {
+                    bi++;
+                } else {
+                    intersection.push(arrayA[ai]);
+                    ai++;
+                    bi++;
+                }
+            }
+            return intersection;
+        }
+    }();
+    var Prefetch = function() {
+        "use strict";
+        var keys;
+        keys = {
+            data: "data",
+            protocol: "protocol",
+            thumbprint: "thumbprint"
+        };
+        function Prefetch(o) {
+            this.url = o.url;
+            this.ttl = o.ttl;
+            this.cache = o.cache;
+            this.prepare = o.prepare;
+            this.transform = o.transform;
+            this.transport = o.transport;
+            this.thumbprint = o.thumbprint;
+            this.storage = new PersistentStorage(o.cacheKey);
+        }
+        _.mixin(Prefetch.prototype, {
+            _settings: function settings() {
+                return {
+                    url: this.url,
+                    type: "GET",
+                    dataType: "json"
+                };
+            },
+            store: function store(data) {
+                if (!this.cache) {
+                    return;
+                }
+                this.storage.set(keys.data, data, this.ttl);
+                this.storage.set(keys.protocol, location.protocol, this.ttl);
+                this.storage.set(keys.thumbprint, this.thumbprint, this.ttl);
+            },
+            fromCache: function fromCache() {
+                var stored = {}, isExpired;
+                if (!this.cache) {
+                    return null;
+                }
+                stored.data = this.storage.get(keys.data);
+                stored.protocol = this.storage.get(keys.protocol);
+                stored.thumbprint = this.storage.get(keys.thumbprint);
+                isExpired = stored.thumbprint !== this.thumbprint || stored.protocol !== location.protocol;
+                return stored.data && !isExpired ? stored.data : null;
+            },
+            fromNetwork: function(cb) {
+                var that = this, settings;
+                if (!cb) {
+                    return;
+                }
+                settings = this.prepare(this._settings());
+                this.transport(settings).fail(onError).done(onResponse);
+                function onError() {
+                    cb(true);
+                }
+                function onResponse(resp) {
+                    cb(null, that.transform(resp));
+                }
+            },
+            clear: function clear() {
+                this.storage.clear();
+                return this;
+            }
+        });
+        return Prefetch;
+    }();
+    var Remote = function() {
+        "use strict";
+        function Remote(o) {
+            this.url = o.url;
+            this.prepare = o.prepare;
+            this.transform = o.transform;
+            this.transport = new Transport({
+                cache: o.cache,
+                limiter: o.limiter,
+                transport: o.transport
+            });
+        }
+        _.mixin(Remote.prototype, {
+            _settings: function settings() {
+                return {
+                    url: this.url,
+                    type: "GET",
+                    dataType: "json"
+                };
+            },
+            get: function get(query, cb) {
+                var that = this, settings;
+                if (!cb) {
+                    return;
+                }
+                query = query || "";
+                settings = this.prepare(query, this._settings());
+                return this.transport.get(settings, onResponse);
+                function onResponse(err, resp) {
+                    err ? cb([]) : cb(that.transform(resp));
+                }
+            },
+            cancelLastRequest: function cancelLastRequest() {
+                this.transport.cancel();
+            }
+        });
+        return Remote;
+    }();
+    var oParser = function() {
+        "use strict";
+        return function parse(o) {
+            var defaults, sorter;
+            defaults = {
+                initialize: true,
+                identify: _.stringify,
+                datumTokenizer: null,
+                queryTokenizer: null,
+                sufficient: 5,
+                sorter: null,
+                local: [],
+                prefetch: null,
+                remote: null
+            };
+            o = _.mixin(defaults, o || {});
+            !o.datumTokenizer && $.error("datumTokenizer is required");
+            !o.queryTokenizer && $.error("queryTokenizer is required");
+            sorter = o.sorter;
+            o.sorter = sorter ? function(x) {
+                return x.sort(sorter);
+            } : _.identity;
+            o.local = _.isFunction(o.local) ? o.local() : o.local;
+            o.prefetch = parsePrefetch(o.prefetch);
+            o.remote = parseRemote(o.remote);
+            return o;
+        };
+        function parsePrefetch(o) {
+            var defaults;
+            if (!o) {
+                return null;
+            }
+            defaults = {
+                url: null,
+                ttl: 24 * 60 * 60 * 1e3,
+                cache: true,
+                cacheKey: null,
+                thumbprint: "",
+                prepare: _.identity,
+                transform: _.identity,
+                transport: null
+            };
+            o = _.isString(o) ? {
+                url: o
+            } : o;
+            o = _.mixin(defaults, o);
+            !o.url && $.error("prefetch requires url to be set");
+            o.transform = o.filter || o.transform;
+            o.cacheKey = o.cacheKey || o.url;
+            o.thumbprint = VERSION + o.thumbprint;
+            o.transport = o.transport ? callbackToDeferred(o.transport) : $.ajax;
+            return o;
+        }
+        function parseRemote(o) {
+            var defaults;
+            if (!o) {
+                return;
+            }
+            defaults = {
+                url: null,
+                cache: true,
+                prepare: null,
+                replace: null,
+                wildcard: null,
+                limiter: null,
+                rateLimitBy: "debounce",
+                rateLimitWait: 300,
+                transform: _.identity,
+                transport: null
+            };
+            o = _.isString(o) ? {
+                url: o
+            } : o;
+            o = _.mixin(defaults, o);
+            !o.url && $.error("remote requires url to be set");
+            o.transform = o.filter || o.transform;
+            o.prepare = toRemotePrepare(o);
+            o.limiter = toLimiter(o);
+            o.transport = o.transport ? callbackToDeferred(o.transport) : $.ajax;
+            delete o.replace;
+            delete o.wildcard;
+            delete o.rateLimitBy;
+            delete o.rateLimitWait;
+            return o;
+        }
+        function toRemotePrepare(o) {
+            var prepare, replace, wildcard;
+            prepare = o.prepare;
+            replace = o.replace;
+            wildcard = o.wildcard;
+            if (prepare) {
+                return prepare;
+            }
+            if (replace) {
+                prepare = prepareByReplace;
+            } else if (o.wildcard) {
+                prepare = prepareByWildcard;
+            } else {
+                prepare = idenityPrepare;
+            }
+            return prepare;
+            function prepareByReplace(query, settings) {
+                settings.url = replace(settings.url, query);
+                return settings;
+            }
+            function prepareByWildcard(query, settings) {
+                settings.url = settings.url.replace(wildcard, encodeURIComponent(query));
+                return settings;
+            }
+            function idenityPrepare(query, settings) {
+                return settings;
+            }
+        }
+        function toLimiter(o) {
+            var limiter, method, wait;
+            limiter = o.limiter;
+            method = o.rateLimitBy;
+            wait = o.rateLimitWait;
+            if (!limiter) {
+                limiter = /^throttle$/i.test(method) ? throttle(wait) : debounce(wait);
+            }
+            return limiter;
+            function debounce(wait) {
+                return function debounce(fn) {
+                    return _.debounce(fn, wait);
+                };
+            }
+            function throttle(wait) {
+                return function throttle(fn) {
+                    return _.throttle(fn, wait);
+                };
+            }
+        }
+        function callbackToDeferred(fn) {
+            return function wrapper(o) {
+                var deferred = $.Deferred();
+                fn(o, onSuccess, onError);
+                return deferred;
+                function onSuccess(resp) {
+                    _.defer(function() {
+                        deferred.resolve(resp);
+                    });
+                }
+                function onError(err) {
+                    _.defer(function() {
+                        deferred.reject(err);
+                    });
+                }
+            };
+        }
+    }();
+    var Bloodhound = function() {
+        "use strict";
+        var old;
+        old = window && window.Bloodhound;
+        function Bloodhound(o) {
+            o = oParser(o);
+            this.sorter = o.sorter;
+            this.identify = o.identify;
+            this.sufficient = o.sufficient;
+            this.local = o.local;
+            this.remote = o.remote ? new Remote(o.remote) : null;
+            this.prefetch = o.prefetch ? new Prefetch(o.prefetch) : null;
+            this.index = new SearchIndex({
+                identify: this.identify,
+                datumTokenizer: o.datumTokenizer,
+                queryTokenizer: o.queryTokenizer
+            });
+            o.initialize !== false && this.initialize();
+        }
+        Bloodhound.noConflict = function noConflict() {
+            window && (window.Bloodhound = old);
+            return Bloodhound;
+        };
+        Bloodhound.tokenizers = tokenizers;
+        _.mixin(Bloodhound.prototype, {
+            __ttAdapter: function ttAdapter() {
+                var that = this;
+                return this.remote ? withAsync : withoutAsync;
+                function withAsync(query, sync, async) {
+                    return that.search(query, sync, async);
+                }
+                function withoutAsync(query, sync) {
+                    return that.search(query, sync);
+                }
+            },
+            _loadPrefetch: function loadPrefetch() {
+                var that = this, deferred, serialized;
+                deferred = $.Deferred();
+                if (!this.prefetch) {
+                    deferred.resolve();
+                } else if (serialized = this.prefetch.fromCache()) {
+                    this.index.bootstrap(serialized);
+                    deferred.resolve();
+                } else {
+                    this.prefetch.fromNetwork(done);
+                }
+                return deferred.promise();
+                function done(err, data) {
+                    if (err) {
+                        return deferred.reject();
+                    }
+                    that.add(data);
+                    that.prefetch.store(that.index.serialize());
+                    deferred.resolve();
+                }
+            },
+            _initialize: function initialize() {
+                var that = this, deferred;
+                this.clear();
+                (this.initPromise = this._loadPrefetch()).done(addLocalToIndex);
+                return this.initPromise;
+                function addLocalToIndex() {
+                    that.add(that.local);
+                }
+            },
+            initialize: function initialize(force) {
+                return !this.initPromise || force ? this._initialize() : this.initPromise;
+            },
+            add: function add(data) {
+                this.index.add(data);
+                return this;
+            },
+            get: function get(ids) {
+                ids = _.isArray(ids) ? ids : [].slice.call(arguments);
+                return this.index.get(ids);
+            },
+            search: function search(query, sync, async) {
+                var that = this, local;
+                local = this.sorter(this.index.search(query));
+                sync(this.remote ? local.slice() : local);
+                if (this.remote && local.length < this.sufficient) {
+                    this.remote.get(query, processRemote);
+                } else if (this.remote) {
+                    this.remote.cancelLastRequest();
+                }
+                return this;
+                function processRemote(remote) {
+                    var nonDuplicates = [];
+                    _.each(remote, function(r) {
+                        !_.some(local, function(l) {
+                            return that.identify(r) === that.identify(l);
+                        }) && nonDuplicates.push(r);
+                    });
+                    async && async(nonDuplicates);
+                }
+            },
+            all: function all() {
+                return this.index.all();
+            },
+            clear: function clear() {
+                this.index.reset();
+                return this;
+            },
+            clearPrefetchCache: function clearPrefetchCache() {
+                this.prefetch && this.prefetch.clear();
+                return this;
+            },
+            clearRemoteCache: function clearRemoteCache() {
+                Transport.resetCache();
+                return this;
+            },
+            ttAdapter: function ttAdapter() {
+                return this.__ttAdapter();
+            }
+        });
+        return Bloodhound;
+    }();
+    return Bloodhound;
+});
+
+(function(root, factory) {
+    if (typeof define === "function" && define.amd) {
+        define("typeahead.js", [ "jquery" ], function(a0) {
+            return factory(a0);
+        });
+    } else if (typeof exports === "object") {
+        module.exports = factory(require("jquery"));
+    } else {
+        factory(jQuery);
+    }
+})(this, function($) {
+    var _ = function() {
+        "use strict";
+        return {
+            isMsie: function() {
+                return /(msie|trident)/i.test(navigator.userAgent) ? navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false;
+            },
+            isBlankString: function(str) {
+                return !str || /^\s*$/.test(str);
+            },
+            escapeRegExChars: function(str) {
+                return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            },
+            isString: function(obj) {
+                return typeof obj === "string";
+            },
+            isNumber: function(obj) {
+                return typeof obj === "number";
+            },
+            isArray: $.isArray,
+            isFunction: $.isFunction,
+            isObject: $.isPlainObject,
+            isUndefined: function(obj) {
+                return typeof obj === "undefined";
+            },
+            isElement: function(obj) {
+                return !!(obj && obj.nodeType === 1);
+            },
+            isJQuery: function(obj) {
+                return obj instanceof $;
+            },
+            toStr: function toStr(s) {
+                return _.isUndefined(s) || s === null ? "" : s + "";
+            },
+            bind: $.proxy,
+            each: function(collection, cb) {
+                $.each(collection, reverseArgs);
+                function reverseArgs(index, value) {
+                    return cb(value, index);
+                }
+            },
+            map: $.map,
+            filter: $.grep,
+            every: function(obj, test) {
+                var result = true;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (!(result = test.call(null, val, key, obj))) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            some: function(obj, test) {
+                var result = false;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (result = test.call(null, val, key, obj)) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            mixin: $.extend,
+            identity: function(x) {
+                return x;
+            },
+            clone: function(obj) {
+                return $.extend(true, {}, obj);
+            },
+            getIdGenerator: function() {
+                var counter = 0;
+                return function() {
+                    return counter++;
+                };
+            },
+            templatify: function templatify(obj) {
+                return $.isFunction(obj) ? obj : template;
+                function template() {
+                    return String(obj);
+                }
+            },
+            defer: function(fn) {
+                setTimeout(fn, 0);
+            },
+            debounce: function(func, wait, immediate) {
+                var timeout, result;
+                return function() {
+                    var context = this, args = arguments, later, callNow;
+                    later = function() {
+                        timeout = null;
+                        if (!immediate) {
+                            result = func.apply(context, args);
+                        }
+                    };
+                    callNow = immediate && !timeout;
+                    clearTimeout(timeout);
+                    timeout = setTimeout(later, wait);
+                    if (callNow) {
+                        result = func.apply(context, args);
+                    }
+                    return result;
+                };
+            },
+            throttle: function(func, wait) {
+                var context, args, timeout, result, previous, later;
+                previous = 0;
+                later = function() {
+                    previous = new Date();
+                    timeout = null;
+                    result = func.apply(context, args);
+                };
+                return function() {
+                    var now = new Date(), remaining = wait - (now - previous);
+                    context = this;
+                    args = arguments;
+                    if (remaining <= 0) {
+                        clearTimeout(timeout);
+                        timeout = null;
+                        previous = now;
+                        result = func.apply(context, args);
+                    } else if (!timeout) {
+                        timeout = setTimeout(later, remaining);
+                    }
+                    return result;
+                };
+            },
+            stringify: function(val) {
+                return _.isString(val) ? val : JSON.stringify(val);
+            },
+            noop: function() {}
+        };
+    }();
+    var WWW = function() {
+        "use strict";
+        var defaultClassNames = {
+            wrapper: "tt-wrapper",
+            input: "tt-input",
+            hint: "tt-hint",
+            menu: "tt-dropdown-menu",
+            dataset: "tt-dataset",
+            suggestion: "tt-suggestion",
+            selectable: "tt-selectable",
+            empty: "tt-empty",
+            open: "tt-open",
+            cursor: "tt-cursor",
+            highlight: "tt-highlight"
+        };
+        return build;
+        function build(o) {
+            var www, classes;
+            classes = _.mixin({}, defaultClassNames, o);
+            www = {
+                css: buildCss(),
+                classes: classes,
+                html: buildHtml(classes),
+                selectors: buildSelectors(classes)
+            };
+            return {
+                css: www.css,
+                html: www.html,
+                classes: www.classes,
+                selectors: www.selectors,
+                mixin: function(o) {
+                    _.mixin(o, www);
+                }
+            };
+        }
+        function buildHtml(c) {
+            return {
+                wrapper: '<div class="' + c.wrapper + '"></div>',
+                menu: '<span class="' + c.menu + '"></span>'
+            };
+        }
+        function buildSelectors(classes) {
+            var selectors = {};
+            _.each(classes, function(v, k) {
+                selectors[k] = "." + v;
+            });
+            return selectors;
+        }
+        function buildCss() {
+            var css = {
+                wrapper: {
+                },
+                hint: {
+                    position: "absolute",
+                    top: "0",
+                    left: "0",
+                    borderColor: "transparent",
+                    boxShadow: "none"
+                },
+                input: {
+                    position: "relative"
+                },
+                inputWithNoHint: {
+                    position: "relative",
+                    verticalAlign: "top"
+                },
+                menu: {
+                    position: "absolute",
+                    top: "100%",
+                    left: "0",
+                    zIndex: "100",
+                    display: "none"
+                },
+                ltr: {
+                    left: "0",
+                    right: "auto"
+                },
+                rtl: {
+                    left: "auto",
+                    right: " 0"
+                }
+            };
+            if (_.isMsie()) {
+                _.mixin(css.input, {
+                    backgroundImage: "url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"
+                });
+            }
+            return css;
+        }
+    }();
+    var EventBus = function() {
+        "use strict";
+        var namespace, deprecationMap;
+        namespace = "typeahead:";
+        deprecationMap = {
+            render: "rendered",
+            cursorchange: "cursorchanged",
+            select: "selected",
+            autocomplete: "autocompleted"
+        };
+        function EventBus(o) {
+            if (!o || !o.el) {
+                $.error("EventBus initialized without el");
+            }
+            this.$el = $(o.el);
+        }
+        _.mixin(EventBus.prototype, {
+            _trigger: function(type, args) {
+                var $e;
+                $e = $.Event(namespace + type);
+                (args = args || []).unshift($e);
+                this.$el.trigger.apply(this.$el, args);
+                return $e;
+            },
+            before: function(type) {
+                var args, $e;
+                args = [].slice.call(arguments, 1);
+                $e = this._trigger("before" + type, args);
+                return $e.isDefaultPrevented();
+            },
+            trigger: function(type) {
+                var deprecatedType;
+                this._trigger(type, [].slice.call(arguments, 1));
+                if (deprecatedType = deprecationMap[type]) {
+                    this._trigger(deprecatedType, [].slice.call(arguments, 1));
+                }
+            }
+        });
+        return EventBus;
+    }();
+    var EventEmitter = function() {
+        "use strict";
+        var splitter = /\s+/, nextTick = getNextTick();
+        return {
+            onSync: onSync,
+            onAsync: onAsync,
+            off: off,
+            trigger: trigger
+        };
+        function on(method, types, cb, context) {
+            var type;
+            if (!cb) {
+                return this;
+            }
+            types = types.split(splitter);
+            cb = context ? bindContext(cb, context) : cb;
+            this._callbacks = this._callbacks || {};
+            while (type = types.shift()) {
+                this._callbacks[type] = this._callbacks[type] || {
+                    sync: [],
+                    async: []
+                };
+                this._callbacks[type][method].push(cb);
+            }
+            return this;
+        }
+        function onAsync(types, cb, context) {
+            return on.call(this, "async", types, cb, context);
+        }
+        function onSync(types, cb, context) {
+            return on.call(this, "sync", types, cb, context);
+        }
+        function off(types) {
+            var type;
+            if (!this._callbacks) {
+                return this;
+            }
+            types = types.split(splitter);
+            while (type = types.shift()) {
+                delete this._callbacks[type];
+            }
+            return this;
+        }
+        function trigger(types) {
+            var type, callbacks, args, syncFlush, asyncFlush;
+            if (!this._callbacks) {
+                return this;
+            }
+            types = types.split(splitter);
+            args = [].slice.call(arguments, 1);
+            while ((type = types.shift()) && (callbacks = this._callbacks[type])) {
+                syncFlush = getFlush(callbacks.sync, this, [ type ].concat(args));
+                asyncFlush = getFlush(callbacks.async, this, [ type ].concat(args));
+                syncFlush() && nextTick(asyncFlush);
+            }
+            return this;
+        }
+        function getFlush(callbacks, context, args) {
+            return flush;
+            function flush() {
+                var cancelled;
+                for (var i = 0, len = callbacks.length; !cancelled && i < len; i += 1) {
+                    cancelled = callbacks[i].apply(context, args) === false;
+                }
+                return !cancelled;
+            }
+        }
+        function getNextTick() {
+            var nextTickFn;
+            if (window.setImmediate) {
+                nextTickFn = function nextTickSetImmediate(fn) {
+                    setImmediate(function() {
+                        fn();
+                    });
+                };
+            } else {
+                nextTickFn = function nextTickSetTimeout(fn) {
+                    setTimeout(function() {
+                        fn();
+                    }, 0);
+                };
+            }
+            return nextTickFn;
+        }
+        function bindContext(fn, context) {
+            return fn.bind ? fn.bind(context) : function() {
+                fn.apply(context, [].slice.call(arguments, 0));
+            };
+        }
+    }();
+    var highlight = function(doc) {
+        "use strict";
+        var defaults = {
+            node: null,
+            pattern: null,
+            tagName: "strong",
+            className: null,
+            wordsOnly: false,
+            caseSensitive: false
+        };
+        return function hightlight(o) {
+            var regex;
+            o = _.mixin({}, defaults, o);
+            if (!o.node || !o.pattern) {
+                return;
+            }
+            o.pattern = _.isArray(o.pattern) ? o.pattern : [ o.pattern ];
+            regex = getRegex(o.pattern, o.caseSensitive, o.wordsOnly);
+            traverse(o.node, hightlightTextNode);
+            function hightlightTextNode(textNode) {
+                var match, patternNode, wrapperNode;
+                if (match = regex.exec(textNode.data)) {
+                    wrapperNode = doc.createElement(o.tagName);
+                    o.className && (wrapperNode.className = o.className);
+                    patternNode = textNode.splitText(match.index);
+                    patternNode.splitText(match[0].length);
+                    wrapperNode.appendChild(patternNode.cloneNode(true));
+                    textNode.parentNode.replaceChild(wrapperNode, patternNode);
+                }
+                return !!match;
+            }
+            function traverse(el, hightlightTextNode) {
+                var childNode, TEXT_NODE_TYPE = 3;
+                for (var i = 0; i < el.childNodes.length; i++) {
+                    childNode = el.childNodes[i];
+                    if (childNode.nodeType === TEXT_NODE_TYPE) {
+                        i += hightlightTextNode(childNode) ? 1 : 0;
+                    } else {
+                        traverse(childNode, hightlightTextNode);
+                    }
+                }
+            }
+        };
+        function getRegex(patterns, caseSensitive, wordsOnly) {
+            var escapedPatterns = [], regexStr;
+            for (var i = 0, len = patterns.length; i < len; i++) {
+                escapedPatterns.push(_.escapeRegExChars(patterns[i]));
+            }
+            regexStr = wordsOnly ? "\\b(" + escapedPatterns.join("|") + ")\\b" : "(" + escapedPatterns.join("|") + ")";
+            return caseSensitive ? new RegExp(regexStr) : new RegExp(regexStr, "i");
+        }
+    }(window.document);
+    var Input = function() {
+        "use strict";
+        var specialKeyCodeMap;
+        specialKeyCodeMap = {
+            9: "tab",
+            27: "esc",
+            37: "left",
+            39: "right",
+            13: "enter",
+            38: "up",
+            40: "down"
+        };
+        function Input(o, www) {
+            o = o || {};
+            if (!o.input) {
+                $.error("input is missing");
+            }
+            www.mixin(this);
+            this.$hint = $(o.hint);
+            this.$input = $(o.input);
+            this.query = this.$input.val();
+            this.queryWhenFocused = this.hasFocus() ? this.query : null;
+            this.$overflowHelper = buildOverflowHelper(this.$input);
+            this._checkLanguageDirection();
+            if (this.$hint.length === 0) {
+                this.setHint = this.getHint = this.clearHint = this.clearHintIfInvalid = _.noop;
+            }
+        }
+        Input.normalizeQuery = function(str) {
+            return _.toStr(str).replace(/^\s*/g, "").replace(/\s{2,}/g, " ");
+        };
+        _.mixin(Input.prototype, EventEmitter, {
+            _onBlur: function onBlur() {
+                this.resetInputValue();
+                this.trigger("blurred");
+            },
+            _onFocus: function onFocus() {
+                this.queryWhenFocused = this.query;
+                this.trigger("focused");
+            },
+            _onKeydown: function onKeydown($e) {
+                var keyName = specialKeyCodeMap[$e.which || $e.keyCode];
+                this._managePreventDefault(keyName, $e);
+                if (keyName && this._shouldTrigger(keyName, $e)) {
+                    this.trigger(keyName + "Keyed", $e);
+                }
+            },
+            _onInput: function onInput() {
+                this._setQuery(this.getInputValue());
+                this.clearHintIfInvalid();
+                this._checkLanguageDirection();
+            },
+            _managePreventDefault: function managePreventDefault(keyName, $e) {
+                var preventDefault;
+                switch (keyName) {
+                    case "up":
+                    case "down":
+                        preventDefault = !withModifier($e);
+                        break;
+
+                    default:
+                        preventDefault = false;
+                }
+                preventDefault && $e.preventDefault();
+            },
+            _shouldTrigger: function shouldTrigger(keyName, $e) {
+                var trigger;
+                switch (keyName) {
+                    case "tab":
+                        trigger = !withModifier($e);
+                        break;
+
+                    default:
+                        trigger = true;
+                }
+                return trigger;
+            },
+            _checkLanguageDirection: function checkLanguageDirection() {
+                var dir = (this.$input.css("direction") || "ltr").toLowerCase();
+                if (this.dir !== dir) {
+                    this.dir = dir;
+                    this.$hint.attr("dir", dir);
+                    this.trigger("langDirChanged", dir);
+                }
+            },
+            _setQuery: function setQuery(val, silent) {
+                var areEquivalent, hasDifferentWhitespace;
+                areEquivalent = areQueriesEquivalent(val, this.query);
+                hasDifferentWhitespace = areEquivalent ? this.query.length !== val.length : false;
+                this.query = val;
+                if (!silent && !areEquivalent) {
+                    this.trigger("queryChanged", this.query);
+                } else if (!silent && hasDifferentWhitespace) {
+                    this.trigger("whitespaceChanged", this.query);
+                }
+            },
+            bind: function() {
+                var that = this, onBlur, onFocus, onKeydown, onInput;
+                onBlur = _.bind(this._onBlur, this);
+                onFocus = _.bind(this._onFocus, this);
+                onKeydown = _.bind(this._onKeydown, this);
+                onInput = _.bind(this._onInput, this);
+                this.$input.on("blur.tt", onBlur).on("focus.tt", onFocus).on("keydown.tt", onKeydown);
+                if (!_.isMsie() || _.isMsie() > 9) {
+                    this.$input.on("input.tt", onInput);
+                } else {
+                    this.$input.on("keydown.tt keypress.tt cut.tt paste.tt", function($e) {
+                        if (specialKeyCodeMap[$e.which || $e.keyCode]) {
+                            return;
+                        }
+                        _.defer(_.bind(that._onInput, that, $e));
+                    });
+                }
+                return this;
+            },
+            focus: function focus() {
+                this.$input.focus();
+            },
+            blur: function blur() {
+                this.$input.blur();
+            },
+            getLangDir: function getLangDir() {
+                return this.dir;
+            },
+            getQuery: function getQuery() {
+                return this.query || "";
+            },
+            setQuery: function setQuery(val, silent) {
+                this.setInputValue(val);
+                this._setQuery(val, silent);
+            },
+            hasQueryChangedSinceLastFocus: function hasQueryChangedSinceLastFocus() {
+                return this.query !== this.queryWhenFocused;
+            },
+            getInputValue: function getInputValue() {
+                return this.$input.val();
+            },
+            setInputValue: function setInputValue(value) {
+                this.$input.val(value);
+                this.clearHintIfInvalid();
+                this._checkLanguageDirection();
+            },
+            resetInputValue: function resetInputValue() {
+                this.setInputValue(this.query);
+            },
+            getHint: function getHint() {
+                return this.$hint.val();
+            },
+            setHint: function setHint(value) {
+                this.$hint.val(value);
+            },
+            clearHint: function clearHint() {
+                this.setHint("");
+            },
+            clearHintIfInvalid: function clearHintIfInvalid() {
+                var val, hint, valIsPrefixOfHint, isValid;
+                val = this.getInputValue();
+                hint = this.getHint();
+                valIsPrefixOfHint = val !== hint && hint.indexOf(val) === 0;
+                isValid = val !== "" && valIsPrefixOfHint && !this.hasOverflow();
+                !isValid && this.clearHint();
+            },
+            hasFocus: function hasFocus() {
+                return this.$input.is(":focus");
+            },
+            hasOverflow: function hasOverflow() {
+                var constraint = this.$input.width() - 2;
+                this.$overflowHelper.text(this.getInputValue());
+                return this.$overflowHelper.width() >= constraint;
+            },
+            isCursorAtEnd: function() {
+                var valueLength, selectionStart, range;
+                valueLength = this.$input.val().length;
+                selectionStart = this.$input[0].selectionStart;
+                if (_.isNumber(selectionStart)) {
+                    return selectionStart === valueLength;
+                } else if (document.selection) {
+                    range = document.selection.createRange();
+                    range.moveStart("character", -valueLength);
+                    return valueLength === range.text.length;
+                }
+                return true;
+            },
+            destroy: function destroy() {
+                this.$hint.off(".tt");
+                this.$input.off(".tt");
+                this.$overflowHelper.remove();
+                this.$hint = this.$input = this.$overflowHelper = $("<div>");
+            }
+        });
+        return Input;
+        function buildOverflowHelper($input) {
+            return $('<pre aria-hidden="true"></pre>').css({
+                position: "absolute",
+                visibility: "hidden",
+                whiteSpace: "pre",
+                fontFamily: $input.css("font-family"),
+                fontSize: $input.css("font-size"),
+                fontStyle: $input.css("font-style"),
+                fontVariant: $input.css("font-variant"),
+                fontWeight: $input.css("font-weight"),
+                wordSpacing: $input.css("word-spacing"),
+                letterSpacing: $input.css("letter-spacing"),
+                textIndent: $input.css("text-indent"),
+                textRendering: $input.css("text-rendering"),
+                textTransform: $input.css("text-transform")
+            }).insertAfter($input);
+        }
+        function areQueriesEquivalent(a, b) {
+            return Input.normalizeQuery(a) === Input.normalizeQuery(b);
+        }
+        function withModifier($e) {
+            return $e.altKey || $e.ctrlKey || $e.metaKey || $e.shiftKey;
+        }
+    }();
+    var Dataset = function() {
+        "use strict";
+        var keys, nameGenerator;
+        keys = {
+            val: "tt-selectable-display",
+            obj: "tt-selectable-object"
+        };
+        nameGenerator = _.getIdGenerator();
+        function Dataset(o, www) {
+            o = o || {};
+            o.templates = o.templates || {};
+            o.templates.notFound = o.templates.notFound || o.templates.empty;
+            if (!o.source) {
+                $.error("missing source");
+            }
+            if (!o.node) {
+                $.error("missing node");
+            }
+            if (o.name && !isValidName(o.name)) {
+                $.error("invalid dataset name: " + o.name);
+            }
+            www.mixin(this);
+            this.highlight = !!o.highlight;
+            this.name = o.name || nameGenerator();
+            this.limit = o.limit || 5;
+            this.displayFn = getDisplayFn(o.display || o.displayKey);
+            this.templates = getTemplates(o.templates, this.displayFn);
+            this.source = o.source.__ttAdapter ? o.source.__ttAdapter() : o.source;
+            this.async = _.isUndefined(o.async) ? this.source.length > 2 : !!o.async;
+            this._resetLastSuggestion();
+            this.$el = $(o.node).addClass(this.classes.dataset).addClass(this.classes.dataset + "-" + this.name);
+        }
+        Dataset.extractData = function extractData(el) {
+            var $el = $(el);
+            if ($el.data(keys.obj)) {
+                return {
+                    val: $el.data(keys.val) || "",
+                    obj: $el.data(keys.obj) || null
+                };
+            }
+            return null;
+        };
+        _.mixin(Dataset.prototype, EventEmitter, {
+            _overwrite: function overwrite(query, suggestions) {
+                suggestions = suggestions || [];
+                if (suggestions.length) {
+                    this._renderSuggestions(query, suggestions);
+                } else if (this.async && this.templates.pending) {
+                    this._renderPending(query);
+                } else if (!this.async && this.templates.notFound) {
+                    this._renderNotFound(query);
+                } else {
+                    this._empty();
+                }
+                this.trigger("rendered", this.name, suggestions, false);
+            },
+            _append: function append(query, suggestions) {
+                suggestions = suggestions || [];
+                if (suggestions.length && this.$lastSuggestion.length) {
+                    this._appendSuggestions(query, suggestions);
+                } else if (suggestions.length) {
+                    this._renderSuggestions(query, suggestions);
+                } else if (!this.$lastSuggestion.length && this.templates.notFound) {
+                    this._renderNotFound(query);
+                }
+                this.trigger("rendered", this.name, suggestions, true);
+            },
+            _renderSuggestions: function renderSuggestions(query, suggestions) {
+                var $fragment;
+                $fragment = this._getSuggestionsFragment(query, suggestions);
+                this.$lastSuggestion = $fragment.children().last();
+                this.$el.html($fragment).prepend(this._getHeader(query, suggestions)).append(this._getFooter(query, suggestions));
+            },
+            _appendSuggestions: function appendSuggestions(query, suggestions) {
+                var $fragment, $lastSuggestion;
+                $fragment = this._getSuggestionsFragment(query, suggestions);
+                $lastSuggestion = $fragment.children().last();
+                this.$lastSuggestion.after($fragment);
+                this.$lastSuggestion = $lastSuggestion;
+            },
+            _renderPending: function renderPending(query) {
+                var template = this.templates.pending;
+                this._resetLastSuggestion();
+                template && this.$el.html(template({
+                    query: query,
+                    dataset: this.name
+                }));
+            },
+            _renderNotFound: function renderNotFound(query) {
+                var template = this.templates.notFound;
+                this._resetLastSuggestion();
+                template && this.$el.html(template({
+                    query: query,
+                    dataset: this.name
+                }));
+            },
+            _empty: function empty() {
+                this.$el.empty();
+                this._resetLastSuggestion();
+            },
+            _getSuggestionsFragment: function getSuggestionsFragment(query, suggestions) {
+                var that = this, fragment;
+                fragment = document.createDocumentFragment();
+                _.each(suggestions, function getSuggestionNode(suggestion) {
+                    var $el, context;
+                    context = that._injectQuery(query, suggestion);
+                    $el = $(that.templates.suggestion(context)).data(keys.obj, suggestion).data(keys.val, that.displayFn(suggestion)).addClass(that.classes.suggestion + " " + that.classes.selectable);
+                    fragment.appendChild($el[0]);
+                });
+                this.highlight && highlight({
+                    className: this.classes.highlight,
+                    node: fragment,
+                    pattern: query
+                });
+                return $(fragment);
+            },
+            _getFooter: function getFooter(query, suggestions) {
+                return this.templates.footer ? this.templates.footer({
+                    query: query,
+                    suggestions: suggestions,
+                    dataset: this.name
+                }) : null;
+            },
+            _getHeader: function getHeader(query, suggestions) {
+                return this.templates.header ? this.templates.header({
+                    query: query,
+                    suggestions: suggestions,
+                    dataset: this.name
+                }) : null;
+            },
+            _resetLastSuggestion: function resetLastSuggestion() {
+                this.$lastSuggestion = $();
+            },
+            _injectQuery: function injectQuery(query, obj) {
+                return _.isObject(obj) ? _.mixin({
+                    _query: query
+                }, obj) : obj;
+            },
+            update: function update(query) {
+                var that = this, canceled = false, syncCalled = false, rendered = 0;
+                this.cancel();
+                this.cancel = function cancel() {
+                    canceled = true;
+                    that.cancel = $.noop;
+                    that.async && that.trigger("asyncCanceled", query);
+                };
+                this.source(query, sync, async);
+                !syncCalled && sync([]);
+                function sync(suggestions) {
+                    if (syncCalled) {
+                        return;
+                    }
+                    syncCalled = true;
+                    suggestions = (suggestions || []).slice(0, that.limit);
+                    rendered = suggestions.length;
+                    that._overwrite(query, suggestions);
+                    if (rendered < that.limit && that.async) {
+                        that.trigger("asyncRequested", query);
+                    }
+                }
+                function async(suggestions) {
+                    suggestions = suggestions || [];
+                    if (!canceled && rendered < that.limit) {
+                        that.cancel = $.noop;
+                        rendered += suggestions.length;
+                        that._append(query, suggestions.slice(0, that.limit - rendered));
+                        that.async && that.trigger("asyncReceived", query);
+                    }
+                }
+            },
+            cancel: $.noop,
+            clear: function clear() {
+                this._empty();
+                this.cancel();
+                this.trigger("cleared");
+            },
+            isEmpty: function isEmpty() {
+                return this.$el.is(":empty");
+            },
+            destroy: function destroy() {
+                this.$el = $("<div>");
+            }
+        });
+        return Dataset;
+        function getDisplayFn(display) {
+            display = display || _.stringify;
+            return _.isFunction(display) ? display : displayFn;
+            function displayFn(obj) {
+                return obj[display];
+            }
+        }
+        function getTemplates(templates, displayFn) {
+            return {
+                notFound: templates.notFound && _.templatify(templates.notFound),
+                pending: templates.pending && _.templatify(templates.pending),
+                header: templates.header && _.templatify(templates.header),
+                footer: templates.footer && _.templatify(templates.footer),
+                suggestion: templates.suggestion || suggestionTemplate
+            };
+            function suggestionTemplate(context) {
+                return $("<div>").text(displayFn(context));
+            }
+        }
+        function isValidName(str) {
+            return /^[_a-zA-Z0-9-]+$/.test(str);
+        }
+    }();
+    var Menu = function() {
+        "use strict";
+        function Menu(o, www) {
+            var that = this;
+            o = o || {};
+            if (!o.node) {
+                $.error("node is required");
+            }
+            www.mixin(this);
+            this.$node = $(o.node);
+            this.query = null;
+            this.datasets = _.map(o.datasets, initializeDataset);
+            function initializeDataset(oDataset) {
+                var node = that.$node.find(oDataset.node).first();
+                oDataset.node = node.length ? node : $("<div>").appendTo(that.$node);
+                return new Dataset(oDataset, www);
+            }
+        }
+        _.mixin(Menu.prototype, EventEmitter, {
+            _onSelectableClick: function onSelectableClick($e) {
+                this.trigger("selectableClicked", $($e.currentTarget));
+            },
+            _onRendered: function onRendered(type, dataset, suggestions, async) {
+                this.$node.toggleClass(this.classes.empty, this._allDatasetsEmpty());
+                this.trigger("datasetRendered", dataset, suggestions, async);
+            },
+            _onCleared: function onCleared() {
+                this.$node.toggleClass(this.classes.empty, this._allDatasetsEmpty());
+                this.trigger("datasetCleared");
+            },
+            _propagate: function propagate() {
+                this.trigger.apply(this, arguments);
+            },
+            _allDatasetsEmpty: function allDatasetsEmpty() {
+                return _.every(this.datasets, isDatasetEmpty);
+                function isDatasetEmpty(dataset) {
+                    return dataset.isEmpty();
+                }
+            },
+            _getSelectables: function getSelectables() {
+                return this.$node.find(this.selectors.selectable);
+            },
+            _removeCursor: function _removeCursor() {
+                var $selectable = this.getActiveSelectable();
+                $selectable && $selectable.removeClass(this.classes.cursor);
+            },
+            _ensureVisible: function ensureVisible($el) {
+                var elTop, elBottom, nodeScrollTop, nodeHeight;
+                elTop = $el.position().top;
+                elBottom = elTop + $el.outerHeight(true);
+                nodeScrollTop = this.$node.scrollTop();
+                nodeHeight = this.$node.height() + parseInt(this.$node.css("paddingTop"), 10) + parseInt(this.$node.css("paddingBottom"), 10);
+                if (elTop < 0) {
+                    this.$node.scrollTop(nodeScrollTop + elTop);
+                } else if (nodeHeight < elBottom) {
+                    this.$node.scrollTop(nodeScrollTop + (elBottom - nodeHeight));
+                }
+            },
+            bind: function() {
+                var that = this, onSelectableClick;
+                onSelectableClick = _.bind(this._onSelectableClick, this);
+                this.$node.on("click.tt", this.selectors.selectable, onSelectableClick);
+                _.each(this.datasets, function(dataset) {
+                    dataset.onSync("asyncRequested", that._propagate, that).onSync("asyncCanceled", that._propagate, that).onSync("asyncReceived", that._propagate, that).onSync("rendered", that._onRendered, that).onSync("cleared", that._onCleared, that);
+                });
+                return this;
+            },
+            isOpen: function isOpen() {
+                return this.$node.hasClass(this.classes.open);
+            },
+            open: function open() {
+                this.$node.addClass(this.classes.open);
+            },
+            close: function close() {
+                this.$node.removeClass(this.classes.open);
+                this._removeCursor();
+            },
+            setLanguageDirection: function setLanguageDirection(dir) {
+                this.$node.attr("dir", dir);
+            },
+            selectableRelativeToCursor: function selectableRelativeToCursor(delta) {
+                var $selectables, $oldCursor, oldIndex, newIndex;
+                $oldCursor = this.getActiveSelectable();
+                $selectables = this._getSelectables();
+                oldIndex = $oldCursor ? $selectables.index($oldCursor) : -1;
+                newIndex = oldIndex + delta;
+                newIndex = (newIndex + 1) % ($selectables.length + 1) - 1;
+                newIndex = newIndex < -1 ? $selectables.length - 1 : newIndex;
+                return newIndex === -1 ? null : $selectables.eq(newIndex);
+            },
+            setCursor: function setCursor($selectable) {
+                this._removeCursor();
+                if ($selectable = $selectable && $selectable.first()) {
+                    $selectable.addClass(this.classes.cursor);
+                    this._ensureVisible($selectable);
+                }
+            },
+            getSelectableData: function getSelectableData($el) {
+                return $el && $el.length ? Dataset.extractData($el) : null;
+            },
+            getActiveSelectable: function getActiveSelectable() {
+                var $selectable = this._getSelectables().filter(this.selectors.cursor).first();
+                return $selectable.length ? $selectable : null;
+            },
+            getTopSelectable: function getTopSelectable() {
+                var $selectable = this._getSelectables().first();
+                return $selectable.length ? $selectable : null;
+            },
+            update: function update(query) {
+                var isValidUpdate = query !== this.query;
+                if (isValidUpdate) {
+                    this.query = query;
+                    _.each(this.datasets, updateDataset);
+                }
+                return isValidUpdate;
+                function updateDataset(dataset) {
+                    dataset.update(query);
+                }
+            },
+            empty: function empty() {
+                _.each(this.datasets, clearDataset);
+                this.query = null;
+                this.$node.addClass(this.classes.empty);
+                function clearDataset(dataset) {
+                    dataset.clear();
+                }
+            },
+            destroy: function destroy() {
+                this.$node.off(".tt");
+                this.$node = $("<div>");
+                _.each(this.datasets, destroyDataset);
+                function destroyDataset(dataset) {
+                    dataset.destroy();
+                }
+            }
+        });
+        return Menu;
+    }();
+    var DefaultMenu = function() {
+        "use strict";
+        var s = Menu.prototype;
+        function DefaultMenu() {
+            Menu.apply(this, [].slice.call(arguments, 0));
+        }
+        _.mixin(DefaultMenu.prototype, Menu.prototype, {
+            open: function open() {
+                !this._allDatasetsEmpty() && this._show();
+                return s.open.apply(this, [].slice.call(arguments, 0));
+            },
+            close: function close() {
+                this._hide();
+                return s.close.apply(this, [].slice.call(arguments, 0));
+            },
+            _onRendered: function onRendered() {
+                if (this._allDatasetsEmpty()) {
+                    this._hide();
+                } else {
+                    this.isOpen() && this._show();
+                }
+                return s._onRendered.apply(this, [].slice.call(arguments, 0));
+            },
+            _onCleared: function onCleared() {
+                if (this._allDatasetsEmpty()) {
+                    this._hide();
+                } else {
+                    this.isOpen() && this._show();
+                }
+                return s._onCleared.apply(this, [].slice.call(arguments, 0));
+            },
+            setLanguageDirection: function setLanguageDirection(dir) {
+                this.$node.css(dir === "ltr" ? this.css.ltr : this.css.rtl);
+                return s.setLanguageDirection.apply(this, [].slice.call(arguments, 0));
+            },
+            _hide: function hide() {
+                this.$node.hide();
+            },
+            _show: function show() {
+                this.$node.css("display", "block");
+            }
+        });
+        return DefaultMenu;
+    }();
+    var Typeahead = function() {
+        "use strict";
+        function Typeahead(o, www) {
+            var onFocused, onBlurred, onEnterKeyed, onTabKeyed, onEscKeyed, onUpKeyed, onDownKeyed, onLeftKeyed, onRightKeyed, onQueryChanged, onWhitespaceChanged;
+            o = o || {};
+            if (!o.input) {
+                $.error("missing input");
+            }
+            if (!o.menu) {
+                $.error("missing menu");
+            }
+            if (!o.eventBus) {
+                $.error("missing event bus");
+            }
+            www.mixin(this);
+            this.eventBus = o.eventBus;
+            this.minLength = _.isNumber(o.minLength) ? o.minLength : 1;
+            this.input = o.input;
+            this.menu = o.menu;
+            this.enabled = true;
+            this.active = false;
+            this.input.hasFocus() && this.activate();
+            this.dir = this.input.getLangDir();
+            this._hacks();
+            this.menu.bind().onSync("selectableClicked", this._onSelectableClicked, this).onSync("asyncRequested", this._onAsyncRequested, this).onSync("asyncCanceled", this._onAsyncCanceled, this).onSync("asyncReceived", this._onAsyncReceived, this).onSync("datasetRendered", this._onDatasetRendered, this).onSync("datasetCleared", this._onDatasetCleared, this);
+            onFocused = c(this, "activate", "open", "_onFocused");
+            onBlurred = c(this, "deactivate", "_onBlurred");
+            onEnterKeyed = c(this, "isActive", "isOpen", "_onEnterKeyed");
+            onTabKeyed = c(this, "isActive", "isOpen", "_onTabKeyed");
+            onEscKeyed = c(this, "isActive", "_onEscKeyed");
+            onUpKeyed = c(this, "isActive", "open", "_onUpKeyed");
+            onDownKeyed = c(this, "isActive", "open", "_onDownKeyed");
+            onLeftKeyed = c(this, "isActive", "isOpen", "_onLeftKeyed");
+            onRightKeyed = c(this, "isActive", "isOpen", "_onRightKeyed");
+            onQueryChanged = c(this, "_openIfActive", "_onQueryChanged");
+            onWhitespaceChanged = c(this, "_openIfActive", "_onWhitespaceChanged");
+            this.input.bind().onSync("focused", onFocused, this).onSync("blurred", onBlurred, this).onSync("enterKeyed", onEnterKeyed, this).onSync("tabKeyed", onTabKeyed, this).onSync("escKeyed", onEscKeyed, this).onSync("upKeyed", onUpKeyed, this).onSync("downKeyed", onDownKeyed, this).onSync("leftKeyed", onLeftKeyed, this).onSync("rightKeyed", onRightKeyed, this).onSync("queryChanged", onQueryChanged, this).onSync("whitespaceChanged", onWhitespaceChanged, this).onSync("langDirChanged", this._onLangDirChanged, this);
+        }
+        _.mixin(Typeahead.prototype, {
+            _hacks: function hacks() {
+                var $input, $menu;
+                $input = this.input.$input || $("<div>");
+                $menu = this.menu.$node || $("<div>");
+                $input.on("blur.tt", function($e) {
+                    var active, isActive, hasActive;
+                    active = document.activeElement;
+                    isActive = $menu.is(active);
+                    hasActive = $menu.has(active).length > 0;
+                    if (_.isMsie() && (isActive || hasActive)) {
+                        $e.preventDefault();
+                        $e.stopImmediatePropagation();
+                        _.defer(function() {
+                            $input.focus();
+                        });
+                    }
+                });
+                $menu.on("mousedown.tt", function($e) {
+                    $e.preventDefault();
+                });
+            },
+            _onSelectableClicked: function onSelectableClicked(type, $el) {
+                this.select($el);
+            },
+            _onDatasetCleared: function onDatasetCleared() {
+                this._updateHint();
+            },
+            _onDatasetRendered: function onDatasetRendered(type, dataset, suggestions, async) {
+                this._updateHint();
+                this.eventBus.trigger("render", suggestions, async, dataset);
+            },
+            _onAsyncRequested: function onAsyncRequested(type, dataset, query) {
+                this.eventBus.trigger("asyncrequest", query, dataset);
+            },
+            _onAsyncCanceled: function onAsyncCanceled(type, dataset, query) {
+                this.eventBus.trigger("asynccancel", query, dataset);
+            },
+            _onAsyncReceived: function onAsyncReceived(type, dataset, query) {
+                this.eventBus.trigger("asyncreceive", query, dataset);
+            },
+            _onFocused: function onFocused() {
+                this._minLengthMet() && this.menu.update(this.input.getQuery());
+            },
+            _onBlurred: function onBlurred() {
+                if (this.input.hasQueryChangedSinceLastFocus()) {
+                    this.eventBus.trigger("change", this.input.getQuery());
+                }
+            },
+            _onEnterKeyed: function onEnterKeyed(type, $e) {
+                var $selectable;
+                if ($selectable = this.menu.getActiveSelectable()) {
+                    this.select($selectable) && $e.preventDefault();
+                }
+            },
+            _onTabKeyed: function onTabKeyed(type, $e) {
+                var $selectable;
+                if ($selectable = this.menu.getActiveSelectable()) {
+                    this.select($selectable) && $e.preventDefault();
+                } else if ($selectable = this.menu.getTopSelectable()) {
+                    this.autocomplete($selectable) && $e.preventDefault();
+                }
+            },
+            _onEscKeyed: function onEscKeyed() {
+                this.close();
+            },
+            _onUpKeyed: function onUpKeyed() {
+                this.moveCursor(-1);
+            },
+            _onDownKeyed: function onDownKeyed() {
+                this.moveCursor(+1);
+            },
+            _onLeftKeyed: function onLeftKeyed() {
+                if (this.dir === "rtl" && this.input.isCursorAtEnd()) {
+                    this.autocomplete(this.menu.getTopSelectable());
+                }
+            },
+            _onRightKeyed: function onRightKeyed() {
+                if (this.dir === "ltr" && this.input.isCursorAtEnd()) {
+                    this.autocomplete(this.menu.getTopSelectable());
+                }
+            },
+            _onQueryChanged: function onQueryChanged(e, query) {
+                this._minLengthMet(query) ? this.menu.update(query) : this.menu.empty();
+            },
+            _onWhitespaceChanged: function onWhitespaceChanged() {
+                this._updateHint();
+            },
+            _onLangDirChanged: function onLangDirChanged(e, dir) {
+                if (this.dir !== dir) {
+                    this.dir = dir;
+                    this.menu.setLanguageDirection(dir);
+                }
+            },
+            _openIfActive: function openIfActive() {
+                this.isActive() && this.open();
+            },
+            _minLengthMet: function minLengthMet(query) {
+                query = _.isString(query) ? query : this.input.getQuery() || "";
+                return query.length >= this.minLength;
+            },
+            _updateHint: function updateHint() {
+                var $selectable, data, val, query, escapedQuery, frontMatchRegEx, match;
+                $selectable = this.menu.getTopSelectable();
+                data = this.menu.getSelectableData($selectable);
+                val = this.input.getInputValue();
+                if (data && !_.isBlankString(val) && !this.input.hasOverflow()) {
+                    query = Input.normalizeQuery(val);
+                    escapedQuery = _.escapeRegExChars(query);
+                    frontMatchRegEx = new RegExp("^(?:" + escapedQuery + ")(.+$)", "i");
+                    match = frontMatchRegEx.exec(data.val);
+                    match && this.input.setHint(val + match[1]);
+                } else {
+                    this.input.clearHint();
+                }
+            },
+            isEnabled: function isEnabled() {
+                return this.enabled;
+            },
+            enable: function enable() {
+                this.enabled = true;
+            },
+            disable: function disable() {
+                this.enabled = false;
+            },
+            isActive: function isActive() {
+                return this.active;
+            },
+            activate: function activate() {
+                if (this.isActive()) {
+                    return true;
+                } else if (!this.isEnabled() || this.eventBus.before("active")) {
+                    return false;
+                } else {
+                    this.active = true;
+                    this.eventBus.trigger("active");
+                    return true;
+                }
+            },
+            deactivate: function deactivate() {
+                if (!this.isActive()) {
+                    return true;
+                } else if (this.eventBus.before("idle")) {
+                    return false;
+                } else {
+                    this.active = false;
+                    this.close();
+                    this.eventBus.trigger("idle");
+                    return true;
+                }
+            },
+            isOpen: function isOpen() {
+                return this.menu.isOpen();
+            },
+            open: function open() {
+                if (!this.isOpen() && !this.eventBus.before("open")) {
+                    this.menu.open();
+                    this._updateHint();
+                    this.eventBus.trigger("open");
+                }
+                return this.isOpen();
+            },
+            close: function close() {
+                if (this.isOpen() && !this.eventBus.before("close")) {
+                    this.menu.close();
+                    this.input.clearHint();
+                    this.input.resetInputValue();
+                    this.eventBus.trigger("close");
+                }
+                return !this.isOpen();
+            },
+            setVal: function setVal(val) {
+                this.input.setQuery(_.toStr(val));
+            },
+            getVal: function getVal() {
+                return this.input.getQuery();
+            },
+            select: function select($selectable) {
+                var data = this.menu.getSelectableData($selectable);
+                if (data && !this.eventBus.before("select", data.obj)) {
+                    this.input.setQuery(data.val, true);
+                    this.eventBus.trigger("select", data.obj);
+                    this.close();
+                    return true;
+                }
+                return false;
+            },
+            autocomplete: function autocomplete($selectable) {
+                var query, data, isValid;
+                query = this.input.getQuery();
+                data = this.menu.getSelectableData($selectable);
+                isValid = data && query !== data.val;
+                if (isValid && !this.eventBus.before("autocomplete", data.obj)) {
+                    this.input.setQuery(data.val);
+                    this.eventBus.trigger("autocomplete", data.obj);
+                    return true;
+                }
+                return false;
+            },
+            moveCursor: function moveCursor(delta) {
+                var query, $candidate, data, payload, cancelMove;
+                query = this.input.getQuery();
+                $candidate = this.menu.selectableRelativeToCursor(delta);
+                data = this.menu.getSelectableData($candidate);
+                payload = data ? data.obj : null;
+                cancelMove = this._minLengthMet() && this.menu.update(query);
+                if (!cancelMove && !this.eventBus.before("cursorchange", payload)) {
+                    this.menu.setCursor($candidate);
+                    if (data) {
+                        this.input.setInputValue(data.val);
+                    } else {
+                        this.input.resetInputValue();
+                        this._updateHint();
+                    }
+                    this.eventBus.trigger("cursorchange", payload);
+                    return true;
+                }
+                return false;
+            },
+            destroy: function destroy() {
+                this.input.destroy();
+                this.menu.destroy();
+            }
+        });
+        return Typeahead;
+        function c(ctx) {
+            var methods = [].slice.call(arguments, 1);
+            return function() {
+                var args = [].slice.call(arguments);
+                _.each(methods, function(method) {
+                    return ctx[method].apply(ctx, args);
+                });
+            };
+        }
+    }();
+    (function() {
+        "use strict";
+        var old, keys, methods;
+        old = $.fn.typeahead;
+        keys = {
+            www: "tt-www",
+            attrs: "tt-attrs",
+            typeahead: "tt-typeahead"
+        };
+        methods = {
+            initialize: function initialize(o, datasets) {
+                var www;
+                datasets = _.isArray(datasets) ? datasets : [].slice.call(arguments, 1);
+                o = o || {};
+                www = WWW(o.classNames);
+                return this.each(attach);
+                function attach() {
+                    var $input, $wrapper, $hint, $menu, defaultHint, defaultMenu, eventBus, input, menu, typeahead, MenuConstructor;
+                    _.each(datasets, function(d) {
+                        d.highlight = !!o.highlight;
+                    });
+                    $input = $(this);
+                    $wrapper = $(www.html.wrapper);
+                    $hint = $elOrNull(o.hint);
+                    $menu = $elOrNull(o.menu);
+                    defaultHint = o.hint !== false && !$hint;
+                    defaultMenu = o.menu !== false && !$menu;
+                    defaultHint && ($hint = buildHintFromInput($input, www));
+                    defaultMenu && ($menu = $(www.html.menu).css(www.css.menu));
+                    $hint && $hint.val("");
+                    $input = prepInput($input, www);
+                    if (defaultHint || defaultMenu) {
+                        $wrapper.css(www.css.wrapper);
+                        $input.css(defaultHint ? www.css.input : www.css.inputWithNoHint);
+                        $input.wrap($wrapper).parent().prepend(defaultHint ? $hint : null).append(defaultMenu ? $menu : null);
+                    }
+                    MenuConstructor = defaultMenu ? DefaultMenu : Menu;
+                    eventBus = new EventBus({
+                        el: $input
+                    });
+                    input = new Input({
+                        hint: $hint,
+                        input: $input
+                    }, www);
+                    menu = new MenuConstructor({
+                        node: $menu,
+                        datasets: datasets
+                    }, www);
+                    typeahead = new Typeahead({
+                        input: input,
+                        menu: menu,
+                        eventBus: eventBus,
+                        minLength: o.minLength
+                    }, www);
+                    $input.data(keys.www, www);
+                    $input.data(keys.typeahead, typeahead);
+                }
+            },
+            isEnabled: function isEnabled() {
+                var enabled;
+                ttEach(this.first(), function(t) {
+                    enabled = t.isEnabled();
+                });
+                return enabled;
+            },
+            enable: function enable() {
+                ttEach(this, function(t) {
+                    t.enable();
+                });
+                return this;
+            },
+            disable: function disable() {
+                ttEach(this, function(t) {
+                    t.disable();
+                });
+                return this;
+            },
+            isActive: function isActive() {
+                var active;
+                ttEach(this.first(), function(t) {
+                    active = t.isActive();
+                });
+                return active;
+            },
+            activate: function activate() {
+                ttEach(this, function(t) {
+                    t.activate();
+                });
+                return this;
+            },
+            deactivate: function deactivate() {
+                ttEach(this, function(t) {
+                    t.deactivate();
+                });
+                return this;
+            },
+            isOpen: function isOpen() {
+                var open;
+                ttEach(this.first(), function(t) {
+                    open = t.isOpen();
+                });
+                return open;
+            },
+            open: function open() {
+                ttEach(this, function(t) {
+                    t.open();
+                });
+                return this;
+            },
+            close: function close() {
+                ttEach(this, function(t) {
+                    t.close();
+                });
+                return this;
+            },
+            select: function select(el) {
+                var success = false, $el = $(el);
+                ttEach(this.first(), function(t) {
+                    success = t.select($el);
+                });
+                return success;
+            },
+            autocomplete: function autocomplete(el) {
+                var success = false, $el = $(el);
+                ttEach(this.first(), function(t) {
+                    success = t.autocomplete($el);
+                });
+                return success;
+            },
+            moveCursor: function moveCursoe(delta) {
+                var success = false;
+                ttEach(this.first(), function(t) {
+                    success = t.moveCursor(delta);
+                });
+                return success;
+            },
+            val: function val(newVal) {
+                var query;
+                if (!arguments.length) {
+                    ttEach(this.first(), function(t) {
+                        query = t.getVal();
+                    });
+                    return query;
+                } else {
+                    ttEach(this, function(t) {
+                        t.setVal(newVal);
+                    });
+                    return this;
+                }
+            },
+            destroy: function destroy() {
+                ttEach(this, function(typeahead, $input) {
+                    revert($input);
+                    typeahead.destroy();
+                });
+                return this;
+            }
+        };
+        $.fn.typeahead = function(method) {
+            if (methods[method]) {
+                return methods[method].apply(this, [].slice.call(arguments, 1));
+            } else {
+                return methods.initialize.apply(this, arguments);
+            }
+        };
+        $.fn.typeahead.noConflict = function noConflict() {
+            $.fn.typeahead = old;
+            return this;
+        };
+        function ttEach($els, fn) {
+            $els.each(function() {
+                var $input = $(this), typeahead;
+                (typeahead = $input.data(keys.typeahead)) && fn(typeahead, $input);
+            });
+        }
+        function buildHintFromInput($input, www) {
+            return $input.clone().addClass(www.classes.hint).removeData().css(www.css.hint).css(getBackgroundStyles($input)).prop("readonly", true).removeAttr("id name placeholder required").attr({
+                autocomplete: "off",
+                spellcheck: "false",
+                tabindex: -1
+            });
+        }
+        function prepInput($input, www) {
+            $input.data(keys.attrs, {
+                dir: $input.attr("dir"),
+                autocomplete: $input.attr("autocomplete"),
+                spellcheck: $input.attr("spellcheck"),
+                style: $input.attr("style")
+            });
+            $input.addClass(www.classes.input).attr({
+                autocomplete: "off",
+                spellcheck: false
+            });
+            try {
+                !$input.attr("dir") && $input.attr("dir", "auto");
+            } catch (e) {}
+            return $input;
+        }
+        function getBackgroundStyles($el) {
+            return {
+                backgroundAttachment: $el.css("background-attachment"),
+                backgroundClip: $el.css("background-clip"),
+                backgroundColor: $el.css("background-color"),
+                backgroundImage: $el.css("background-image"),
+                backgroundOrigin: $el.css("background-origin"),
+                backgroundPosition: $el.css("background-position"),
+                backgroundRepeat: $el.css("background-repeat"),
+                backgroundSize: $el.css("background-size")
+            };
+        }
+        function revert($input) {
+            var www, $wrapper;
+            www = $input.data(keys.www);
+            $wrapper = $input.parent().filter(www.selectors.wrapper);
+            _.each($input.data(keys.attrs), function(val, key) {
+                _.isUndefined(val) ? $input.removeAttr(key) : $input.attr(key, val);
+            });
+            $input.removeData(keys.typeahead).removeData(keys.www).removeData(keys.attr).removeClass(www.classes.input);
+            if ($wrapper.length) {
+                $input.detach().insertAfter($wrapper);
+                $wrapper.remove();
+            }
+        }
+        function $elOrNull(obj) {
+            var isValid, $el;
+            isValid = _.isJQuery(obj) || _.isElement(obj);
+            $el = isValid ? $(obj).first() : [];
+            return $el.length ? $el : null;
+        }
+    })();
+});
\ No newline at end of file
diff --git a/web/public/less/dashboard/style.less b/web/public/less/dashboard/style.less
index 0de4f5991..a1e6eae2f 100755
--- a/web/public/less/dashboard/style.less
+++ b/web/public/less/dashboard/style.less
@@ -55,9 +55,6 @@
 @import "../bootstrap_3.1.1/utilities.less";
 @import "../bootstrap_3.1.1/responsive-utilities.less";
 
-// Typeahead
-@import "../typeahead_0.10.2/typeahead.less";
-
 // Fontawesome
 @import "../font-awesome-4.7.0/variables.less";
 @import "../font-awesome-4.7.0/mixins.less";
diff --git a/web/public/less/typeahead_0.10.2/typeahead.less b/web/public/less/typeahead_0.10.2/typeahead.less
deleted file mode 100755
index 6764d6585..000000000
--- a/web/public/less/typeahead_0.10.2/typeahead.less
+++ /dev/null
@@ -1,49 +0,0 @@
-.tt-wrapper {
-    position: relative;
-    
-    .tt-dropdown-menu {
-        position: absolute;
-        top: 100%;
-        left: 0;
-        z-index: @zindex-dropdown;
-        display: none; // none by default, but block on "open" of the menu
-        float: left;
-        min-width: 160px;
-        padding: 5px 0;
-        margin: 2px 0 0; // override default ul
-        list-style: none;
-        font-size: @font-size-base;
-        text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
-        background-color: @dropdown-bg;
-        border: 1px solid @dropdown-fallback-border; // IE8 fallback
-        border: 1px solid @dropdown-border;
-        border-radius: @border-radius-base;
-        .box-shadow(0 6px 12px rgba(0,0,0,.175));
-        background-clip: padding-box;
-        width: 100%;
-
-        max-height: 150px;
-        overflow-y: auto;
-
-        .tt-suggestions {
-            display: block;
-
-            .tt-suggestion {
-                display: block;
-                padding: 3px 20px;
-                clear: both;
-                font-weight: normal;
-                line-height: @line-height-base;
-                color: @dropdown-link-color;
-                white-space: nowrap; // prevent links from randomly breaking onto new lines
-                cursor: pointer;
-
-                &.tt-cursor {
-                    text-decoration: none;
-                    color: @dropdown-link-hover-color;
-                    background-color: @dropdown-link-hover-bg;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
-- 
GitLab


From 1ffd8dd6dab15ebddcf539b68de6ceb3454c0fe2 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Thu, 1 Mar 2018 17:36:22 +0100
Subject: [PATCH 08/25] Fix : deleting screens log scheduling

---
 .../logScheduling/modalEvent.html             |  39 ++
 .../batchProcessing/logScheduling/result.html |  48 +++
 .../batchProcessing/logScheduling/search.html | 349 ++++++++++++++++++
 3 files changed, 436 insertions(+)
 create mode 100644 src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html
 create mode 100644 src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/result.html
 create mode 100644 src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/search.html

diff --git a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html
new file mode 100644
index 000000000..5ebb7f3e0
--- /dev/null
+++ b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html
@@ -0,0 +1,39 @@
+
+<div class="container-fluid" data-translate-catalog="batchProcessing/messages">
+    <div class="row">
+        <div class="col-xs-12">
+            <h1 class="page-header">
+                Log scheduling
+            </h1>
+        </div>
+    </div>
+</div>
+<div class="container-fluid" data-translate-catalog="batchProcessing/messages">
+    <div class="row">
+            <div class="panel">
+                <div class="row">
+                    <dl class="dl dl-horizontal">
+                        <dt><strong>Date</strong></dt> <dd ><?merge logScheduling.logDate ?></dd>
+                        <dt><strong>Name</strong></dt> <dd><?merge logScheduling.name ?></dd>
+                        <dt><strong>Executed by</strong></dt> <dd><?merge logScheduling.executedBy ?></dd>
+                        <dt><strong>Launched by</strong></dt> <dd><?merge logScheduling.launchedBy ?></dd>
+
+                    <dt><strong>Status</strong></dt>
+                    <dd>
+                        <?merge logScheduling.status.ifeq(1) ?><strong class="text-success fa fa-check" disabled="">&nbsp;</strong>
+                        <?merge logScheduling.status.ifne(1) ?><strong class="text-danger fa fa-times" disabled="">&nbsp;</strong>
+                    </dd>
+                    </dl>
+                    <div class="col-xs-12">
+                    <b>Info</b>
+                        <div class="panel well" id="audit_info">
+                            <?merge logScheduling.info ?>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal" title="Close">Close</button>
+        </div>
+    </div>
+</div>
diff --git a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/result.html b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/result.html
new file mode 100644
index 000000000..8a01b1709
--- /dev/null
+++ b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/result.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<div class="row" data-translate-catalog="batchProcessing/messages">
+    <div class="col-xs-12">
+        <div class="panel panel-primary">
+            <div  id="logSchedulingList" class="panel-body" style="padding: 0;">
+                <table id="list" class="table dataTable">
+                    <thead>
+                        <tr>
+                            <th class="date">Date</th>
+                            <th class="status">Status</th>
+                            <th></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?merge logSchedulings ?>
+                        <tr>
+                            <td class="date"><?merge .logDate ?></td>
+                            <td class="status">
+                                <?merge .status.ifeq(1) ?><strong class="text-success fa fa-check" disabled=""></strong>
+                                <?merge .status.ifeq("") ?><strong class="text-danger fa fa-times" disabled="">&nbsp;</strong>
+                            </td>
+                            <td>
+                                <button type="button" class="btn btn-warning btn-small pull-right fa fa-eye viewEvent"  title="View" data-logid="[?merge .logId ?]">
+                                </button>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal" title="Close">Close</button>
+    </div>
+</div>
+
+<script>
+    $('#logSchedulingList').on('click', '.viewEvent', function(e) {
+        ajax($(this), {
+            type        : 'GET',
+            url         : '/batchProcessing/logScheduling/'+$(this).data('logid'),
+            contentType : 'application/json',
+            success     : function (response) {
+                $('#logSchedulingModal').modal().find('.modal-body').html(response);
+            }
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/search.html b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/search.html
new file mode 100644
index 000000000..ad9f3c50a
--- /dev/null
+++ b/src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/search.html
@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<!--
+Copyright (C) 2015 Alexis Ragot <alexis.ragot@maarch.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<div id="contain" >
+    <div class="container-fluid" data-translate-catalog="batchProcessing/messages">
+        <div class="page-header">
+            <h1>
+                <i class="fa fa-history"></i>
+                Search logs scheduling
+            </h1>
+        </div>
+    </div>
+    <br/>
+    <div class="container-fluid" data-translate-catalog="batchProcessing/messages">
+        <div class="col-md-12">
+            <form id="searchForm" class="form-horizontal">
+                <div class="col-md-12">
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <div class="btn-group col-md-12" data-toggle="buttons" >
+                                <label class="btn btn-info active typeSearch" title="Name">
+                                    <input type="checkbox" id="typeName" name="typeSearch" value="name" checked>Name
+                                </label>
+                                <label class="btn btn-default typeSearch" title="Task">
+                                    <input type="checkbox" id="typeTask" name="typeSearch" value="task">Task
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-8">
+                        <div class="form-group">
+                            <div class="input-group input-group-lg">
+                                <select class="form-control selectName" name="name" id="name" >
+                                        <option value="">Select a scheduling name</option>
+                                        <?merge schedulings ?>
+                                        <option value="[?merge .name ?]"><?merge .name ?></option>
+                                </select>
+                                <select class="form-control selectTask" name="task" id="task" style="display: none;">
+                                        <option value="">Select a task</option>
+                                        <?merge tasks ?>
+                                        <option value="[?merge .description ?]"><?merge .description ?></option>
+                                </select>
+                                <div class="input-group-btn">
+                                    <button type="button" class="btn btn-info" id="search" title="Search"><span class="fa fa-search">&nbsp;</span></button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-group pull-right">
+                            <div class="col-sm-8">
+                                    <button type="button" id="more" class="btn btn-success plus" ><i class="fa fa-plus fa-fw"></i></button>
+                                    <button type="button" id="less" class="btn btn-danger minus" style="display: none;"><i class="fa fa-minus fa-fw"></i></button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="option" style="display: none;">
+                    <div class="col-md-6">
+                        <br/>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label" for="fromDate">Start date</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control datePicker" name="fromDate" id="fromDate" placeholder="Start date"/>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label" for="executedBy">Executed by</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control" name="executedBy" id="executedByTypehead" data-attributeid="" placeholder="Executed by"/>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label" for="status">Status</label>
+                            <div class="btn-group col-sm-7" data-toggle="buttons" >
+                                <label class="btn btn-info active status" title="all">
+                                    <input type="checkbox" id="all" name="status" value="" checked>All
+                                </label>
+                                <label class="btn btn-default status" title="noErrors">
+                                    <input type="checkbox" id="true" name="status" value="1">Success
+                                </label>
+                                <label class="btn btn-default status" title="errors">
+                                    <input type="checkbox" id="false" name="status" value="0">Errors
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <br/>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label" for="toDate">End date</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control datePicker" name="toDate" id="toDate" placeholder="End date"/>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label" for="launchedBy">Launched by</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control" name="launchedBy" id="launchedByTypehead" data-attributeid="" placeholder="Launched by"/>
+                            </div>
+                        </div> 
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+    <hr>
+    <br>
+    <div class="container-fluid" id="logList"></div>
+    <div class="modal fade" id="modalEvent" data-backdrop="static" data-keyboard="false" tabindex="999"  data-focus-on="input:first" role="dialog" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content" id="modalEvent_content">
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    status = "";
+    $('#contain').keypress(function(e){
+        if (e.which != 13) {
+             return;
+        }
+        // Prevent form submit
+        e.preventDefault();
+        $("#search").click();
+    });
+    
+        
+    $('#search').on('click', function(){
+        $.ajax({
+            type        : 'GET',
+            url         : '/Batchprocessing/Logs',
+            data        : serializeLog(),
+            dataType    : 'html',
+            async       : true,
+            success     : function(response) {
+                $('#logList').html('');
+                $('#logList').append(response);
+            }
+        });
+    }); 
+    
+    $("#contain").on('click', '.viewEvent', function () {
+
+            var logId = $(this).data('logid');
+            ajax($(this), {
+                type: 'GET',
+                url: '/Batchprocessing/Log/' + logId,
+                dataType: 'html',
+                contentType: 'application/json',
+                async: true,
+                success: function (response) {
+                    $('#modalEvent_content').html(response);
+
+                    $('#modalEvent').modal();
+                }
+            });
+    });
+
+    $("#searchForm").on('click', '.typeSearch', function () {
+            
+        if ($(this).attr('class').indexOf('btn-default') != -1) {
+            $('#searchForm ').find('.typeSearch').removeClass('btn-info active').addClass('btn-default');
+            $(this).removeClass('btn-default').addClass('btn-info');
+            
+            if ($(this).find('input').attr('id') == "typeTask") {
+                $(".selectTask").css('display','');
+                $(".selectName").css('display','none');
+                $(".selectName").val("");
+            } else {
+                $(".selectName").css('display','');
+                $(".selectTask").css('display','none');
+                $(".selectTask").val("");
+            }
+        }
+    });
+    
+    $("#searchForm").on('click', '.status', function () {
+        if ($(this).attr('class').indexOf('btn-default') != -1) {
+            status = $(this).find('input').val();
+            $('#searchForm ').find('.status').removeClass('btn-info active').addClass('btn-default');
+            $(this).removeClass('btn-default').addClass('btn-info');
+
+        } else {
+            $('#searchForm ').find('.status').removeClass('btn-info active').addClass('btn-default');
+            $(this).removeClass('btn-default').addClass('btn-info');
+
+            $(this).removeClass('btn-info').addClass('btn-default');
+        }
+    });
+    
+    $("#more").on('click',function(){
+        $('.option').css('display',''); 
+
+        $(".minus").css('display','');
+        $(".plus").css('display','none');
+        
+    });
+    
+    $("#less").on('click',function(){
+        
+        $('.option').css('display','none');
+        
+        $(".minus").css('display','none');
+        $(".plus").css('display','');
+        
+    });
+        
+    $("#contain").on("click",'[data-form-reset]', function () {
+        $("#searchForm").find('input').val('');
+        $("#type").prop('selectedIndex', 0);
+        $('#logList').html('');
+    });
+    
+    var personsSource = new Bloodhound({
+            datumTokenizer: Bloodhound.tokenizers.obj.whitespace('displayName'),
+            queryTokenizer: Bloodhound.tokenizers.whitespace,
+            remote: {
+                url: '/userAccounts/%QUERY',
+                ajax : {
+                    async: false
+                }
+            },
+            limit: 100
+        });
+        personsSource.initialize();
+
+        // initialize typeahead
+        $('#executedByTypehead').typeahead(
+            {
+                hint: true,
+                highlight: true,
+                minLength: 3
+            }, 
+            // data source contacts
+            {
+                name: 'users',
+                displayKey: 'displayName',
+                templates: {
+                    empty: function() {
+                        return "<span class='well well-sm'>No user found</span>";
+                    },
+                    suggestion: function(person) {
+                        var display = 
+                            "<span>"
+                                + "<span class='fa fa-user' >&nbsp;</span>"
+                                + "<span style='font-family:Helvetica, sans-serif;'>" 
+                                + person.displayName;
+                        display += 
+                                "</span>";
+                        display += 
+                            "</span>";
+                        $("#replacingUser").attr('data-replacinguseraccountid', person.accountId);   
+                        return display;
+                    }
+                },
+                source: function(query, cb) {
+                    personsSource.get(query, function(suggestions) {
+                        cb(suggestions);
+                    });
+                },
+                skipCache: true
+            }
+        ).on('typeahead:selected', function($event, suggestion, source) {
+            $("#executedByTypehead").data('user', suggestion.accountId);
+        });
+        
+        $('#launchedByTypehead').typeahead(
+            {
+                hint: true,
+                highlight: true,
+                minLength: 3
+            }, 
+            // data source contacts
+            {
+                name: 'users',
+                displayKey: 'displayName',
+                templates: {
+                    empty: function() {
+                        return "<span class='well well-sm'>No user found</span>";
+                    },
+                    suggestion: function(person) {
+                        var display = 
+                            "<span>"
+                                + "<span class='fa fa-user' >&nbsp;</span>"
+                                + "<span style='font-family:Helvetica, sans-serif;'>" 
+                                + person.displayName;
+                        display += 
+                                "</span>";
+                        display += 
+                            "</span>";
+                        $("#replacingUser").attr('data-replacinguseraccountid', person.accountId);   
+                        return display;
+                    }
+                },
+                source: function(query, cb) {
+                    personsSource.get(query, function(suggestions) {
+                        cb(suggestions);
+                    });
+                },
+                skipCache: true
+            }
+        ).on('typeahead:selected', function($event, suggestion, source) {
+            $("#launchedByTypehead").data('user', suggestion.accountId);
+        });
+    
+        function serializeLog() {
+            serializedObject = {
+                fromDate: $('#fromDate').val(),
+                toDate: $('#toDate').val()
+            };
+            
+            if ($('#name').val()) {
+                serializedObject.name = $('#name').val();
+            }
+            
+            if ($('#task').val()) {
+                serializedObject.task = $('#task').val();
+            }
+            
+            if (status) {
+                serializedObject.status = status;
+            }
+            
+            if ($('#executedByTypehead').data('user')) {
+                serializedObject.executedBy = $('#executedByTypehead').data('user');
+            }
+            
+            if ($('#launchedByTypehead').data('user')) {
+                serializedObject.launchedBy = $('#launchedByTypehead').data('user');
+            }
+        return serializedObject;
+    }
+</script>
-- 
GitLab


From f1cabd099ccd3c024ecd2e62d9615c5574030beb Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Thu, 1 Mar 2018 17:39:54 +0100
Subject: [PATCH 09/25] Log task

---
 src/bundle/audit/Observer/logger.php                 | 2 ++
 src/bundle/batchProcessing/Controller/scheduling.php | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/bundle/audit/Observer/logger.php b/src/bundle/audit/Observer/logger.php
index 43546a0c6..53ef2ab76 100755
--- a/src/bundle/audit/Observer/logger.php
+++ b/src/bundle/audit/Observer/logger.php
@@ -212,6 +212,8 @@ class logger
         \laabs::callService(
             'audit/event/create', $this->servicePath->getName(), $this->servicePath->variables, $input, $output, true
         );
+
+        $this->servicePath = null;
     }
 
     /**
diff --git a/src/bundle/batchProcessing/Controller/scheduling.php b/src/bundle/batchProcessing/Controller/scheduling.php
index 728600295..77e3f36b4 100755
--- a/src/bundle/batchProcessing/Controller/scheduling.php
+++ b/src/bundle/batchProcessing/Controller/scheduling.php
@@ -181,18 +181,23 @@ class scheduling
         $this->changeStatus($schedulingId, "running");
 
         try {
+            $pathRouter = new \core\Route\PathRouter($task->route);
+            \core\Observer\Dispatcher::notify(LAABS_SERVICE_PATH,$pathRouter->path);
             if (!empty($scheduling->parameters)) {
                 $info = \laabs::callServiceArgs($task->route, (array) $scheduling->parameters);
 
             } else {
                 $info = \laabs::callService($task->route);
             }
+
         } catch (\Exception $e) {
             $this->changeStatus($schedulingId, "error");
             $status = false;
             $info = $e;
         }
 
+        \core\Observer\Dispatcher::notify(LAABS_SERVICE_RETURN, $info);
+
         if ($status) {
             $scheduling->lastExecution = \laabs::newDateTime(null, 'UTC');
             $scheduling->status = "scheduled";
-- 
GitLab


From d6536364b24bb1837b975f486ca6686d6256dc77 Mon Sep 17 00:00:00 2001
From: Correia Lopes Dylan <dylan.correia@hotmail.com>
Date: Mon, 26 Feb 2018 16:44:51 +0100
Subject: [PATCH 10/25] remplacement of archive search request contruction

---
 .../Controller/archiveCommunicationTrait.php  | 94 ++++++++++++++++---
 1 file changed, 83 insertions(+), 11 deletions(-)

diff --git a/src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php b/src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php
index fda6dd314..b5c82bbfb 100755
--- a/src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php
@@ -98,6 +98,10 @@ trait archiveCommunicationTrait
             'depositEndDate' => $depositEndDate,
             'originatingDate' => [$originatingStartDate, $originatingEndDate], // [0] startDate, [1] endDate
         ];
+
+        $queryParts = array();
+        $queryParams = array();
+
         if (!empty($description) || !empty($text)) {
             $searchClasses = [];
             if (!$profileReference) {
@@ -119,23 +123,91 @@ trait archiveCommunicationTrait
             foreach ($searchClasses as $descriptionClass => $descriptionController) {
                 $archives = array_merge($archives, $descriptionController->search($description, $text, $archiveArgs));
             }
+
         } else {
-            $queryString = $this->getArchiveAssert($archiveArgs);
+            if ($archiveId){
+                $queryParts['archiveId'] = "archiveId = :archiveId";
+                $queryParams['archiveId'] = $archiveId;
+            } else {
+                if ($profileReference){
+                    $queryParts['archivalProfileReference'] = "archivalProfileReference = :archivalProfileReference";
+                    $queryParams['archivalProfileReference'] = $profileReference;
+                }
 
-            $originators = array();
-            foreach ((array) $this->organizationController->getOrgsByRole('originator') as $originator) {
-                $originators[$originator->registrationNumber] = $originator;
-            }
+                if ($status){
+                    $queryParts['status'] = "status = :status";
+                    $queryParams['status'] = $status;
+                }
 
-            $archives = $this->sdoFactory->find('recordsManagement/archive', $queryString, null, false, false, 100);
-            foreach ($archives as $archive) {
-                if (!empty($archive->disposalDate) && $archive->disposalDate <= \laabs::newDate()) {
-                    $archive->disposable = true;
+                if ($retentionRuleCode){
+                    $queryParts['retentionRuleCode'] = "retentionRuleCode = :retentionRuleCode";
+                    $queryParams['retentionRuleCode'] = $retentionRuleCode;
                 }
 
-                if (isset($originators[$archive->originatorOrgRegNumber])) {
-                    $archive->originator = $originators[$archive->originatorOrgRegNumber];
+                if ($originatorOrgRegNumber){
+                    $queryParts['originatorOrgRegNumber'] = "originatorOrgRegNumber = :originatorOrgRegNumber";
+                    $queryParams['originatorOrgRegNumber'] = $originatorOrgRegNumber;
                 }
+
+                if ($finalDisposition){
+                    $queryParts['finalDisposition'] = "finalDisposition = :finalDisposition";
+                    $queryParams['finalDisposition'] = $finalDisposition;
+                }
+
+                if ($originatingStartDate && $originatingEndDate) {
+                    $queryParams['originatingStartDate'] = $originatingStartDate;
+                    $queryParams['originatingEndDate'] = $originatingEndDate;
+                    $queryParts['depositDate'] = "originatingDate >= :originatingStartDate AND originatingDate <= :originatingEndDate";
+                } elseif ($originatingStartDate) {
+                    $queryParams['originatingStartDate'] = $originatingStartDate;
+                    $queryParts['depositDate'] = "originatingDate >= :depositStartDate";
+
+                } elseif ($originatingEndDate) {
+                    $queryParams['originatingEndDate'] = $originatingEndDate;
+                    $queryParts['date'] = "originatingDate <= :originatingEndDate";
+                }
+
+                if ($depositStartDate && $depositEndDate) {
+                    $queryParams['depositStartDate'] = $depositStartDate;
+                    $queryParams['depositEndDate'] = $depositEndDate;
+                    $queryParts['depositDate'] = "depositDate >= :depositStartDate AND depositDate <= :depositEndDate";
+                } elseif ($depositStartDate) {
+                    $queryParams['depositStartDate'] = $depositStartDate;
+                    $queryParts['depositDate'] = "depositDate >= :depositStartDate";
+
+                } elseif ($depositEndDate) {
+                    $queryParams['depositEndDate'] = $depositEndDate;
+                    $queryParts['date'] = "depositDate <= :depositEndDate";
+                }
+                if($archiveExpired){
+                    $currentDate = \laabs::newDate();
+                    $currentDateString = $currentDate->format('Y-m-d');
+                    if ($archiveExpired == "true") {
+
+                        $queryParams['disposalDate'] = $currentDateString;
+                        $queryParts['disposalDate'] = "disposalDate <= :disposalDate";
+                    }else if($archiveExpired == "false"){
+                        $queryParams['disposalDate'] = $currentDateString;
+                        $queryParts['disposalDate'] = "disposalDate >= :disposalDate";
+                    }
+                }
+
+                if($partialRetentionRule){
+                    $queryParts['partialRetentionRule'] = "(retentionDuration=NULL OR retentionStartDate=NULL OR retentionRuleCode=NULL)";
+                }
+
+            }
+            $queryString = \laabs\implode(' AND ', $queryParts);
+            $archives = $this->sdoFactory->find('recordsManagement/archive', $queryString, $queryParams, false, false, 100);
+        }
+
+        foreach ($archives as $archive) {
+            if (!empty($archive->disposalDate) && $archive->disposalDate <= \laabs::newDate()) {
+                $archive->disposable = true;
+            }
+
+            if (isset($originators[$archive->originatorOrgRegNumber])) {
+                $archive->originator = $originators[$archive->originatorOrgRegNumber];
             }
         }
 
-- 
GitLab


From 4a03018993d26adfffa2fbb232e7885e28f077de Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Fri, 2 Mar 2018 10:17:46 +0100
Subject: [PATCH 11/25] Change .html to .text

---
 src/presentation/maarchRM/Resources/view/audit/search.html  | 2 +-
 .../maarchRM/Resources/view/auth/authorization/edit.html    | 4 ++--
 .../maarchRM/Resources/view/auth/serviceAccount/edit.html   | 4 ++--
 .../Resources/view/auth/userAccount/admin/edit.html         | 6 +++---
 .../userManagement/organisationsAdministrationForm.html     | 2 +-
 .../Resources/view/contact/manageContact/addressForm.html   | 4 ++--
 .../view/contact/manageContact/communicationForm.html       | 2 +-
 .../view/contact/manageContact/contactInformationForm.html  | 4 ++--
 .../view/dashboard/mainScreen/descriptionForm.html          | 2 +-
 .../Resources/view/dashboard/mainScreen/folder.html         | 2 +-
 .../Resources/view/filePlan/archiveAssignmentModal.html     | 4 ++--
 .../view/filePlan/supressionConfirmationModal.html          | 2 +-
 12 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/presentation/maarchRM/Resources/view/audit/search.html b/src/presentation/maarchRM/Resources/view/audit/search.html
index 6c83bc99a..96d7439db 100755
--- a/src/presentation/maarchRM/Resources/view/audit/search.html
+++ b/src/presentation/maarchRM/Resources/view/audit/search.html
@@ -215,7 +215,7 @@
             },
             templates: {
                 empty: function () {
-                    return "<span class='well well-sm'>"+$('#noAccountFound').html()+"</span>";
+                    return "<span class='well well-sm'>"+$('#noAccountFound').text()+"</span>";
                 },
                 suggestion: function (account) {
                     var name = account.displayName;
diff --git a/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html b/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
index c9829b231..27038c06d 100755
--- a/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
+++ b/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
@@ -347,7 +347,7 @@
                 displayKey: 'displayName',
                 templates: {
                     empty: function() {
-                        return "<span class='well well-sm'>"+$('#noUserFound').html()+"</span>";
+                        return "<span class='well well-sm'>"+$('#noUserFound').text()+"</span>";
                     },
                     suggestion: function(user) {
                         var display =
@@ -396,7 +396,7 @@
         };
         
         if(parameters.role.roleName == "") {
-             gritter.show($('#empty_text').html(),false);
+             gritter.show($('#empty_text').text(),false);
              return false;
         }
         
diff --git a/src/presentation/maarchRM/Resources/view/auth/serviceAccount/edit.html b/src/presentation/maarchRM/Resources/view/auth/serviceAccount/edit.html
index deb5f37b2..81f5e73d9 100755
--- a/src/presentation/maarchRM/Resources/view/auth/serviceAccount/edit.html
+++ b/src/presentation/maarchRM/Resources/view/auth/serviceAccount/edit.html
@@ -156,7 +156,7 @@
         });
 
         if(serviceAccount.displayName == "" || orgId == "") {
-            gritter.show($('#empty_text').html(),false);
+            gritter.show($('#empty_text').text(),false);
             return false;
         }
 
@@ -254,7 +254,7 @@
             displayKey: 'displayName',
             templates: {
                 empty: function() {
-                    return "<span class='well well-sm'>"+$('#noServiceFound').html()+"</span>";
+                    return "<span class='well well-sm'>"+$('#noServiceFound').text()+"</span>";
                 },
                 suggestion: function(organization) {
                     var display;
diff --git a/src/presentation/maarchRM/Resources/view/auth/userAccount/admin/edit.html b/src/presentation/maarchRM/Resources/view/auth/userAccount/admin/edit.html
index 1223e7229..8b5f7e509 100755
--- a/src/presentation/maarchRM/Resources/view/auth/userAccount/admin/edit.html
+++ b/src/presentation/maarchRM/Resources/view/auth/userAccount/admin/edit.html
@@ -113,7 +113,7 @@
         var user = serialize();
 
         if (!validateEmail(user.emailAddress)) {
-            gritter.show($('#invalidEmail_text').html(), false);
+            gritter.show($('#invalidEmail_text').text(), false);
             return false;
         }
 
@@ -124,7 +124,7 @@
 
 
         if (user.password != user.verification) {
-            gritter.show($('#badPasswordVerification_text').html(), false);
+            gritter.show($('#badPasswordVerification_text').text(), false);
             return;
         }
 
@@ -134,7 +134,7 @@
         }
         
         if (user.accountName == "" || user.password == "" || user.verification == "" || user.name == "" || user.email == "") {
-            gritter.show($('#empty_text').html(), false);
+            gritter.show($('#empty_text').text(), false);
             return;
         }
 
diff --git a/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html b/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
index 5d34db804..d428dc62d 100755
--- a/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
+++ b/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
@@ -50,7 +50,7 @@
             displayKey: 'displayName',
             templates: {
                 empty: function() {
-                    return "<span class='well well-sm'>"+$('#noServiceFound').html()+"</span>";
+                    return "<span class='well well-sm'>"+$('#noServiceFound').text()+"</span>";
                 },
                 suggestion: function(organization) {
                     var display;
diff --git a/src/presentation/maarchRM/Resources/view/contact/manageContact/addressForm.html b/src/presentation/maarchRM/Resources/view/contact/manageContact/addressForm.html
index 9b7e037aa..fc858a2be 100755
--- a/src/presentation/maarchRM/Resources/view/contact/manageContact/addressForm.html
+++ b/src/presentation/maarchRM/Resources/view/contact/manageContact/addressForm.html
@@ -155,7 +155,7 @@
             var addressObject = ContactAddressForm.serialize();
 
             if(addressObject.purpose == null || addressObject.city == null) {
-                gritter.show($('#contact_empty_text').html(),false);
+                gritter.show($('#contact_empty_text').text(),false);
 
                 return false;
             }
@@ -323,7 +323,7 @@
 
             if (address.citySubDivision) {
                 $('<p/>').addClass('list-group-item-text')
-                         .text(address.citySubDivision + ' ' + $('#contact_text_citySubDivision').html())
+                         .text(address.citySubDivision + ' ' + $('#contact_text_citySubDivision').text())
                          .appendTo(a);
             }
 
diff --git a/src/presentation/maarchRM/Resources/view/contact/manageContact/communicationForm.html b/src/presentation/maarchRM/Resources/view/contact/manageContact/communicationForm.html
index c772dad22..27d3a8c34 100755
--- a/src/presentation/maarchRM/Resources/view/contact/manageContact/communicationForm.html
+++ b/src/presentation/maarchRM/Resources/view/contact/manageContact/communicationForm.html
@@ -124,7 +124,7 @@
             var communicationObject = ContactCommunicationForm.serialize();
             
             if(communicationObject.purpose == "" ||  communicationObject.comMeanCode == "" || communicationObject.value == "") {
-                gritter.show($('#contact_empty_text').html(),false);
+                gritter.show($('#contact_empty_text').text(),false);
                 return false;
             }
 
diff --git a/src/presentation/maarchRM/Resources/view/contact/manageContact/contactInformationForm.html b/src/presentation/maarchRM/Resources/view/contact/manageContact/contactInformationForm.html
index 8934aeb45..2548dcdd4 100755
--- a/src/presentation/maarchRM/Resources/view/contact/manageContact/contactInformationForm.html
+++ b/src/presentation/maarchRM/Resources/view/contact/manageContact/contactInformationForm.html
@@ -208,12 +208,12 @@
 
             if(contactObject.contactType == "person") {
                 if(contactObject.displayName == "" || contactObject.firstName == "" || contactObject.lastName == "") {
-                    gritter.show($('#empty_text').html(),false);
+                    gritter.show($('#empty_text').text(),false);
                     return false;
                 }
             } else {
                 if(contactObject.displayName == "") {
-                    gritter.show($('#empty_text').html(),false);
+                    gritter.show($('#empty_text').text(),false);
                     return false;
                 }
             }
diff --git a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html
index 08d6da870..38f7ffa7f 100755
--- a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html
+++ b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html
@@ -200,7 +200,7 @@
                     break;
                 case 'number':
                     field = template.find('input');
-                    field.attr('type', 'number').attr('placeholder', $('#number_text').html());
+                    field.attr('type', 'number').attr('placeholder', $('#number_text').text());
                     if (defaultVal !== null && defaultVal !== undefined && defaultVal !== "") {
                         field.val(defaultVal);
                     }
diff --git a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html
index 45626981d..d50cbb554 100755
--- a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html
+++ b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html
@@ -239,7 +239,7 @@
                     .addClass("small newArchive")
                     .data("reference", '')
                     .attr('style', "cursor: pointer;")
-                    .text($('#withoutProfile_text').html());
+                    .text($('#withoutProfile_text').text());
 
                 $("<li/>").append(a).appendTo(dropdown);
             };
diff --git a/src/presentation/maarchRM/Resources/view/filePlan/archiveAssignmentModal.html b/src/presentation/maarchRM/Resources/view/filePlan/archiveAssignmentModal.html
index 51fab3dbc..341aea8e3 100755
--- a/src/presentation/maarchRM/Resources/view/filePlan/archiveAssignmentModal.html
+++ b/src/presentation/maarchRM/Resources/view/filePlan/archiveAssignmentModal.html
@@ -56,7 +56,7 @@
             if (folderName.length > 30)  { folderName = folderName.substring(0,27)+'...' }
 
             if (archives.length == 1) {
-                var message = $('#archiveToMove_txt').html();
+                var message = $('#archiveToMove_txt').text();
 
                 var archiveName = $('#'+archives[0]).find('.archiveName').text();
                 if (archiveName.length > 30) { archiveName = archiveName.substring(0,27)+'...' }
@@ -66,7 +66,7 @@
 
             } else {
                 var messageDiv = $('#archiveToMove');
-                var message = $('#archivesToMove_txt').html();
+                var message = $('#archivesToMove_txt').text();
 
                 message = message.replace("%1$s", '<i class="text-primary">'+ archives.length +'<\/i>');
                 message = message.replace("%2$s", '<i class="text-primary">'+ folderName +'<\/i>');
diff --git a/src/presentation/maarchRM/Resources/view/filePlan/supressionConfirmationModal.html b/src/presentation/maarchRM/Resources/view/filePlan/supressionConfirmationModal.html
index 801af67a1..4dc6e2fa7 100755
--- a/src/presentation/maarchRM/Resources/view/filePlan/supressionConfirmationModal.html
+++ b/src/presentation/maarchRM/Resources/view/filePlan/supressionConfirmationModal.html
@@ -37,7 +37,7 @@ DeleteConfirmationModal = {
         var modal = $('#deleteFolderModal');
         this.target = FilePlan.selectedNode;
 
-        var message = $('#deleteFolderMessage_txt').html();
+        var message = $('#deleteFolderMessage_txt').text();
 
         message = message.replace("%1$s", '<i class="text-primary">'+ this.target.find('b:first').text() +'<\/i>');
         this.messageDiv.html(message);
-- 
GitLab


From 1973bb25fe44e8a0d3791ac47cd956e63e618fea Mon Sep 17 00:00:00 2001
From: Cyril Vazquez <cyril.vazquez@maarch.org>
Date: Fri, 2 Mar 2018 10:45:12 +0100
Subject: [PATCH 12/25] Fix event type for observer notification when task exec
 throws an exception

---
 src/bundle/batchProcessing/Controller/scheduling.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bundle/batchProcessing/Controller/scheduling.php b/src/bundle/batchProcessing/Controller/scheduling.php
index 77e3f36b4..4f8cd323c 100755
--- a/src/bundle/batchProcessing/Controller/scheduling.php
+++ b/src/bundle/batchProcessing/Controller/scheduling.php
@@ -190,13 +190,13 @@ class scheduling
                 $info = \laabs::callService($task->route);
             }
 
-        } catch (\Exception $e) {
+            \laabs::notify(LAABS_SERVICE_RETURN, $info);
+        } catch (\Exception $info) {
             $this->changeStatus($schedulingId, "error");
             $status = false;
-            $info = $e;
-        }
-
-        \core\Observer\Dispatcher::notify(LAABS_SERVICE_RETURN, $info);
+            
+            \laabs::notify(LAABS_BUSINESS_EXCEPTION, $info);
+        }       
 
         if ($status) {
             $scheduling->lastExecution = \laabs::newDateTime(null, 'UTC');
-- 
GitLab


From cbdd6e77fe96ccd843f082bc030d07bcb531884c Mon Sep 17 00:00:00 2001
From: Alexis Ragot <alexis.ragot@maarch.org>
Date: Fri, 2 Mar 2018 10:50:58 +0100
Subject: [PATCH 13/25] notify business exception

---
 src/bundle/auth/Controller/ForgotAccountTrait.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bundle/auth/Controller/ForgotAccountTrait.php b/src/bundle/auth/Controller/ForgotAccountTrait.php
index d84c310f4..982ed34ac 100644
--- a/src/bundle/auth/Controller/ForgotAccountTrait.php
+++ b/src/bundle/auth/Controller/ForgotAccountTrait.php
@@ -74,6 +74,7 @@ trait ForgotAccountTrait
             $title = "Maarch RM - user information";
             $result = $notificationDependency->send($title, $message, array($userAccount->emailAddress));
         } catch (\bundle\auth\Exception\authenticationException $e) {
+            \laabs::notify(LAABS_BUSINESS_EXCEPTION, $e);
         }
 
         return $result;
-- 
GitLab


From 995e5dfd398a2f1c3a304646307b49fa223db01e Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Fri, 2 Mar 2018 11:13:39 +0100
Subject: [PATCH 14/25] Fix : #7268

---
 src/presentation/maarchRM/Presenter/Exception.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/presentation/maarchRM/Presenter/Exception.php b/src/presentation/maarchRM/Presenter/Exception.php
index 6c665b651..876e4abaf 100755
--- a/src/presentation/maarchRM/Presenter/Exception.php
+++ b/src/presentation/maarchRM/Presenter/Exception.php
@@ -94,7 +94,11 @@ class Exception
         if (isset($exception->errors)) {
             $errors = [];
             foreach ($exception->errors as $error) {
-                if (is_object($error)) {
+                if (is_string($error)) {
+                    $error = new \core\Error($error);
+                }
+
+                if (is_object($error) && $error instanceof \core\Error) {
                     $error->setMessage($this->translator->getText($error->getFormat()));
 
                     $variables = [];
@@ -108,10 +112,8 @@ class Exception
                         }
                     }
                     $error->setVariables($variables);
-                } else {
-                    $error = new \core\Error($error);
+                    $errors[] = $error;
                 }
-                $errors[] = $error;
             }
             $this->json->errors = $errors;
         }
-- 
GitLab


From b42f66e8b89fbf1b2cd270a400118e08550fd2c4 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Fri, 2 Mar 2018 15:02:27 +0100
Subject: [PATCH 15/25] Fix : #7264 - CSS Typeahead

---
 .../maarchRM/Resources/public/css/style.css   |  85 ++++++++++---
 .../maarchRM/Resources/view/audit/search.html |   7 +-
 .../view/auth/authorization/edit.html         |   3 +-
 .../organisationsAdministrationForm.html      |   2 +-
 .../digitalResource/contentType/edit.html     |   2 +-
 .../recordsManagement/archive/search.html     |   4 +-
 web/public/js/typeahead_0.11.1/typeahead.js   |   2 +-
 web/public/less/dashboard/style.less          |   3 +
 .../less/typeahead_0.11.1/typeahead.less      | 120 ++++++++++++++++++
 9 files changed, 202 insertions(+), 26 deletions(-)
 create mode 100644 web/public/less/typeahead_0.11.1/typeahead.less

diff --git a/src/presentation/maarchRM/Resources/public/css/style.css b/src/presentation/maarchRM/Resources/public/css/style.css
index 176aabcf5..e8d05ea1b 100755
--- a/src/presentation/maarchRM/Resources/public/css/style.css
+++ b/src/presentation/maarchRM/Resources/public/css/style.css
@@ -6140,17 +6140,17 @@ button.close {
     display: none !important;
   }
 }
-.tt-wrapper {
-  position: relative;
-}
-.tt-wrapper .tt-dropdown-menu {
+
+.tt-wrapper .tt-menu,
+.tt-wrapper .tt-menu {
+  cursor: pointer;
   position: absolute;
   top: 100%;
   left: 0;
   z-index: 1000;
   display: none;
   float: left;
-  min-width: 160px;
+  min-width: 100%;
   padding: 5px 0;
   margin: 2px 0 0;
   list-style: none;
@@ -6163,14 +6163,13 @@ button.close {
   -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
   box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
   background-clip: padding-box;
-  width: 100%;
-  max-height: 150px;
-  overflow-y: auto;
 }
-.tt-wrapper .tt-dropdown-menu .tt-suggestions {
-  display: block;
+
+.tt-wrapper {
+  position: relative;
 }
-.tt-wrapper .tt-dropdown-menu .tt-suggestions .tt-suggestion {
+
+.tt-wrapper .tt-suggestion {
   display: block;
   padding: 3px 20px;
   clear: both;
@@ -6178,12 +6177,68 @@ button.close {
   line-height: 1.42857143;
   color: #333333;
   white-space: nowrap;
-  cursor: pointer;
 }
-.tt-wrapper .tt-dropdown-menu .tt-suggestions .tt-suggestion.tt-cursor {
+.tt-wrapper .tt-suggestion.tt-cursor,
+.tt-wrapper .tt-suggestion:hover,
+.tt-wrapper .tt-suggestion:focus {
+  color: #ffffff;
   text-decoration: none;
-  color: #262626;
-  background-color: #f5f5f5;
+  outline: 0;
+  background-color: #337ab7;
+}
+.input-group.input-group-lg .tt-wrapper .form-control {
+  height: 46px;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.3333333;
+  border-radius: 6px;
+}
+.input-group.input-group-sm .tt-wrapper .form-control {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+.tt-wrapper {
+  width: 100%;
+}
+.input-group .tt-wrapper {
+  display: block !important;
+  height: 34px;
+}
+
+.input-group .tt-wrapper .tt-menu {
+  top: 32px !important;
+}
+.input-group .tt-wrapper:not(:first-child):not(:last-child) .form-control {
+  border-radius: 0;
+}
+.input-group .tt-wrapper:first-child .form-control {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.input-group .tt-wrapper:last-child .form-control {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.input-group.input-group-sm .tt-wrapper {
+  height: 30px;
+}
+.input-group.input-group-sm .tt-wrapper .tt-menu,
+.input-group.input-group-sm .tt-wrapper .tt-menu {
+  top: 30px !important;
+}
+.input-group.input-group-lg .tt-wrapper {
+  height: 46px;
+}
+.input-group.input-group-lg .tt-wrapper .tt-menu,
+.input-group.input-group-lg .tt-wrapper .tt-menu {
+  top: 46px !important;
 }
 /* FONT PATH
  * -------------------------- */
diff --git a/src/presentation/maarchRM/Resources/view/audit/search.html b/src/presentation/maarchRM/Resources/view/audit/search.html
index 96d7439db..a2a85cf7a 100755
--- a/src/presentation/maarchRM/Resources/view/audit/search.html
+++ b/src/presentation/maarchRM/Resources/view/audit/search.html
@@ -220,15 +220,14 @@
                 suggestion: function (account) {
                     var name = account.displayName;
                     if (account.accountType == 'service') {
-                        var type = $('#service_text').html();
+                        var icone = "<span class='fa fa-laptop' >&nbsp;</span>";
                     } else {
-                        var type = $('#user_text').html();
+                        var icone = "<span class='fa fa-user' >&nbsp;</span>";
                     }
                     var display =
                         "<span>"
+                        + icone
                         + "<span style='font-family:Helvetica, sans-serif;'>"
-                        + type
-                        + " - "
                         + name
                         + "</span></span><br>";
                     return display;
diff --git a/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html b/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
index 27038c06d..ac11a62b6 100755
--- a/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
+++ b/src/presentation/maarchRM/Resources/view/auth/authorization/edit.html
@@ -352,9 +352,10 @@
                     suggestion: function(user) {
                         var display =
                             "<span>"
+                            + "<span class='fa fa-user' >&nbsp;</span>"
                             + "<span style='font-family:Helvetica, sans-serif;'>"
                             + user.displayName
-                            + "</span></span><br>";
+                            + "</span></span></span><br>";
                         return display;
                     }
                 },
diff --git a/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html b/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
index d428dc62d..ee603df84 100755
--- a/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
+++ b/src/presentation/maarchRM/Resources/view/auth/userAccount/userManagement/organisationsAdministrationForm.html
@@ -62,7 +62,7 @@
                             + organization.ownerOrgName
                             + " > "
                             + organization.displayName
-                            + "</span></span><br><br>";
+                            + "</span></span><br>";
                     }
                     else {
                         display = this.empty();
diff --git a/src/presentation/maarchRM/Resources/view/digitalResource/contentType/edit.html b/src/presentation/maarchRM/Resources/view/digitalResource/contentType/edit.html
index 6a290c9d5..e19642a42 100755
--- a/src/presentation/maarchRM/Resources/view/digitalResource/contentType/edit.html
+++ b/src/presentation/maarchRM/Resources/view/digitalResource/contentType/edit.html
@@ -130,7 +130,7 @@
                     var display = "<span>"
                         + "<span style='font-family:Helvetica, sans-serif;'>"
                         + displayName
-                        + "</span></span><br><br>";
+                        + "</span></span><br>";
                     return display;
                 }
             },
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html
index a30ab0fad..b0d676f1f 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html
@@ -329,9 +329,7 @@
                                 + " > ";
                     }
                        display += organization.displayName
-                        + "</span>"
-                        + "</span>"
-                        + "<br><br>";
+                        + "</span></span><br>";
 
                     return display;
                 }
diff --git a/web/public/js/typeahead_0.11.1/typeahead.js b/web/public/js/typeahead_0.11.1/typeahead.js
index 22f00a95e..59ab67522 100644
--- a/web/public/js/typeahead_0.11.1/typeahead.js
+++ b/web/public/js/typeahead_0.11.1/typeahead.js
@@ -1070,7 +1070,7 @@
             wrapper: "tt-wrapper",
             input: "tt-input",
             hint: "tt-hint",
-            menu: "tt-dropdown-menu",
+            menu: "tt-menu",
             dataset: "tt-dataset",
             suggestion: "tt-suggestion",
             selectable: "tt-selectable",
diff --git a/web/public/less/dashboard/style.less b/web/public/less/dashboard/style.less
index a1e6eae2f..240b77e82 100755
--- a/web/public/less/dashboard/style.less
+++ b/web/public/less/dashboard/style.less
@@ -55,6 +55,9 @@
 @import "../bootstrap_3.1.1/utilities.less";
 @import "../bootstrap_3.1.1/responsive-utilities.less";
 
+// Typeahead
+@import "../typeahead_0.11.1/typeahead.less";
+
 // Fontawesome
 @import "../font-awesome-4.7.0/variables.less";
 @import "../font-awesome-4.7.0/mixins.less";
diff --git a/web/public/less/typeahead_0.11.1/typeahead.less b/web/public/less/typeahead_0.11.1/typeahead.less
new file mode 100644
index 000000000..4a72e5f44
--- /dev/null
+++ b/web/public/less/typeahead_0.11.1/typeahead.less
@@ -0,0 +1,120 @@
+@color_1: #333333;
+@color_2: #ffffff;
+@background_color_1: #ffffff;
+@background_color_2: #337ab7;
+
+.tt-wrapper {
+  .tt-menu {
+    cursor: pointer;
+    position: absolute;
+    top: 100%;
+    left: 0;
+    z-index: 1000;
+    display: none;
+    float: left;
+    min-width: 100%;
+    padding: 5px 0;
+    margin: 2px 0 0;
+    list-style: none;
+    font-size: 14px;
+    text-align: left;
+    background-color: @background_color_1;
+    border: 1px solid #cccccc;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    border-radius: 4px;
+    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+    background-clip: padding-box;
+  }
+  position: relative;
+  width: 100%;
+  .tt-suggestion {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: normal;
+    line-height: 1.42857143;
+    color: @color_1;
+    white-space: nowrap;
+    &:hover {
+      color: @color_2;
+      text-decoration: none;
+      outline: 0;
+      background-color: @background_color_2;
+    }
+    &:focus {
+      color: @color_2;
+      text-decoration: none;
+      outline: 0;
+      background-color: @background_color_2;
+    }
+  }
+  .tt-suggestion.tt-cursor {
+    color: @color_2;
+    text-decoration: none;
+    outline: 0;
+    background-color: @background_color_2;
+  }
+}
+.input-group.input-group-lg {
+  .tt-wrapper {
+    .form-control {
+      height: 46px;
+      padding: 10px 16px;
+      font-size: 18px;
+      line-height: 1.3333333;
+      border-radius: 6px;
+    }
+    height: 46px;
+    .tt-menu {
+      top: 46px !important;
+    }
+  }
+}
+.input-group.input-group-sm {
+  .tt-wrapper {
+    .form-control {
+      height: 30px;
+      padding: 5px 10px;
+      font-size: 12px;
+      line-height: 1.5;
+      border-radius: 3px;
+    }
+    height: 30px;
+    .tt-menu {
+      top: 30px !important;
+    }
+  }
+}
+.input-group {
+  .tt-wrapper {
+    display: block !important;
+    height: 34px;
+    .tt-menu {
+      top: 32px !important;
+    }
+    &:not(:first-child) {
+      &:not(:last-child) {
+        .form-control {
+          border-radius: 0;
+        }
+      }
+    }
+    &:first-child {
+      .form-control {
+        border-top-left-radius: 4px;
+        border-bottom-left-radius: 4px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+      }
+    }
+    &:last-child {
+      .form-control {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+      }
+    }
+  }
+}
-- 
GitLab


From ccf12745c0f779d0bd3bd0b2b146d689bebd0272 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Mon, 5 Mar 2018 10:32:59 +0100
Subject: [PATCH 16/25] fix : #7317 batch processing

---
 src/bundle/batchProcessing/Controller/scheduling.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bundle/batchProcessing/Controller/scheduling.php b/src/bundle/batchProcessing/Controller/scheduling.php
index 4f8cd323c..9033833e0 100755
--- a/src/bundle/batchProcessing/Controller/scheduling.php
+++ b/src/bundle/batchProcessing/Controller/scheduling.php
@@ -310,7 +310,7 @@ class scheduling
         if(!empty($frequency[1])) {
             $frequency[1] -= $H_Offset; 
         }
-        if(!empty($frequency[8])) {
+        if(!empty($frequency[8] && $frequency[8] != "00")) {
             $frequency[8] -= $H_Offset; 
         }
         
@@ -319,7 +319,7 @@ class scheduling
                 $timeAdd = strtoupper("PT".$frequency[5].$frequency[6]);
                 $currentDate->add(new \DateInterval($timeAdd));
 
-                if ($frequency[7] != "" && $frequency[8] != "") {
+                if (($frequency[7] != "" && $frequency[8] != "") && ($frequency[7] != "00" && $frequency[8] != "00")) {
                     $endDate->setTime($frequency[8], $frequency[7], "0");
                 } else {
                     $endDate->add(new \DateInterval("P1D"));
@@ -341,7 +341,7 @@ class scheduling
                     $daysWeek = explode(",", $frequency[2]);
                     $timeAdd = strtoupper("PT".$frequency[5].$frequency[6]);
                     $currentDate->add(new \DateInterval($timeAdd));
-                    if ($frequency[7] != "" && $frequency[8] != "") {
+                    if ($frequency[7] != "" && $frequency[8] != "" && ($frequency[7] != "00" && $frequency[8] != "00")) {
                         $endDate->setTime($frequency[8], $frequency[7], "0");
                     } else {
                         $endDate->add(new \DateInterval("P1D"));
@@ -367,7 +367,7 @@ class scheduling
                     $timeAdd = strtoupper("PT".$frequency[5].$frequency[6]);
                     $currentDate->add(new \DateInterval($timeAdd));
 
-                    if ($frequency[7] != "" && $frequency[8] != "") {
+                    if ($frequency[7] != "" && $frequency[8] != "" && ($frequency[7] != "00" && $frequency[8] != "00")) {
                         $endDate->setTime($frequency[8], $frequency[7], "0");
                     } else {
                         $endDate->add(new \DateInterval("P1M"));
-- 
GitLab


From 969c98a4b373acfa0ba56edcfb0f1f196b6c3c56 Mon Sep 17 00:00:00 2001
From: Correia Lopes Dylan <dylan.correia@hotmail.com>
Date: Mon, 5 Mar 2018 14:39:06 +0100
Subject: [PATCH 17/25] 7265- Query construction modification

---
 .../Controller/archiveAccessTrait.php         | 64 ++++++++-----
 .../Controller/archiveCommunicationTrait.php  | 95 +++----------------
 .../Controller/description.php                |  4 +-
 3 files changed, 58 insertions(+), 105 deletions(-)

diff --git a/src/bundle/recordsManagement/Controller/archiveAccessTrait.php b/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
index ed37b70d2..83b114209 100755
--- a/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
@@ -191,7 +191,7 @@ trait archiveAccessTrait
      * 
      * @return string Query
      */
-    public function getArchiveAssert($args)
+    public function getArchiveAssert($args,&$queryParams)
     {
         // Args on archive
         $currentDate = \laabs::newDate();
@@ -202,37 +202,47 @@ trait archiveAccessTrait
             $queryParts[] = "archiveName='*".$args['archiveName']."*'";
         }
         if (!empty($args['profileReference'])) {
-            $queryParts[] = "archivalProfileReference='".$args['profileReference']."'";
+            $queryParts['archivalProfileReference'] = "archivalProfileReference = :archivalProfileReference";
+            $queryParams['archivalProfileReference']=$args['profileReference'];
         }
         if (!empty($args['agreementReference'])) {
-            $queryParts[] = "archivalAgreementReference='".$args['agreementReference']."'";
+            $queryParts['archivalAgreementReference'] = "archivalAgreementReference=:archivalAgreementReference";
+            $queryParts['archivalAgreementReference'] = $args['agreementReference'];
         }
         if (!empty($args['archiveId'])) {
-            $queryParts[] = "archiveId='".$args['archiveId']."'";
+            $queryParts['archiveId'] = "archiveId=:archiveId";
+            $queryParams['archiveId'] = $args['archiveId'];
         }
         if (!empty($args['status'])) {
-            $queryParts[] = "status='".$args['status']."'";
+            $queryParts['status'] = "status=:status";
+            $queryParams['status'] = $args['status'];
         }
         if (!empty($args['retentionRuleCode'])) {
-            $queryParts[] = "retentionRuleCode='".$args['retentionRuleCode']."'";
+            $queryParts[] = "retentionRuleCode=:retentionRuleCode";
+            $queryParams['retentionRuleCode'] = $args['retentionRuleCode'];
         }
         if (!empty($args['archiveExpired']) && $args['archiveExpired'] == "true") {
-            $queryParts[] = "disposalDate<='".$currentDateString."'";
+            $queryParts['disposalDate'] = "disposalDate<= :disposalDate";
+            $queryParams['disposalDate'] = $currentDateString;
         }
         if (!empty($args['archiveExpired']) && $args['archiveExpired'] == "false") {
-            $queryParts[] = "disposalDate>='".$currentDateString."'";
+            $queryParts['disposalDate'] = "disposalDate>= :disposalDate";
+            $queryParams['disposalDate'] = $currentDateString;
         }
         if (!empty($args['partialRetentionRule']) && $args['partialRetentionRule'] == "true") {
-            $queryParts[] = "(retentionDuration=NULL OR retentionStartDate=NULL OR retentionRuleCode=NULL)";
+            $queryParts['partialRetentionRule'] = "(retentionDuration=NULL OR retentionStartDate=NULL OR retentionRuleCode=NULL)";
         }
         if (!empty($args['finalDisposition'])) {
-            $queryParts[] = "finalDisposition='".$args['finalDisposition']."'";
+            $queryParts['finalDisposition'] = "finalDisposition= :finalDisposition";
+            $queryParams['finalDisposition'] =$args['finalDisposition'];
         }
         if (!empty($args['originatorOrgRegNumber'])) {
-            $queryParts[] = "originatorOrgRegNumber='".$args['originatorOrgRegNumber']."'";
+            $queryParts[] = "originatorOrgRegNumber= :originatorOrgRegNumber";
+            $queryParams['originatorOrgRegNumber'] = $args['originatorOrgRegNumber'];
         }
         if (!empty($args['originatorArchiveId'])) {
-            $queryParts[] = "originatorArchiveId='".$args['originatorArchiveId']."'";
+            $queryParts['originatorArchiveId'] = "originatorArchiveId= :originatorArchiveId";
+            $queryParams['originatorArchiveId'] = $args['originatorArchiveId'];
         }
         if (!empty($args['originatingDate'])) {
             if (!empty($args['originatingDate'][0]) && is_string($args['originatingDate'][0])) {
@@ -244,11 +254,13 @@ trait archiveAccessTrait
 
             if (!empty($args['originatingDate'][0])) { // originatingStartDate
                 $args['originatingDate'][0] = $args['originatingDate'][0]->format('Y-m-d');
-                $queryParts[] = "originatingDate>='".$args['originatingDate'][0]."'";
+                $queryParts['originatingDate'] = "originatingDate>= :originatingDate";
+                $queryParams['originatingDate'] =$args['originatingDate'][0];
             }
-            if (!empty($args['originatingDate'][1])) { // originatingEndDate
+            if (!empty($args['originatingDate'][1])) { // originatingEndDate;
                 $args['originatingDate'][1] = $args['originatingDate'][1]->format('Y-m-d');
-                $queryParts[] = "originatingDate<='".$args['originatingDate'][1]."'";
+                $queryParts['originatingDate'] = "originatingDate<= :originatingDate";
+                $queryParams['originatingDate'] = $args['originatingDate'][1];
             }
         }
 
@@ -262,30 +274,38 @@ trait archiveAccessTrait
         if (!empty($args['depositStartDate']) && !empty($args['depositEndDate'])) {
             $args['depositStartDate'] = $args['depositStartDate']->format('Y-m-d').'T00:00:00';
             $args['depositEndDate'] = $args['depositEndDate']->format('Y-m-d').'T23:59:59';
-            $queryParts[] = "depositDate <= '".$args['depositEndDate']."' AND depositDate >= '".$args['depositStartDate']."'";
+            $queryParts['depositDate'] = "depositDate <= :depositEndDate AND depositDate >= :depositStartDate";
+            $queryParams['depositEndDate'] = $args['depositEndDate'];
+            $queryParams['depositStartDate'] = $args['depositStartDate'];
+
         } elseif (!empty($args['depositStartDate'])) {
             $args['depositStartDate'] = $args['depositStartDate']->format('Y-m-d').'T00:00:00';
-            $queryParts[] = "depositDate >= '".$args['depositStartDate']."'";
+            $queryParts['depositDate'] = "depositDate >= :depositStartDate";
+            $queryParams['depositStartDate'] = $args['depositStartDate'];
 
         } elseif (!empty($args['depositEndDate'])) {
             $args['depositEndDate'] = $args['depositEndDate']->format('Y-m-d').'T23:59:59';
-            $queryParts[] = "depositDate <= '".$args['depositEndDate']."'";
+            $queryParts['depositDate'] = "depositDate <= :depositEndDate";
+            $queryParams['depositEndDate'] = $args['depositEndDate'];
         }
 
         if (!empty($args['depositorOrgRegNumber'])) {
-            $queryParts[] = "depositorOrgRegNumber='".$args['depositorOrgRegNumber']."'";
+            $queryParts['depositorOrgRegNumber'] = "depositorOrgRegNumber= :depositorOrgRegNumber";
+            $queryParams['depositorOrgRegNumber'] = $args['depositorOrgRegNumber'];
         }
         if (!empty($args['filePlanPosition'])) {
-            $queryParts[] = "filePlanPosition='".$args['filePlanPosition']."'";
+            $queryParts['filePlanPosition'] = "filePlanPosition= :filePlanPosition";
+            $queryParams['filePlanPosition'] = $args['filePlanPosition'];
         }
         if ($args['hasParent'] == true) {
-            $queryParts[] = "parentArchiveId!=null";
+            $queryParts['parentArchiveId'] = "parentArchiveId!=null";
         }
         if ($args['hasParent']  === false) {
-            $queryParts[] = "parentArchiveId=null";
+            $queryParts['hasParent'] = "parentArchiveId=null";
         }
 
         $accessRuleAssert = $this->getAccessRuleAssert($currentDateString);
+
         if ($accessRuleAssert) {
             $queryParts[] = $accessRuleAssert;
         }
diff --git a/src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php b/src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php
index b5c82bbfb..3d25c72c8 100755
--- a/src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php
@@ -99,13 +99,13 @@ trait archiveCommunicationTrait
             'originatingDate' => [$originatingStartDate, $originatingEndDate], // [0] startDate, [1] endDate
         ];
 
-        $queryParts = array();
         $queryParams = array();
 
         if (!empty($description) || !empty($text)) {
+
             $searchClasses = [];
             if (!$profileReference) {
-                 $searchClasses['recordsManagement/description'] = $this->useDescriptionController('recordsManagement/description');
+                $searchClasses['recordsManagement/description'] = $this->useDescriptionController('recordsManagement/description');
 
                 $descriptionClassController = \laabs::newController('recordsManagement/descriptionClass');
 
@@ -123,97 +123,30 @@ trait archiveCommunicationTrait
             foreach ($searchClasses as $descriptionClass => $descriptionController) {
                 $archives = array_merge($archives, $descriptionController->search($description, $text, $archiveArgs));
             }
-
         } else {
-            if ($archiveId){
-                $queryParts['archiveId'] = "archiveId = :archiveId";
-                $queryParams['archiveId'] = $archiveId;
-            } else {
-                if ($profileReference){
-                    $queryParts['archivalProfileReference'] = "archivalProfileReference = :archivalProfileReference";
-                    $queryParams['archivalProfileReference'] = $profileReference;
-                }
-
-                if ($status){
-                    $queryParts['status'] = "status = :status";
-                    $queryParams['status'] = $status;
-                }
-
-                if ($retentionRuleCode){
-                    $queryParts['retentionRuleCode'] = "retentionRuleCode = :retentionRuleCode";
-                    $queryParams['retentionRuleCode'] = $retentionRuleCode;
-                }
-
-                if ($originatorOrgRegNumber){
-                    $queryParts['originatorOrgRegNumber'] = "originatorOrgRegNumber = :originatorOrgRegNumber";
-                    $queryParams['originatorOrgRegNumber'] = $originatorOrgRegNumber;
-                }
+            $queryString = $this->getArchiveAssert($archiveArgs,$queryParams);
 
-                if ($finalDisposition){
-                    $queryParts['finalDisposition'] = "finalDisposition = :finalDisposition";
-                    $queryParams['finalDisposition'] = $finalDisposition;
-                }
-
-                if ($originatingStartDate && $originatingEndDate) {
-                    $queryParams['originatingStartDate'] = $originatingStartDate;
-                    $queryParams['originatingEndDate'] = $originatingEndDate;
-                    $queryParts['depositDate'] = "originatingDate >= :originatingStartDate AND originatingDate <= :originatingEndDate";
-                } elseif ($originatingStartDate) {
-                    $queryParams['originatingStartDate'] = $originatingStartDate;
-                    $queryParts['depositDate'] = "originatingDate >= :depositStartDate";
-
-                } elseif ($originatingEndDate) {
-                    $queryParams['originatingEndDate'] = $originatingEndDate;
-                    $queryParts['date'] = "originatingDate <= :originatingEndDate";
-                }
-
-                if ($depositStartDate && $depositEndDate) {
-                    $queryParams['depositStartDate'] = $depositStartDate;
-                    $queryParams['depositEndDate'] = $depositEndDate;
-                    $queryParts['depositDate'] = "depositDate >= :depositStartDate AND depositDate <= :depositEndDate";
-                } elseif ($depositStartDate) {
-                    $queryParams['depositStartDate'] = $depositStartDate;
-                    $queryParts['depositDate'] = "depositDate >= :depositStartDate";
-
-                } elseif ($depositEndDate) {
-                    $queryParams['depositEndDate'] = $depositEndDate;
-                    $queryParts['date'] = "depositDate <= :depositEndDate";
-                }
-                if($archiveExpired){
-                    $currentDate = \laabs::newDate();
-                    $currentDateString = $currentDate->format('Y-m-d');
-                    if ($archiveExpired == "true") {
+            $originators = array();
+            foreach ((array) $this->organizationController->getOrgsByRole('originator') as $originator) {
+                $originators[$originator->registrationNumber] = $originator;
+            }
 
-                        $queryParams['disposalDate'] = $currentDateString;
-                        $queryParts['disposalDate'] = "disposalDate <= :disposalDate";
-                    }else if($archiveExpired == "false"){
-                        $queryParams['disposalDate'] = $currentDateString;
-                        $queryParts['disposalDate'] = "disposalDate >= :disposalDate";
-                    }
+            $archives = $this->sdoFactory->find('recordsManagement/archive', $queryString, $queryParams, false, false, 100);
+            foreach ($archives as $archive) {
+                if (!empty($archive->disposalDate) && $archive->disposalDate <= \laabs::newDate()) {
+                    $archive->disposable = true;
                 }
 
-                if($partialRetentionRule){
-                    $queryParts['partialRetentionRule'] = "(retentionDuration=NULL OR retentionStartDate=NULL OR retentionRuleCode=NULL)";
+                if (isset($originators[$archive->originatorOrgRegNumber])) {
+                    $archive->originator = $originators[$archive->originatorOrgRegNumber];
                 }
-
-            }
-            $queryString = \laabs\implode(' AND ', $queryParts);
-            $archives = $this->sdoFactory->find('recordsManagement/archive', $queryString, $queryParams, false, false, 100);
-        }
-
-        foreach ($archives as $archive) {
-            if (!empty($archive->disposalDate) && $archive->disposalDate <= \laabs::newDate()) {
-                $archive->disposable = true;
-            }
-
-            if (isset($originators[$archive->originatorOrgRegNumber])) {
-                $archive->originator = $originators[$archive->originatorOrgRegNumber];
             }
         }
 
         return $archives;
     }
 
+
     /**
      * Restitute an archive
      * @param string $archiveId The idetifier of the archive
diff --git a/src/bundle/recordsManagement/Controller/description.php b/src/bundle/recordsManagement/Controller/description.php
index 807008728..d08ce1f63 100755
--- a/src/bundle/recordsManagement/Controller/description.php
+++ b/src/bundle/recordsManagement/Controller/description.php
@@ -136,7 +136,7 @@ class description implements \bundle\recordsManagement\Controller\archiveDescrip
         $queryParams = [];
         $queryParts = ['description!=null and text!=null'];
 
-        $queryParts[] = \laabs::newController('recordsManagement/archive')->getArchiveAssert($archiveArgs);
+        $queryParts[] = \laabs::newController('recordsManagement/archive')->getArchiveAssert($archiveArgs,$queryParams);
         
         // Json
         if (!empty($description)) {
@@ -170,7 +170,7 @@ class description implements \bundle\recordsManagement\Controller\archiveDescrip
 
         $queryString = \laabs\implode(' and ', $queryParts);
 
-        $archiveUnits = $this->sdoFactory->find('recordsManagement/archiveUnit', $queryString);
+        $archiveUnits = $this->sdoFactory->find('recordsManagement/archiveUnit', $queryString,$queryParams);
 
         foreach ($archiveUnits as $archiveUnit) {
             $archiveUnit->descriptionObject = json_decode($archiveUnit->description);
-- 
GitLab


From c4ec7a21153ae6ef0e63d2ed6620f29942eed499 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Mon, 5 Mar 2018 17:05:17 +0100
Subject: [PATCH 18/25] #7332 - country format

---
 .../organization/Controller/orgContact.php    |   11 +
 .../Resources/countries-codes.json            | 1247 +++++++++++++++++
 .../organization/orgContactInterface.php      |    7 +
 .../Presenter/organization/orgTree.php        |    2 +
 .../Resources/locale/fr/contact/contact.po    |    2 +
 .../locale/fr/organization/messages.po        |    1 -
 .../contact/manageContact/addressForm.html    |   17 +-
 7 files changed, 1284 insertions(+), 3 deletions(-)
 create mode 100644 src/bundle/organization/Resources/countries-codes.json

diff --git a/src/bundle/organization/Controller/orgContact.php b/src/bundle/organization/Controller/orgContact.php
index 8cc8e7f0a..f49ed2240 100755
--- a/src/bundle/organization/Controller/orgContact.php
+++ b/src/bundle/organization/Controller/orgContact.php
@@ -98,4 +98,15 @@ class orgContact
         return true;
     }
 
+    public function loadCountriesCodes()
+    {
+        $filename = 'organization'.LAABS_URI_SEPARATOR. 'countries-codes.json';
+        $router = new \core\Route\ResourceRouter($filename);
+        $file = file_get_contents($router->getResource()->getRealPath());
+
+        $countriesCodes = json_decode($file);
+
+        return $countriesCodes;
+    }
+
 }
diff --git a/src/bundle/organization/Resources/countries-codes.json b/src/bundle/organization/Resources/countries-codes.json
new file mode 100644
index 000000000..f29dd7f28
--- /dev/null
+++ b/src/bundle/organization/Resources/countries-codes.json
@@ -0,0 +1,1247 @@
+[
+  {
+    "name": "Afghanistan",
+    "alpha2": "AF",
+    "country-code": "004"
+  },
+  {
+    "name": "Åland Islands",
+    "alpha2": "AX",
+    "country-code": "248"
+  },
+  {
+    "name": "Albania",
+    "alpha2": "AL",
+    "country-code": "008"
+  },
+  {
+    "name": "Algeria",
+    "alpha2": "DZ",
+    "country-code": "012"
+  },
+  {
+    "name": "American Samoa",
+    "alpha2": "AS",
+    "country-code": "016"
+  },
+  {
+    "name": "Andorra",
+    "alpha2": "AD",
+    "country-code": "020"
+  },
+  {
+    "name": "Angola",
+    "alpha2": "AO",
+    "country-code": "024"
+  },
+  {
+    "name": "Anguilla",
+    "alpha2": "AI",
+    "country-code": "660"
+  },
+  {
+    "name": "Antarctica",
+    "alpha2": "AQ",
+    "country-code": "010"
+  },
+  {
+    "name": "Antigua and Barbuda",
+    "alpha2": "AG",
+    "country-code": "028"
+  },
+  {
+    "name": "Argentina",
+    "alpha2": "AR",
+    "country-code": "032"
+  },
+  {
+    "name": "Armenia",
+    "alpha2": "AM",
+    "country-code": "051"
+  },
+  {
+    "name": "Aruba",
+    "alpha2": "AW",
+    "country-code": "533"
+  },
+  {
+    "name": "Australia",
+    "alpha2": "AU",
+    "country-code": "036"
+  },
+  {
+    "name": "Austria",
+    "alpha2": "AT",
+    "country-code": "040"
+  },
+  {
+    "name": "Azerbaijan",
+    "alpha2": "AZ",
+    "country-code": "031"
+  },
+  {
+    "name": "Bahamas",
+    "alpha2": "BS",
+    "country-code": "044"
+  },
+  {
+    "name": "Bahrain",
+    "alpha2": "BH",
+    "country-code": "048"
+  },
+  {
+    "name": "Bangladesh",
+    "alpha2": "BD",
+    "country-code": "050"
+  },
+  {
+    "name": "Barbados",
+    "alpha2": "BB",
+    "country-code": "052"
+  },
+  {
+    "name": "Belarus",
+    "alpha2": "BY",
+    "country-code": "112"
+  },
+  {
+    "name": "Belgium",
+    "alpha2": "BE",
+    "country-code": "056"
+  },
+  {
+    "name": "Belize",
+    "alpha2": "BZ",
+    "country-code": "084"
+  },
+  {
+    "name": "Benin",
+    "alpha2": "BJ",
+    "country-code": "204"
+  },
+  {
+    "name": "Bermuda",
+    "alpha2": "BM",
+    "country-code": "060"
+  },
+  {
+    "name": "Bhutan",
+    "alpha2": "BT",
+    "country-code": "064"
+  },
+  {
+    "name": "Bolivia (Plurinational State of)",
+    "alpha2": "BO",
+    "country-code": "068"
+  },
+  {
+    "name": "Bonaire, Sint Eustatius and Saba",
+    "alpha2": "BQ",
+    "country-code": "535"
+  },
+  {
+    "name": "Bosnia and Herzegovina",
+    "alpha2": "BA",
+    "country-code": "070"
+  },
+  {
+    "name": "Botswana",
+    "alpha2": "BW",
+    "country-code": "072"
+  },
+  {
+    "name": "Bouvet Island",
+    "alpha2": "BV",
+    "country-code": "074"
+  },
+  {
+    "name": "Brazil",
+    "alpha2": "BR",
+    "country-code": "076"
+  },
+  {
+    "name": "British Indian Ocean Territory",
+    "alpha2": "IO",
+    "country-code": "086"
+  },
+  {
+    "name": "Brunei Darussalam",
+    "alpha2": "BN",
+    "country-code": "096"
+  },
+  {
+    "name": "Bulgaria",
+    "alpha2": "BG",
+    "country-code": "100"
+  },
+  {
+    "name": "Burkina Faso",
+    "alpha2": "BF",
+    "country-code": "854"
+  },
+  {
+    "name": "Burundi",
+    "alpha2": "BI",
+    "country-code": "108"
+  },
+  {
+    "name": "Cambodia",
+    "alpha2": "KH",
+    "country-code": "116"
+  },
+  {
+    "name": "Cameroon",
+    "alpha2": "CM",
+    "country-code": "120"
+  },
+  {
+    "name": "Canada",
+    "alpha2": "CA",
+    "country-code": "124"
+  },
+  {
+    "name": "Cabo Verde",
+    "alpha2": "CV",
+    "country-code": "132"
+  },
+  {
+    "name": "Cayman Islands",
+    "alpha2": "KY",
+    "country-code": "136"
+  },
+  {
+    "name": "Central African Republic",
+    "alpha2": "CF",
+    "country-code": "140"
+  },
+  {
+    "name": "Chad",
+    "alpha2": "TD",
+    "country-code": "148"
+  },
+  {
+    "name": "Chile",
+    "alpha2": "CL",
+    "country-code": "152"
+  },
+  {
+    "name": "China",
+    "alpha2": "CN",
+    "country-code": "156"
+  },
+  {
+    "name": "Christmas Island",
+    "alpha2": "CX",
+    "country-code": "162"
+  },
+  {
+    "name": "Cocos (Keeling) Islands",
+    "alpha2": "CC",
+    "country-code": "166"
+  },
+  {
+    "name": "Colombia",
+    "alpha2": "CO",
+    "country-code": "170"
+  },
+  {
+    "name": "Comoros",
+    "alpha2": "KM",
+    "country-code": "174"
+  },
+  {
+    "name": "Congo",
+    "alpha2": "CG",
+    "country-code": "178"
+  },
+  {
+    "name": "Congo (Democratic Republic of the)",
+    "alpha2": "CD",
+    "country-code": "180"
+  },
+  {
+    "name": "Cook Islands",
+    "alpha2": "CK",
+    "country-code": "184"
+  },
+  {
+    "name": "Costa Rica",
+    "alpha2": "CR",
+    "country-code": "188"
+  },
+  {
+    "name": "Côte d'Ivoire",
+    "alpha2": "CI",
+    "country-code": "384"
+  },
+  {
+    "name": "Croatia",
+    "alpha2": "HR",
+    "country-code": "191"
+  },
+  {
+    "name": "Cuba",
+    "alpha2": "CU",
+    "country-code": "192"
+  },
+  {
+    "name": "Curaçao",
+    "alpha2": "CW",
+    "country-code": "531"
+  },
+  {
+    "name": "Cyprus",
+    "alpha2": "CY",
+    "country-code": "196"
+  },
+  {
+    "name": "Czech Republic",
+    "alpha2": "CZ",
+    "country-code": "203"
+  },
+  {
+    "name": "Denmark",
+    "alpha2": "DK",
+    "country-code": "208"
+  },
+  {
+    "name": "Djibouti",
+    "alpha2": "DJ",
+    "country-code": "262"
+  },
+  {
+    "name": "Dominica",
+    "alpha2": "DM",
+    "country-code": "212"
+  },
+  {
+    "name": "Dominican Republic",
+    "alpha2": "DO",
+    "country-code": "214"
+  },
+  {
+    "name": "Ecuador",
+    "alpha2": "EC",
+    "country-code": "218"
+  },
+  {
+    "name": "Egypt",
+    "alpha2": "EG",
+    "country-code": "818"
+  },
+  {
+    "name": "El Salvador",
+    "alpha2": "SV",
+    "country-code": "222"
+  },
+  {
+    "name": "Equatorial Guinea",
+    "alpha2": "GQ",
+    "country-code": "226"
+  },
+  {
+    "name": "Eritrea",
+    "alpha2": "ER",
+    "country-code": "232"
+  },
+  {
+    "name": "Estonia",
+    "alpha2": "EE",
+    "country-code": "233"
+  },
+  {
+    "name": "Ethiopia",
+    "alpha2": "ET",
+    "country-code": "231"
+  },
+  {
+    "name": "Falkland Islands (Malvinas)",
+    "alpha2": "FK",
+    "country-code": "238"
+  },
+  {
+    "name": "Faroe Islands",
+    "alpha2": "FO",
+    "country-code": "234"
+  },
+  {
+    "name": "Fiji",
+    "alpha2": "FJ",
+    "country-code": "242"
+  },
+  {
+    "name": "Finland",
+    "alpha2": "FI",
+    "country-code": "246"
+  },
+  {
+    "name": "France",
+    "alpha2": "FR",
+    "country-code": "250"
+  },
+  {
+    "name": "French Guiana",
+    "alpha2": "GF",
+    "country-code": "254"
+  },
+  {
+    "name": "French Polynesia",
+    "alpha2": "PF",
+    "country-code": "258"
+  },
+  {
+    "name": "French Southern Territories",
+    "alpha2": "TF",
+    "country-code": "260"
+  },
+  {
+    "name": "Gabon",
+    "alpha2": "GA",
+    "country-code": "266"
+  },
+  {
+    "name": "Gambia",
+    "alpha2": "GM",
+    "country-code": "270"
+  },
+  {
+    "name": "Georgia",
+    "alpha2": "GE",
+    "country-code": "268"
+  },
+  {
+    "name": "Germany",
+    "alpha2": "DE",
+    "country-code": "276"
+  },
+  {
+    "name": "Ghana",
+    "alpha2": "GH",
+    "country-code": "288"
+  },
+  {
+    "name": "Gibraltar",
+    "alpha2": "GI",
+    "country-code": "292"
+  },
+  {
+    "name": "Greece",
+    "alpha2": "GR",
+    "country-code": "300"
+  },
+  {
+    "name": "Greenland",
+    "alpha2": "GL",
+    "country-code": "304"
+  },
+  {
+    "name": "Grenada",
+    "alpha2": "GD",
+    "country-code": "308"
+  },
+  {
+    "name": "Guadeloupe",
+    "alpha2": "GP",
+    "country-code": "312"
+  },
+  {
+    "name": "Guam",
+    "alpha2": "GU",
+    "country-code": "316"
+  },
+  {
+    "name": "Guatemala",
+    "alpha2": "GT",
+    "country-code": "320"
+  },
+  {
+    "name": "Guernsey",
+    "alpha2": "GG",
+    "country-code": "831"
+  },
+  {
+    "name": "Guinea",
+    "alpha2": "GN",
+    "country-code": "324"
+  },
+  {
+    "name": "Guinea-Bissau",
+    "alpha2": "GW",
+    "country-code": "624"
+  },
+  {
+    "name": "Guyana",
+    "alpha2": "GY",
+    "country-code": "328"
+  },
+  {
+    "name": "Haiti",
+    "alpha2": "HT",
+    "country-code": "332"
+  },
+  {
+    "name": "Heard Island and McDonald Islands",
+    "alpha2": "HM",
+    "country-code": "334"
+  },
+  {
+    "name": "Holy See",
+    "alpha2": "VA",
+    "country-code": "336"
+  },
+  {
+    "name": "Honduras",
+    "alpha2": "HN",
+    "country-code": "340"
+  },
+  {
+    "name": "Hong Kong",
+    "alpha2": "HK",
+    "country-code": "344"
+  },
+  {
+    "name": "Hungary",
+    "alpha2": "HU",
+    "country-code": "348"
+  },
+  {
+    "name": "Iceland",
+    "alpha2": "IS",
+    "country-code": "352"
+  },
+  {
+    "name": "India",
+    "alpha2": "IN",
+    "country-code": "356"
+  },
+  {
+    "name": "Indonesia",
+    "alpha2": "ID",
+    "country-code": "360"
+  },
+  {
+    "name": "Iran (Islamic Republic of)",
+    "alpha2": "IR",
+    "country-code": "364"
+  },
+  {
+    "name": "Iraq",
+    "alpha2": "IQ",
+    "country-code": "368"
+  },
+  {
+    "name": "Ireland",
+    "alpha2": "IE",
+    "country-code": "372"
+  },
+  {
+    "name": "Isle of Man",
+    "alpha2": "IM",
+    "country-code": "833"
+  },
+  {
+    "name": "Israel",
+    "alpha2": "IL",
+    "country-code": "376"
+  },
+  {
+    "name": "Italy",
+    "alpha2": "IT",
+    "country-code": "380"
+  },
+  {
+    "name": "Jamaica",
+    "alpha2": "JM",
+    "country-code": "388"
+  },
+  {
+    "name": "Japan",
+    "alpha2": "JP",
+    "country-code": "392"
+  },
+  {
+    "name": "Jersey",
+    "alpha2": "JE",
+    "country-code": "832"
+  },
+  {
+    "name": "Jordan",
+    "alpha2": "JO",
+    "country-code": "400"
+  },
+  {
+    "name": "Kazakhstan",
+    "alpha2": "KZ",
+    "country-code": "398"
+  },
+  {
+    "name": "Kenya",
+    "alpha2": "KE",
+    "country-code": "404"
+  },
+  {
+    "name": "Kiribati",
+    "alpha2": "KI",
+    "country-code": "296"
+  },
+  {
+    "name": "Korea (Democratic People's Republic of)",
+    "alpha2": "KP",
+    "country-code": "408"
+  },
+  {
+    "name": "Korea (Republic of)",
+    "alpha2": "KR",
+    "country-code": "410"
+  },
+  {
+    "name": "Kuwait",
+    "alpha2": "KW",
+    "country-code": "414"
+  },
+  {
+    "name": "Kyrgyzstan",
+    "alpha2": "KG",
+    "country-code": "417"
+  },
+  {
+    "name": "Lao People's Democratic Republic",
+    "alpha2": "LA",
+    "country-code": "418"
+  },
+  {
+    "name": "Latvia",
+    "alpha2": "LV",
+    "country-code": "428"
+  },
+  {
+    "name": "Lebanon",
+    "alpha2": "LB",
+    "country-code": "422"
+  },
+  {
+    "name": "Lesotho",
+    "alpha2": "LS",
+    "country-code": "426"
+  },
+  {
+    "name": "Liberia",
+    "alpha2": "LR",
+    "country-code": "430"
+  },
+  {
+    "name": "Libya",
+    "alpha2": "LY",
+    "country-code": "434"
+  },
+  {
+    "name": "Liechtenstein",
+    "alpha2": "LI",
+    "country-code": "438"
+  },
+  {
+    "name": "Lithuania",
+    "alpha2": "LT",
+    "country-code": "440"
+  },
+  {
+    "name": "Luxembourg",
+    "alpha2": "LU",
+    "country-code": "442"
+  },
+  {
+    "name": "Macao",
+    "alpha2": "MO",
+    "country-code": "446"
+  },
+  {
+    "name": "Macedonia (the former Yugoslav Republic of)",
+    "alpha2": "MK",
+    "country-code": "807"
+  },
+  {
+    "name": "Madagascar",
+    "alpha2": "MG",
+    "country-code": "450"
+  },
+  {
+    "name": "Malawi",
+    "alpha2": "MW",
+    "country-code": "454"
+  },
+  {
+    "name": "Malaysia",
+    "alpha2": "MY",
+    "country-code": "458"
+  },
+  {
+    "name": "Maldives",
+    "alpha2": "MV",
+    "country-code": "462"
+  },
+  {
+    "name": "Mali",
+    "alpha2": "ML",
+    "country-code": "466"
+  },
+  {
+    "name": "Malta",
+    "alpha2": "MT",
+    "country-code": "470"
+  },
+  {
+    "name": "Marshall Islands",
+    "alpha2": "MH",
+    "country-code": "584"
+  },
+  {
+    "name": "Martinique",
+    "alpha2": "MQ",
+    "country-code": "474"
+  },
+  {
+    "name": "Mauritania",
+    "alpha2": "MR",
+    "country-code": "478"
+  },
+  {
+    "name": "Mauritius",
+    "alpha2": "MU",
+    "country-code": "480"
+  },
+  {
+    "name": "Mayotte",
+    "alpha2": "YT",
+    "country-code": "175"
+  },
+  {
+    "name": "Mexico",
+    "alpha2": "MX",
+    "country-code": "484"
+  },
+  {
+    "name": "Micronesia (Federated States of)",
+    "alpha2": "FM",
+    "country-code": "583"
+  },
+  {
+    "name": "Moldova (Republic of)",
+    "alpha2": "MD",
+    "country-code": "498"
+  },
+  {
+    "name": "Monaco",
+    "alpha2": "MC",
+    "country-code": "492"
+  },
+  {
+    "name": "Mongolia",
+    "alpha2": "MN",
+    "country-code": "496"
+  },
+  {
+    "name": "Montenegro",
+    "alpha2": "ME",
+    "country-code": "499"
+  },
+  {
+    "name": "Montserrat",
+    "alpha2": "MS",
+    "country-code": "500"
+  },
+  {
+    "name": "Morocco",
+    "alpha2": "MA",
+    "country-code": "504"
+  },
+  {
+    "name": "Mozambique",
+    "alpha2": "MZ",
+    "country-code": "508"
+  },
+  {
+    "name": "Myanmar",
+    "alpha2": "MM",
+    "country-code": "104"
+  },
+  {
+    "name": "Namibia",
+    "alpha2": "NA",
+    "country-code": "516"
+  },
+  {
+    "name": "Nauru",
+    "alpha2": "NR",
+    "country-code": "520"
+  },
+  {
+    "name": "Nepal",
+    "alpha2": "NP",
+    "country-code": "524"
+  },
+  {
+    "name": "Netherlands",
+    "alpha2": "NL",
+    "country-code": "528"
+  },
+  {
+    "name": "New Caledonia",
+    "alpha2": "NC",
+    "country-code": "540"
+  },
+  {
+    "name": "New Zealand",
+    "alpha2": "NZ",
+    "country-code": "554"
+  },
+  {
+    "name": "Nicaragua",
+    "alpha2": "NI",
+    "country-code": "558"
+  },
+  {
+    "name": "Niger",
+    "alpha2": "NE",
+    "country-code": "562"
+  },
+  {
+    "name": "Nigeria",
+    "alpha2": "NG",
+    "country-code": "566"
+  },
+  {
+    "name": "Niue",
+    "alpha2": "NU",
+    "country-code": "570"
+  },
+  {
+    "name": "Norfolk Island",
+    "alpha2": "NF",
+    "country-code": "574"
+  },
+  {
+    "name": "Northern Mariana Islands",
+    "alpha2": "MP",
+    "country-code": "580"
+  },
+  {
+    "name": "Norway",
+    "alpha2": "NO",
+    "country-code": "578"
+  },
+  {
+    "name": "Oman",
+    "alpha2": "OM",
+    "country-code": "512"
+  },
+  {
+    "name": "Pakistan",
+    "alpha2": "PK",
+    "country-code": "586"
+  },
+  {
+    "name": "Palau",
+    "alpha2": "PW",
+    "country-code": "585"
+  },
+  {
+    "name": "Palestine, State of",
+    "alpha2": "PS",
+    "country-code": "275"
+  },
+  {
+    "name": "Panama",
+    "alpha2": "PA",
+    "country-code": "591"
+  },
+  {
+    "name": "Papua New Guinea",
+    "alpha2": "PG",
+    "country-code": "598"
+  },
+  {
+    "name": "Paraguay",
+    "alpha2": "PY",
+    "country-code": "600"
+  },
+  {
+    "name": "Peru",
+    "alpha2": "PE",
+    "country-code": "604"
+  },
+  {
+    "name": "Philippines",
+    "alpha2": "PH",
+    "country-code": "608"
+  },
+  {
+    "name": "Pitcairn",
+    "alpha2": "PN",
+    "country-code": "612"
+  },
+  {
+    "name": "Poland",
+    "alpha2": "PL",
+    "country-code": "616"
+  },
+  {
+    "name": "Portugal",
+    "alpha2": "PT",
+    "country-code": "620"
+  },
+  {
+    "name": "Puerto Rico",
+    "alpha2": "PR",
+    "country-code": "630"
+  },
+  {
+    "name": "Qatar",
+    "alpha2": "QA",
+    "country-code": "634"
+  },
+  {
+    "name": "Réunion",
+    "alpha2": "RE",
+    "country-code": "638"
+  },
+  {
+    "name": "Romania",
+    "alpha2": "RO",
+    "country-code": "642"
+  },
+  {
+    "name": "Russian Federation",
+    "alpha2": "RU",
+    "country-code": "643"
+  },
+  {
+    "name": "Rwanda",
+    "alpha2": "RW",
+    "country-code": "646"
+  },
+  {
+    "name": "Saint Barthélemy",
+    "alpha2": "BL",
+    "country-code": "652"
+  },
+  {
+    "name": "Saint Helena, Ascension and Tristan da Cunha",
+    "alpha2": "SH",
+    "country-code": "654"
+  },
+  {
+    "name": "Saint Kitts and Nevis",
+    "alpha2": "KN",
+    "country-code": "659"
+  },
+  {
+    "name": "Saint Lucia",
+    "alpha2": "LC",
+    "country-code": "662"
+  },
+  {
+    "name": "Saint Martin (French part)",
+    "alpha2": "MF",
+    "country-code": "663"
+  },
+  {
+    "name": "Saint Pierre and Miquelon",
+    "alpha2": "PM",
+    "country-code": "666"
+  },
+  {
+    "name": "Saint Vincent and the Grenadines",
+    "alpha2": "VC",
+    "country-code": "670"
+  },
+  {
+    "name": "Samoa",
+    "alpha2": "WS",
+    "country-code": "882"
+  },
+  {
+    "name": "San Marino",
+    "alpha2": "SM",
+    "country-code": "674"
+  },
+  {
+    "name": "Sao Tome and Principe",
+    "alpha2": "ST",
+    "country-code": "678"
+  },
+  {
+    "name": "Saudi Arabia",
+    "alpha2": "SA",
+    "country-code": "682"
+  },
+  {
+    "name": "Senegal",
+    "alpha2": "SN",
+    "country-code": "686"
+  },
+  {
+    "name": "Serbia",
+    "alpha2": "RS",
+    "country-code": "688"
+  },
+  {
+    "name": "Seychelles",
+    "alpha2": "SC",
+    "country-code": "690"
+  },
+  {
+    "name": "Sierra Leone",
+    "alpha2": "SL",
+    "country-code": "694"
+  },
+  {
+    "name": "Singapore",
+    "alpha2": "SG",
+    "country-code": "702"
+  },
+  {
+    "name": "Sint Maarten (Dutch part)",
+    "alpha2": "SX",
+    "country-code": "534"
+  },
+  {
+    "name": "Slovakia",
+    "alpha2": "SK",
+    "country-code": "703"
+  },
+  {
+    "name": "Slovenia",
+    "alpha2": "SI",
+    "country-code": "705"
+  },
+  {
+    "name": "Solomon Islands",
+    "alpha2": "SB",
+    "country-code": "090"
+  },
+  {
+    "name": "Somalia",
+    "alpha2": "SO",
+    "country-code": "706"
+  },
+  {
+    "name": "South Africa",
+    "alpha2": "ZA",
+    "country-code": "710"
+  },
+  {
+    "name": "South Georgia and the South Sandwich Islands",
+    "alpha2": "GS",
+    "country-code": "239"
+  },
+  {
+    "name": "South Sudan",
+    "alpha2": "SS",
+    "country-code": "728"
+  },
+  {
+    "name": "Spain",
+    "alpha2": "ES",
+    "country-code": "724"
+  },
+  {
+    "name": "Sri Lanka",
+    "alpha2": "LK",
+    "country-code": "144"
+  },
+  {
+    "name": "Sudan",
+    "alpha2": "SD",
+    "country-code": "729"
+  },
+  {
+    "name": "Suriname",
+    "alpha2": "SR",
+    "country-code": "740"
+  },
+  {
+    "name": "Svalbard and Jan Mayen",
+    "alpha2": "SJ",
+    "country-code": "744"
+  },
+  {
+    "name": "Swaziland",
+    "alpha2": "SZ",
+    "country-code": "748"
+  },
+  {
+    "name": "Sweden",
+    "alpha2": "SE",
+    "country-code": "752"
+  },
+  {
+    "name": "Switzerland",
+    "alpha2": "CH",
+    "country-code": "756"
+  },
+  {
+    "name": "Syrian Arab Republic",
+    "alpha2": "SY",
+    "country-code": "760"
+  },
+  {
+    "name": "Taiwan, Province of China",
+    "alpha2": "TW",
+    "country-code": "158"
+  },
+  {
+    "name": "Tajikistan",
+    "alpha2": "TJ",
+    "country-code": "762"
+  },
+  {
+    "name": "Tanzania, United Republic of",
+    "alpha2": "TZ",
+    "country-code": "834"
+  },
+  {
+    "name": "Thailand",
+    "alpha2": "TH",
+    "country-code": "764"
+  },
+  {
+    "name": "Timor-Leste",
+    "alpha2": "TL",
+    "country-code": "626"
+  },
+  {
+    "name": "Togo",
+    "alpha2": "TG",
+    "country-code": "768"
+  },
+  {
+    "name": "Tokelau",
+    "alpha2": "TK",
+    "country-code": "772"
+  },
+  {
+    "name": "Tonga",
+    "alpha2": "TO",
+    "country-code": "776"
+  },
+  {
+    "name": "Trinidad and Tobago",
+    "alpha2": "TT",
+    "country-code": "780"
+  },
+  {
+    "name": "Tunisia",
+    "alpha2": "TN",
+    "country-code": "788"
+  },
+  {
+    "name": "Turkey",
+    "alpha2": "TR",
+    "country-code": "792"
+  },
+  {
+    "name": "Turkmenistan",
+    "alpha2": "TM",
+    "country-code": "795"
+  },
+  {
+    "name": "Turks and Caicos Islands",
+    "alpha2": "TC",
+    "country-code": "796"
+  },
+  {
+    "name": "Tuvalu",
+    "alpha2": "TV",
+    "country-code": "798"
+  },
+  {
+    "name": "Uganda",
+    "alpha2": "UG",
+    "country-code": "800"
+  },
+  {
+    "name": "Ukraine",
+    "alpha2": "UA",
+    "country-code": "804"
+  },
+  {
+    "name": "United Arab Emirates",
+    "alpha2": "AE",
+    "country-code": "784"
+  },
+  {
+    "name": "United Kingdom of Great Britain and Northern Ireland",
+    "alpha2": "GB",
+    "country-code": "826"
+  },
+  {
+    "name": "United States of America",
+    "alpha2": "US",
+    "country-code": "840"
+  },
+  {
+    "name": "United States Minor Outlying Islands",
+    "alpha2": "UM",
+    "country-code": "581"
+  },
+  {
+    "name": "Uruguay",
+    "alpha2": "UY",
+    "country-code": "858"
+  },
+  {
+    "name": "Uzbekistan",
+    "alpha2": "UZ",
+    "country-code": "860"
+  },
+  {
+    "name": "Vanuatu",
+    "alpha2": "VU",
+    "country-code": "548"
+  },
+  {
+    "name": "Venezuela (Bolivarian Republic of)",
+    "alpha2": "VE",
+    "country-code": "862"
+  },
+  {
+    "name": "Viet Nam",
+    "alpha2": "VN",
+    "country-code": "704"
+  },
+  {
+    "name": "Virgin Islands (British)",
+    "alpha2": "VG",
+    "country-code": "092"
+  },
+  {
+    "name": "Virgin Islands (U.S.)",
+    "alpha2": "VI",
+    "country-code": "850"
+  },
+  {
+    "name": "Wallis and Futuna",
+    "alpha2": "WF",
+    "country-code": "876"
+  },
+  {
+    "name": "Western Sahara",
+    "alpha2": "EH",
+    "country-code": "732"
+  },
+  {
+    "name": "Yemen",
+    "alpha2": "YE",
+    "country-code": "887"
+  },
+  {
+    "name": "Zambia",
+    "alpha2": "ZM",
+    "country-code": "894"
+  },
+  {
+    "name": "Zimbabwe",
+    "alpha2": "ZW",
+    "country-code": "716"
+  }
+]
\ No newline at end of file
diff --git a/src/bundle/organization/orgContactInterface.php b/src/bundle/organization/orgContactInterface.php
index 25314eec0..8c19fef14 100755
--- a/src/bundle/organization/orgContactInterface.php
+++ b/src/bundle/organization/orgContactInterface.php
@@ -56,4 +56,11 @@ interface orgContactInterface
      * @action organization/orgContact/create
      */
     public function deleteOrgcontact($orgContact);
+
+    /**
+     * Get countries codes
+     *
+     * @action organization/orgContact/loadCountriesCodes
+     */
+    public function readCountriesCodes();
 }
diff --git a/src/presentation/maarchRM/Presenter/organization/orgTree.php b/src/presentation/maarchRM/Presenter/organization/orgTree.php
index 9b95e4df2..81a973cad 100755
--- a/src/presentation/maarchRM/Presenter/organization/orgTree.php
+++ b/src/presentation/maarchRM/Presenter/organization/orgTree.php
@@ -71,6 +71,7 @@ class orgTree
     {
         $this->view->addContentFile("organization/organizationIndex.html");
         $communicationMeans = \laabs::callService("contact/communicationMean/readIndex");
+        $countriesCodes = \laabs::callService("organization/orgContact/readCountriesCodes");
         $archivalProfile = \laabs::callService('recordsManagement/archivalProfile/readIndex');
         $serviceLevel = \laabs::callService('recordsManagement/serviceLevel/readIndex');
 
@@ -90,6 +91,7 @@ class orgTree
         $this->view->setSource("orgType", $orgType);
         $this->view->setSource("orgRole", $orgRole);
         $this->view->setSource("communicationMeans", $communicationMeans);
+        $this->view->setSource("countriesCodes", $countriesCodes);
         $this->view->setSource("archivalProfile", $archivalProfile);
         $this->view->setSource("serviceLevel", $serviceLevel);
         $this->view->merge();
diff --git a/src/presentation/maarchRM/Resources/locale/fr/contact/contact.po b/src/presentation/maarchRM/Resources/locale/fr/contact/contact.po
index a18f463d3..ea8354d21 100755
--- a/src/presentation/maarchRM/Resources/locale/fr/contact/contact.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/contact/contact.po
@@ -182,3 +182,5 @@ msgstr "Une adresse portant cette désignation existe déjà."
 msgid "A communication mean with this purpose already exist."
 msgstr "Un moyen de communication portant cette désignation existe déjà."
 
+msgid "Select a language"
+msgstr "Choisissez un langage"
diff --git a/src/presentation/maarchRM/Resources/locale/fr/organization/messages.po b/src/presentation/maarchRM/Resources/locale/fr/organization/messages.po
index 1c127a72c..ae9cd57d7 100755
--- a/src/presentation/maarchRM/Resources/locale/fr/organization/messages.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/organization/messages.po
@@ -351,4 +351,3 @@ msgstr "Niveaux de service par défaut"
 
 msgid "Service level"
 msgstr "Niveaux de service "
-
diff --git a/src/presentation/maarchRM/Resources/view/contact/manageContact/addressForm.html b/src/presentation/maarchRM/Resources/view/contact/manageContact/addressForm.html
index fc858a2be..434f0d59d 100755
--- a/src/presentation/maarchRM/Resources/view/contact/manageContact/addressForm.html
+++ b/src/presentation/maarchRM/Resources/view/contact/manageContact/addressForm.html
@@ -87,8 +87,17 @@
             <input type="text" class="form-control" name="postBox" placeholder="Post box">
         </div>
         <div class="form-group col-md-9">
-            <label for="country">Country</label>
-            <input type="text" class="form-control" name="country" placeholder="Country">
+            <label for="country">Country</label><br>
+            <select class="form-group" name="country" id="country">
+                <option value="" >Select a language</option>
+                <option value="FR" selected>Français</option>
+                <option disabled="disabled">----</option>
+                <?merge countriesCodes ?>
+                <span>
+                    <?merge .alpha2.ifne('FR')?>
+                    <option value="[?merge .alpha2 ?]"><?merge .name ?></option>
+                </span>
+            </select>
         </div>
     </div>
 
@@ -214,6 +223,10 @@
                 }
             });
 
+            if ($('#country')) {
+                address['country'] = $('#country').val();
+            }
+
             return address;
         },
 
-- 
GitLab


From dbc7d5508cdb8b5249393578dbd36fe87a955b0f Mon Sep 17 00:00:00 2001
From: Alexis Ragot <alexis.ragot@maarch.org>
Date: Tue, 6 Mar 2018 08:48:10 +0100
Subject: [PATCH 19/25] fixed the hide event modal action

---
 .../recordsManagement/archive/modalModification.html  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
index 806356128..55af0b385 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
@@ -293,8 +293,13 @@
                 success     : function (response) {
                     gritter.show(response.message, response.status, response.errors);
                     if (response.status) {
-                        $('#archive_search').click();
                         ModificationModal.close();
+                        ModificationModal.modal.one('hidden.bs.modal', function () {
+                            console.log("passage");
+                            //$('#modificationModal').modal();*
+                            $('#archive_search').click();
+                        });
+
                     }
                 },
                 error       : function(response) {
@@ -304,8 +309,8 @@
         },
 
         close: function() {
-            this.modal.find('input, textarea').val('');
-            this.modal.modal('hide');
+            ModificationModal.modal.find('input, textarea').val('');
+            ModificationModal.modal.modal('hide');
         },
 
         loadAccessCode: function() {
-- 
GitLab


From dfad591050a08709002808e85f81aea932d02b3d Mon Sep 17 00:00:00 2001
From: Correia Lopes Dylan <dylan.correia@hotmail.com>
Date: Wed, 7 Mar 2018 10:54:11 +0100
Subject: [PATCH 20/25] #7318 hide button organization if the user it's not
 owner or superadmin

---
 .../maarchRM/Presenter/organization/orgTree.php            | 7 +++++++
 .../Resources/view/organization/organizationIndex.html     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/presentation/maarchRM/Presenter/organization/orgTree.php b/src/presentation/maarchRM/Presenter/organization/orgTree.php
index 9b95e4df2..85b3bc50f 100755
--- a/src/presentation/maarchRM/Presenter/organization/orgTree.php
+++ b/src/presentation/maarchRM/Presenter/organization/orgTree.php
@@ -79,6 +79,12 @@ class orgTree
             return strcmp($a->reference, $b->reference);
         });
 
+        if(\laabs::getToken("ORGANIZATION")){
+            $addOrganizationRight = in_array('owner',\laabs::getToken("ORGANIZATION")->orgRoleCodes);
+        } else {
+            $addOrganizationRight = true;
+        }
+
         $adminOrg = \laabs::callService('auth/userAccount/readHasprivilege', "adminFunc/adminOrganization");
         $adminUser = \laabs::callService('auth/userAccount/readHasprivilege', "adminFunc/adminOrgUser");
         $adminContact = \laabs::callService('auth/userAccount/readHasprivilege', "adminFunc/adminOrgContact");
@@ -92,6 +98,7 @@ class orgTree
         $this->view->setSource("communicationMeans", $communicationMeans);
         $this->view->setSource("archivalProfile", $archivalProfile);
         $this->view->setSource("serviceLevel", $serviceLevel);
+        $this->view->setSource("addOrganizationRight", $addOrganizationRight);
         $this->view->merge();
         $this->view->translate();
 
diff --git a/src/presentation/maarchRM/Resources/view/organization/organizationIndex.html b/src/presentation/maarchRM/Resources/view/organization/organizationIndex.html
index 687a25825..df26d72d6 100755
--- a/src/presentation/maarchRM/Resources/view/organization/organizationIndex.html
+++ b/src/presentation/maarchRM/Resources/view/organization/organizationIndex.html
@@ -18,6 +18,7 @@
     <div class="container-fluid" lang="en" data-translate-catalog="organization/messages">
         <div class="row">
             <div class="col-xs-12 col-md-5 col-lg-5" >
+                <?merge addOrganizationRight.bool() ?>
                 <button id="newOrganization" class="btn btn-default" title="Add a new organization"><i class="fa fa-plus">&nbsp;</i>New organization</button>
                 <?merge adminOrg.bool() ?>
                 <button id="exportFilePlan" class="btn btn-default" title="Export the file plan"><i class="fa fa-upload">&nbsp;</i>Export the file plan</button>
-- 
GitLab


From 324c00289c1176101a87bd819378086768c3548f Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Wed, 7 Mar 2018 16:43:23 +0100
Subject: [PATCH 21/25] #7314 - Changing checkRights function

---
 src/bundle/recordsManagement/Controller/archive.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bundle/recordsManagement/Controller/archive.php b/src/bundle/recordsManagement/Controller/archive.php
index 86940b561..f37009a4e 100755
--- a/src/bundle/recordsManagement/Controller/archive.php
+++ b/src/bundle/recordsManagement/Controller/archive.php
@@ -610,7 +610,7 @@ class archive
 
 
         $currentOrganization = \laabs::getToken("ORGANIZATION");
-        $userOrgList = [];
+        //$userOrgList = [];
         $positionController = null;
 
         if (!$currentOrganization) {
@@ -621,15 +621,15 @@ class archive
             return true;
         }
 
-        if ($account->accountType == "user") {
+        /*if ($account->accountType == "user") {
             $positionController = $this->userPositionController;
         } else {
             $positionController = $this->servicePositionController;
         }
 
-        $userOrgList = $positionController->listMyServices();
+        $userOrgList = $positionController->listMyServices();*/
 
-        if (!(in_array($archive->originatorOrgRegNumber, $userOrgList) || in_array($archive->archiverOrgRegNumber, $userOrgList))) {
+        if (($archive->originatorOrgRegNumber != $currentOrganization->registrationNumber) || ($archive->archiverOrgRegNumber == $currentOrganization->registrationNumber)) {
             throw \laabs::newException('recordsManagement/accessDeniedException', "Permission denied");
         }
 
-- 
GitLab


From a3e28df8ce31818a2e7158ece965544d4b1cb6d1 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Wed, 7 Mar 2018 17:07:45 +0100
Subject: [PATCH 22/25] #7368 - Scheduling

---
 .../view/batchProcessing/scheduling/schedulingForm.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/presentation/maarchRM/Resources/view/batchProcessing/scheduling/schedulingForm.html b/src/presentation/maarchRM/Resources/view/batchProcessing/scheduling/schedulingForm.html
index fb8e1ab41..065322f01 100755
--- a/src/presentation/maarchRM/Resources/view/batchProcessing/scheduling/schedulingForm.html
+++ b/src/presentation/maarchRM/Resources/view/batchProcessing/scheduling/schedulingForm.html
@@ -612,9 +612,9 @@
             let route = $('#taskId').find('option:selected').data('route');
 
             $('#serviceAccountId option').each(function(key, value) {
-                let privileges = $(this).data('privilege');
+                var privileges = $(this).data('privilege');
 
-                if (!privileges || $.inArray(route, privileges) === -1) {
+                if (!privileges || ($.inArray(route, privileges) === -1 && $.inArray("*", privileges) === -1)) {
                     $(this).addClass('hide');
                 } else {
                     $(this).removeClass('hide');
-- 
GitLab


From 6ee6c436feaeb2aa1ff2461d485f42ef739405c4 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Thu, 8 Mar 2018 12:05:50 +0100
Subject: [PATCH 23/25] #7368 - Path in lowercase

---
 .../batchProcessing/scheduling/schedulingForm.html     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/presentation/maarchRM/Resources/view/batchProcessing/scheduling/schedulingForm.html b/src/presentation/maarchRM/Resources/view/batchProcessing/scheduling/schedulingForm.html
index 065322f01..11f3a34c8 100755
--- a/src/presentation/maarchRM/Resources/view/batchProcessing/scheduling/schedulingForm.html
+++ b/src/presentation/maarchRM/Resources/view/batchProcessing/scheduling/schedulingForm.html
@@ -609,11 +609,17 @@
         },
 
         checkServiceAccount: function() {
-            let route = $('#taskId').find('option:selected').data('route');
+            var route = $('#taskId').find('option:selected').data('route').toLowerCase();
 
-            $('#serviceAccountId option').each(function(key, value) {
+            $('#serviceAccountId option').each(function() {
                 var privileges = $(this).data('privilege');
 
+                if (privileges) {
+                    for (var i = 0; i < privileges.length; i++) {
+                        privileges[i] = privileges[i].toLowerCase();
+                    }
+                }
+
                 if (!privileges || ($.inArray(route, privileges) === -1 && $.inArray("*", privileges) === -1)) {
                     $(this).addClass('hide');
                 } else {
-- 
GitLab


From f1597a612485c4a6ff2e6af35611d9460cac16be Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Fri, 16 Mar 2018 10:46:03 +0100
Subject: [PATCH 24/25] Fix : #7344 - Change of name and disposition

---
 .../maarchRM/Resources/locale/fr/medona/messages.po           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/presentation/maarchRM/Resources/locale/fr/medona/messages.po b/src/presentation/maarchRM/Resources/locale/fr/medona/messages.po
index b91d0a401..affb9df07 100755
--- a/src/presentation/maarchRM/Resources/locale/fr/medona/messages.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/medona/messages.po
@@ -621,6 +621,6 @@ msgid "Code"
 msgstr "Nom de la règle"
 msgctxt "meta-data"
 
-msgid "Default originator"
-msgstr "Service producteur par défaut"
+msgid "Default control authority"
+msgstr "Autorité de contrôle par défaut"
 
-- 
GitLab


From 7c0533b4594229f47629175224ab9545ef3e222f Mon Sep 17 00:00:00 2001
From: esomeblad <elodie.someblad@maarch.org>
Date: Fri, 16 Mar 2018 11:08:19 +0100
Subject: [PATCH 25/25] translations' edition

---
 src/presentation/maarchRM/Resources/locale/fr/auth/messages.po  | 2 +-
 .../Resources/locale/fr/digitalResource/conversionRule.po       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/presentation/maarchRM/Resources/locale/fr/auth/messages.po b/src/presentation/maarchRM/Resources/locale/fr/auth/messages.po
index 235c396bc..de17df26c 100755
--- a/src/presentation/maarchRM/Resources/locale/fr/auth/messages.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/auth/messages.po
@@ -476,7 +476,7 @@ msgid "Service account created"
 msgstr "Compte de service créé"
 
 msgid "Service already exist"
-msgstr "Le service existe déjà."
+msgstr "Le compte existe déjà."
 
 msgid "Last login date"
 msgstr "Date de la dernière connexion"
diff --git a/src/presentation/maarchRM/Resources/locale/fr/digitalResource/conversionRule.po b/src/presentation/maarchRM/Resources/locale/fr/digitalResource/conversionRule.po
index eff0b455f..098142fac 100755
--- a/src/presentation/maarchRM/Resources/locale/fr/digitalResource/conversionRule.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/digitalResource/conversionRule.po
@@ -21,7 +21,7 @@ msgid "Select a format"
 msgstr "Sélectionnez un format"
 
 msgid "Edit a new conversion rule"
-msgstr "Éditer une nouvelle règle de conversion"
+msgstr "Créer une nouvelle règle de conversion"
 
 msgid "Puid is empty"
 msgstr "Le PuID est vide"
-- 
GitLab