Changeset 7818 for trunk/www/views/devices/view_device.jsp

Timestamp:

Jun 8, 2020, 8:21:32 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2213: Extend registration of devices

Added list of recent session to the "View device" page.

File:

• trunk/www/views/devices/view_device.jsp (modified) (3 diffs)

trunk/www/views/devices/view_device.jsp

@@ -34 +34 @@
   import="net.sf.basedb.core.plugin.Plugin"
   import="net.sf.basedb.core.Project"
+  import="net.sf.basedb.core.Session"
+  import="net.sf.basedb.core.ItemQuery"
+  import="net.sf.basedb.core.ItemResultList"
+  import="net.sf.basedb.core.query.Orders"
+  import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.util.GeoLocation"
   import="net.sf.basedb.util.Values"
@@ -79 +84 @@
   String title = null;
   final UserDevice device = UserDevice.getById(dc, itemId);
-  final String mapURL = GeoLocation.getURLToMap(device.getLocationLatitude(), device.getLocationLongitude());
+  String mapURL = GeoLocation.getURLToMap(device.getLocationLatitude(), device.getLocationLongitude());
   final boolean writePermission = device.hasPermission(Permission.WRITE);
   final boolean deletePermission = device.hasPermission(Permission.DELETE);
@@ -204 +209 @@
       </table>
       </div>
+      
+      <%
+      ItemQuery<Session> sessionQuery = device.getSessions();
+      sessionQuery.order(Orders.desc(Hql.property("loginTime")));
+      sessionQuery.setMaxResults(10);
+      ItemResultList<Session> sessions = sessionQuery.list(dc);
+      %>
+      <base:section 
+        id="sessions"
+        title="<%="Recent sessions with this device (max 10)"%>"
+        context="<%=cc%>"
+        >
+        <%
+        if (sessions.size() == 0)
+        {
+          %>
+          <div class="messagecontainer note">
+          There are no registered sessions with this device.
+          </div>
+          <%
+        }
+        else
+        {
+          %>
+          <tbl:table
+            id="tbl.sessions"
+            columns="all"
+            >
+            <tbl:columndef 
+              id="loginTime"
+              title="Login time"
+            />
+            <tbl:columndef 
+              id="logoutTime"
+              title="Logout time"
+            />
+            <tbl:columndef 
+              id="authenticationMethod"
+              title="Authentication method" 
+            />
+            <tbl:columndef 
+              id="impersonated"
+              title="Impersonated" 
+            />
+            <tbl:columndef 
+              id="remoteId"
+              title="Remote ID"
+            />
+            <tbl:columndef 
+              id="location"
+              title="Location"
+            />
+            <tbl:columndef 
+              id="comment"
+              title="Comment" 
+            />
+            <tbl:data>
+              <tbl:headers>
+                <tbl:headerrow>
+                  <tbl:columnheaders />
+                </tbl:headerrow>
+              </tbl:headers>            
+              <tbl:rows>
+              <%
+              for (Session item : sessions)
+              {
+                %>
+                <tbl:row>
+                  <tbl:cell column="loginTime"><%=dateTimeFormatter.format(item.getLoginTime())%></tbl:cell>
+                  <tbl:cell column="logoutTime"><%=dateTimeFormatter.format(item.getLogoutTime())%></tbl:cell>
+                  <tbl:cell column="authenticationMethod"><%=HTML.encodeTags(item.getAuthenticationMethod())%></tbl:cell>
+                  <tbl:cell column="impersonated"><%=item.getImpersonated()%></tbl:cell>
+                  <tbl:cell column="remoteId"><%=HTML.encodeTags(item.getRemoteId())%></tbl:cell>
+                  <tbl:cell column="location"><%=HTML.encodeTags(item.getLocation())%>
+                    <% mapURL = GeoLocation.getURLToMap(item.getLocationLatitude(), item.getLocationLongitude()); %>
+                    <base:icon href="<%=mapURL%>" image="map.png" tooltip="Show map" visible="<%=mapURL != null %>"/>               
+                  </tbl:cell>
+                  <tbl:cell column="comment"><%=HTML.encodeTags(item.getLoginComment())%></tbl:cell>
+                </tbl:row>
+                <%
+              }
+              %>
+              </tbl:rows>
+            </tbl:data>
+          </tbl:table>
+          <%
+        }
+        %>
+      </base:section>
+      
+      
     </t:tab>
     </t:tabcontrol>