safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from glyptodon/GUAC-997

Browse Source 
GUAC-997 Added active user count to REST API and UI.
This commit is contained in:
Mike Jumper
2015-01-27 22:23:47 -08:00
parent 4573677880 f7e1f3a303
commit 1542af3056
9 changed files with 86 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnection.java
View File

@@ -22,10 +22,12 @@
package org.glyptodon.guacamole.net.basic.rest.connection;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.net.auth.Connection;
import org.glyptodon.guacamole.net.auth.ConnectionRecord;
import org.glyptodon.guacamole.net.basic.rest.connectiongroup.APIConnectionGroup;
import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
@@ -62,6 +64,11 @@ public class APIConnection {
*/
private Map<String, String> parameters;
/**
* The count of currently active users for this connection.
*/
private int activeUsers;
/**
* Create an empty APIConnection.
*/
@@ -86,6 +93,14 @@ public class APIConnection {
this.parentIdentifier = connection.getParentIdentifier();
if (this.parentIdentifier == null)
this.parentIdentifier = APIConnectionGroup.ROOT_IDENTIFIER;
// Set the number of currently active users
this.activeUsers = 0;
for (ConnectionRecord history : connection.getHistory()) {
if (history.isActive())
this.activeUsers++;
}
// Set protocol from configuration
GuacamoleConfiguration configuration = connection.getConfiguration();
@@ -173,5 +188,21 @@ public class APIConnection {
public void setProtocol(String protocol) {
this.protocol = protocol;
}
/**
* Returns the number of currently active users for this connection.
* @return The number of currently active users for this connection.
*/
public int getActiveUsers() {
return activeUsers;
}
/**
* Set the number of currently active users for this connection.
* @param activeUsers The number of currently active users for this connection.
*/
public void setActiveUsers(int activeUsers) {
this.activeUsers = activeUsers;
}
}

11
guacamole/src/main/webapp/app/groupList/types/GroupListItem.js
View File

@@ -100,6 +100,14 @@ angular.module('groupList').factory('GroupListItem', ['ConnectionGroup', functio
* @type Boolean
*/
this.isExpanded = template.isExpanded;
/**
* The number of currently active users for this connection. This field
* has no meaning for a connection group, and may be null or undefined.
*
* @type Number
*/
this.activeUsers = template.activeUsers;
/**
* The connection or connection group whose data is exposed within
@@ -134,6 +142,9 @@ angular.module('groupList').factory('GroupListItem', ['ConnectionGroup', functio
// Type information
isConnection : true,
isConnectionGroup : false,
// Count of currently active users
activeUsers : connection.activeUsers,
// Wrapped item
wrappedItem : connection

7
guacamole/src/main/webapp/app/home/templates/connection.html
View File

@@ -21,7 +21,7 @@
THE SOFTWARE.
-->
<div class="caption">
<div class="caption" ng-class="{active: item.activeUsers}">
<!-- Connection icon -->
<div class="protocol">
@@ -30,6 +30,11 @@
<!-- Connection name -->
<span class="name">{{item.name}}</span>
<!-- Active user count -->
<span class="activeUserCount" ng-show="item.activeUsers">
{{'HOME.INFO_ACTIVE_USER_COUNT' | translate:'{USERS: item.activeUsers}'}}
</span>
</div>
</a>

7
guacamole/src/main/webapp/app/index/styles/font-carlito.css
View File

@@ -41,3 +41,10 @@
font-style: normal;
src: url('fonts/carlito/Carlito-Bold.woff') format('woff');
}
@font-face {
font-family: 'Carlito';
font-weight: normal;
font-style: italic;
src: url('fonts/carlito/Carlito-Italic.woff') format('woff');
}

10
guacamole/src/main/webapp/app/index/styles/ui.css
View File

@@ -140,6 +140,16 @@ div.section {
background: #DEB;
}
.caption.active * {
opacity: 0.5;
}
.caption .activeUserCount {
font-style: italic;
position: absolute;
right: 1em;
}
.list-item:not(.selected) .caption:hover {
background: #CDA;
}

7
guacamole/src/main/webapp/app/manage/templates/connection.html
View File

@@ -21,7 +21,7 @@
THE SOFTWARE.
-->
<div class="caption">
<div class="caption" ng-class="{active: item.activeUsers}">
<!-- Connection icon -->
<div class="protocol">
@@ -31,5 +31,10 @@
<!-- Connection name -->
<span class="name">{{item.name}}</span>
<!-- Active user count -->
<span class="activeUserCount" ng-show="item.activeUsers">
{{'MANAGE.INFO_ACTIVE_USER_COUNT' | translate:'{USERS: item.activeUsers}'}}
</span>
</div>
</a>

9
guacamole/src/main/webapp/app/rest/types/Connection.js
View File

@@ -79,6 +79,15 @@ angular.module('rest').factory('Connection', [function defineConnection() {
* @type Object.<String, String>
*/
this.parameters = template.parameters;
/**
* The count of currently active users for this connection. This field
* will be returned from the REST API during a get operation,
* but may not be set when doing an update or create operation.
*
* @type Number
*/
this.activeUsers = template.activeUsers;
};

BIN
guacamole/src/main/webapp/fonts/carlito/Carlito-Italic.woff Normal file
View File

Binary file not shown.

6
guacamole/src/main/webapp/translations/en_US.json
View File

@@ -11,6 +11,8 @@
"ACTION_NAVIGATE_BACK" : "Back",
"ACTION_NAVIGATE_HOME" : "Home",
"ACTION_SAVE" : "Save",
"INFO_ACTIVE_USER_COUNT" : "Currently in use by {USERS} {USERS, plural, one{user} other{users}}.",
"NAME" : "Guacamole ${project.version}"
@@ -105,6 +107,8 @@
"ACTION_LOGOUT" : "@:APP.ACTION_LOGOUT",
"ACTION_MANAGE" : "@:APP.ACTION_MANAGE",
"INFO_ACTIVE_USER_COUNT" : "@:APP.INFO_ACTIVE_USER_COUNT",
"INFO_NO_RECENT_CONNECTIONS" : "No recent connections.",
@@ -139,6 +143,8 @@
"HELP_SHOW_PASSWORD" : "Click to show password",
"HELP_HIDE_PASSWORD" : "Click to hide password",
"HELP_USERS" : "Click or tap on a user below to manage that user. Depending on your access level, users can be added and deleted, and their passwords can be changed.",
"INFO_ACTIVE_USER_COUNT" : "@:APP.INFO_ACTIVE_USER_COUNT",
"SECTION_HEADER_ADMINISTRATION" : "Administration",
"SECTION_HEADER_CONNECTIONS" : "Connections",