0039779: Login buttons needs the firstName and lastName properties

diff --git a/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java b/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
--- a/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
+++ b/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
@@ -128,7 +128,7 @@
         extraFilter = "not exists(from OBPOS_TerminalAccess ta where ta.userContact = user) or ";
       }
 
-      String hqlUser = "select distinct user.name, user.username, user.id "
+      String hqlUser = "select distinct user.name, user.username, user.id, user.firstName, user.lastName "
           + "from ADUser user, ADUserRoles userRoles, ADRole role, "
           + "ADFormAccess formAccess, OBPOS_Applications terminal "
           + "where user.active = true and "
@@ -177,6 +177,8 @@
         item.put("name", qryUserObjectItem[0]);
         item.put("userName", qryUserObjectItem[1]);
         item.put("userId", qryUserObjectItem[2]);
+        item.put("firstName", qryUserObjectItem[3]);
+        item.put("lastName", qryUserObjectItem[4]);
 
         // Get the image for the current user
         String hqlImage = "select image.mimetype, image.bindaryData "

diff --git a/web/org.openbravo.mobile.core/source/component/ob-login.js b/web/org.openbravo.mobile.core/source/component/ob-login.js
--- a/web/org.openbravo.mobile.core/source/component/ob-login.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-login.js
@@ -63,7 +63,6 @@
     if (this.showConnectionStatus) {
       OB.Dal.initCache(OB.Model.Session, [], null, null);
     }
-
     if (this.user) {
       this.$.bottomText.setContent(this.user);
     }
@@ -384,6 +383,8 @@
         userId = [],
         userName = [],
         image = [],
+        firstName = [],
+        lastName = [],
         target = this.$.loginUserContainer,
         me = this,
         jsonImgData;
@@ -398,8 +399,10 @@
           name.push(user.get('name'));
           userId.push(user.get('id'));
           userName.push(user.get('name'));
+          firstName.push(user.get('firstName'));
+          lastName.push(user.get('lastName'));
         }
-        me.renderUserButtons(name, userId, userName, image, target);
+        me.renderUserButtons(name, userId, userName, image, target, firstName, lastName);
       }, function () {
         OB.error(arguments);
       });
@@ -411,11 +414,13 @@
       userId.push(v.userId);
       userName.push(v.userName);
       image.push(v.image);
+      firstName.push(v.firstName);
+      lastName.push(v.lastName);
     });
-    this.renderUserButtons(name, userId, userName, image, target);
+    this.renderUserButtons(name, userId, userName, image, target, firstName, lastName);
   },
 
-  renderUserButtons: function (name, userId, userName, image, target) {
+  renderUserButtons: function (name, userId, userName, image, target, firstName, lastName) {
     var i;
     if (name.length === 0) {
       this.$.loginInputsContainer.hide();
@@ -427,7 +432,9 @@
         kind: 'OB.OBPOSLogin.UI.UserButton',
         user: userName[i],
         userId: userId[i],
-        userImage: image[i]
+        userImage: image[i],
+        firstName: firstName[i],
+        lastName: lastName[i]
       });
     }
     target.render();
@@ -547,4 +554,4 @@
     this.$.username.focus();
   }
 
-});
\ No newline at end of file
+});
diff --git a/web/org.openbravo.mobile.core/source/component/obpos-approval.js b/web/org.openbravo.mobile.core/source/component/obpos-approval.js
--- a/web/org.openbravo.mobile.core/source/component/obpos-approval.js
+++ b/web/org.openbravo.mobile.core/source/component/obpos-approval.js
@@ -220,6 +220,8 @@
         userName = [],
         image = [],
         connected = [],
+        firstName = [],
+        lastName = [],
         me = this,
         jsonImgData, i;
 
@@ -233,8 +235,10 @@
           userId.push(user.get('id'));
           userName.push(user.get('name'));
           connected.push(false);
+          firstName.push(user.get('firstName'));
+          lastName.push(user.get('lastName'));
         }
-        me.renderUserButtons(name, userId, userName, image, connected);
+        me.renderUserButtons(name, userId, userName, image, connected, firstName, lastName);
       }, function () {
         OB.error(arguments);
       });
@@ -247,8 +251,10 @@
         userId.push(v.userId);
         userName.push(v.userName);
         image.push(v.image);
+        firstName.push(v.firstName);
+        lastName.push(v.lastName);
       });
-      this.renderUserButtons(name, userId, userName, image, connected);
+      this.renderUserButtons(name, userId, userName, image, connected, firstName, lastName);
     } else {
       OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_ApprovalRequiredTitle'), OB.I18N.getLabel('OBMOBC_NoSupervisorsText'), [{
         label: OB.I18N.getLabel('OBMOBC_LblOk'),
@@ -266,7 +272,7 @@
     }
   },
 
-  renderUserButtons: function (name, userId, userName, image) {
+  renderUserButtons: function (name, userId, userName, image, connected, firstName, lastName) {
     var i, target = this.$.bodyContent.$.loginUserContainer;
     for (i = 0; i < name.length; i++) {
       target.createComponent({
@@ -274,7 +280,9 @@
         user: userName[i],
         userId: userId[i],
         userImage: image[i],
-        showConnectionStatus: false
+        showConnectionStatus: false,
+        firstName: firstName[i],
+        lastName: lastName[i]
       });
     }
     target.render();