#761 I changed class css "row" to "rowTable" in views.jsp, and I adde…

…d small correcting for RactivationManager.java
SCADA-LTS · Dec 4, 2018 · e2fbdac · e2fbdac
1 parent 516aae0
commit e2fbdac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/WebContent/WEB-INF/jsp/views.jsp b/WebContent/WEB-INF/jsp/views.jsp
@@ -32,6 +32,13 @@
     	 table {
              border-collapse: separate !important;
              border-spacing: 2px !important;
+             padding: 3px;
+         }
+         .rowTable {
+             background-color: #F0F0F0;
+         }
+         .rowTableAlt {
+             background-color: #DCDCDC;
          }
     </style>
     <script type="text/javascript" src="resources/app/bower_components/sweetalert2/dist/sweetalert2.min.js"></script>

diff --git a/WebContent/WEB-INF/snippet/alarmList.jsp b/WebContent/WEB-INF/snippet/alarmList.jsp
@@ -28,7 +28,7 @@
     </tr>
     <c:if test="${empty events}"><tr><td colspan="6"><b><fmt:message key="events.emptyList"/></b></td></tr></c:if>
     <c:forEach items="${events}" var="event" varStatus="status">
-      <tr class="<c:if test="${status.index % 2 == 1}">Alt</c:if>">
+      <tr class="rowTable<c:if test="${status.index % 2 == 1}">Alt</c:if>">
       	<c:if test="${!hideIdColumn}"><td align="center">${event.id}</td></c:if>
       	<c:if test="${!hideAlarmLevelColumn}"><td align="center"><tag:eventIcon event="${event}"/></td></c:if>
         <c:if test="${!hideTimestampColumn}"><td align="center">${sst:time(event.activeTimestamp)}</td></c:if>

diff --git a/src/org/scada_lts/ds/reactivation/ReactivationManager.java b/src/org/scada_lts/ds/reactivation/ReactivationManager.java
@@ -121,6 +121,7 @@ public boolean checkDsIsSleep(int idDs) {
                 sleepDsIndexIdDs.remove(idDs);
             }
         } catch (Exception e) {
+            LOG.error(e);
             result = false;
         }
         return result;