Release/2.7.5.3

WebContent/WEB-INF/dwr.xml

@@ -181,7 +181,7 @@
       <param name="include" value="id,xid,name,extendedName,dataSourceId,enabled,dataTypeMessage,pointLocator"/>
     </convert>
     <convert converter="bean" match="com.serotonin.mango.vo.User">
-      <param name="include" value="id,username,email,phone,admin,disabled,receiveAlarmEmails,receiveOwnAuditEvents,dataSourcePermissions,dataPointPermissions,userProfile,homeUrl,hideMenu,theme,firstName,lastName"/>
+      <param name="include" value="id,username,email,phone,admin,disabled,receiveAlarmEmails,receiveOwnAuditEvents,dataSourcePermissions,dataPointPermissions,userProfile,homeUrl,hideMenu,theme,firstName,lastName,enableFullScreen,hideShortcutDisableFullScreen"/>
     </convert>
     <convert converter="bean" match="br.org.scadabr.vo.permission.WatchListAccess">
      	<param name="include" value="id,permission"/>

WebContent/WEB-INF/jsp/scripting.jsp

@@ -390,7 +390,7 @@
         </div>
       </td>
 
-      <td valign="top" style="display:none; position: fixed;" id="scriptDetails">
+      <td valign="top" style="display:none; position: auto;" id="scriptDetails">
         <div class="borderDiv">
           <table width="100%">
             <tr>

WebContent/WEB-INF/jsp/systemSettings.jsp

@@ -17,6 +17,7 @@
     along with this program.  If not, see http://www.gnu.org/licenses/.
 --%>
 <%@page import="org.scada_lts.dao.SystemSettingsDAO"%>
+<%@page import="org.scada_lts.utils.SystemSettingsUtils"%>
 <%@page import="com.serotonin.mango.Common"%>
 <%@page import="com.serotonin.mango.rt.event.AlarmLevels"%>
 <%@page import="com.serotonin.mango.rt.event.type.EventType"%>
@@ -94,6 +95,9 @@
 
             $set("<c:out value="<%= SystemSettingsDAO.INSTANCE_DESCRIPTION %>"/>", settings.<c:out value="<%= SystemSettingsDAO.INSTANCE_DESCRIPTION %>"/>);
 
+            $set("<c:out value="<%= SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE %>"/>", settings.<c:out value="<%= SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE %>"/>);
+            $set("<c:out value="<%= SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN %>"/>", settings.<c:out value="<%= SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN %>"/>);
+
             var sel = $("<c:out value="<%= SystemSettingsDAO.LANGUAGE %>"/>");
             <c:forEach items="${availableLanguages}" var="lang">
               sel.options[sel.options.length] = new Option("${lang.value}", "${lang.key}");
@@ -263,6 +267,8 @@
         SystemSettingsDwr.saveMiscSettings(
                 $get("<c:out value="<%= SystemSettingsDAO.UI_PERFORMANCE %>"/>"),
                 $get("<c:out value="<%= SystemSettingsDAO.DATAPOINT_RUNTIME_VALUE_SYNCHRONIZED %>"/>"),
+                $get("<c:out value="<%= SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE %>"/>"),
+                $get("<c:out value="<%= SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN %>"/>"),
                 function(response) {
                     stopImageFader("saveMiscSettingsImg");
                     if (response.hasMessages)
@@ -854,6 +860,18 @@
            </select>
          </td>
         </tr>
+        <tr>
+         <td class="formLabelRequired"><fmt:message key="systemsettings.view.forceFullScreen"/></td>
+         <td class="formField">
+           <input type="checkbox" id="<c:out value="<%= SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE %>"/>" />
+         </td>
+        </tr>
+        <tr>
+         <td class="formLabelRequired"><fmt:message key="systemsettings.view.hideShortcutDisableFullScreen"/></td>
+         <td class="formField">
+           <input type="checkbox" id="<c:out value="<%= SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN %>"/>" />
+         </td>
+        </tr>
         <tr>
           <td colspan="2" id="miscMessage" class="formError"></td>
         </tr>

WebContent/WEB-INF/jsp/users.jsp

@@ -47,7 +47,7 @@
                 var i, j;
                 for (i=0; i<data.users.length; i++) {
                     appendUser(data.users[i].id);
-                    updateUser(data.users[i]);
+                    updateUser({user: data.users[i]});
                 }
 
                 var usersProfileHtml = "", userProfileId, userProfileName;
@@ -97,7 +97,7 @@
                 // Not an admin user.
                 adminUser = false;
                 editingUserId = data.user.id;
-                showUserCB(data.user);
+                showUserCB(data);
                 hide("usersProfilesListTable");
             }
         });
@@ -117,9 +117,25 @@
 
     }
 
-    function showUserCB(user) {
-
+    function showUserCB(response) {
+        var user = response.data ? response.data.user : response.user;
+        var forceFullScreenMode = response.data ? response.data.forceFullScreenMode : response.forceFullScreenMode;
+        var forceHideShortcutDisableFulLScreen = response.data ? response.data.forceHideShortcutDisableFulLScreen : response.forceHideShortcutDisableFulLScreen;
         show($("userDetails"));
+        if(forceFullScreenMode) {
+            document.getElementById("enableFullScreen").disabled = true;
+            document.getElementById("enableFullScreen").title = '<fmt:message key="user.view.forceAdminTitle"/>';
+        } else {
+            document.getElementById("enableFullScreen").disabled = false;
+            document.getElementById("enableFullScreen").title = '<fmt:message key="user.view.enableFullScreen"/>';
+        }
+        if(forceHideShortcutDisableFulLScreen) {
+            document.getElementById("hideShortcutDisableFullScreen").disabled = true;
+            document.getElementById("hideShortcutDisableFullScreen").title = '<fmt:message key="user.view.forceAdminTitle"/>';
+        } else {
+            document.getElementById("hideShortcutDisableFullScreen").disabled = false;
+            document.getElementById("hideShortcutDisableFullScreen").title = '<fmt:message key="user.view.hideShortcutDisableFullScreen"/>';
+        }
         $set("username", user.username);
         $set("firstName", user.firstName);
         $set("lastName", user.lastName);
@@ -133,8 +149,10 @@
         $set("hideMenu", user.hideMenu);
         $set("homeUrl", user.homeUrl);
         $set("theme", user.theme);
+        $set("hideShortcutDisableFullScreen", user.hideShortcutDisableFullScreen);
+    	$set("enableFullScreen", user.enableFullScreen);
+
 
-
         if(user.id != <c:out value="<%= Common.NEW_ID %>"/>) {
         	 $set("usersProfilesList", user.userProfile);
         	 //console.log("User profile: " + user.userProfile);
@@ -236,12 +254,12 @@
             UsersDwr.saveUserAdmin(editingUserId, $get("username"), $get("firstName"), $get("lastName"), $get("password"), $get("email"), $get("phone"),
                     $get("administrator"), $get("disabled"), $get("receiveAlarmEmails"), $get("receiveOwnAuditEvents"),
                     dsPermis, dpPermis, $get("usersProfilesList"), $get("hideMenu"), $get("theme"), parseHomeUrl($get("homeUrl")),
-                    saveUserCB);
+                    $get("enableFullScreen"), $get("hideShortcutDisableFullScreen"), saveUserCB);
         }
         else
             UsersDwr.saveUser(editingUserId, $get("firstName"), $get("lastName"), $get("password"), $get("email"), $get("phone"),
                     $get("receiveAlarmEmails"), $get("receiveOwnAuditEvents"), $get("usersProfilesList"),
-                    $get("theme"), saveUserCB);
+                    $get("theme"), $get("enableFullScreen"), $get("hideShortcutDisableFullScreen"), saveUserCB);
 
     }
 
@@ -298,7 +316,8 @@
         createFromTemplate("u_TEMPLATE_", userId, "usersTable");
     }
 
-    function updateUser(user) {
+    function updateUser(response) {
+        var user = response.data ? response.data.user : response.user;
         $("u"+ user.id +"Username").innerHTML = user.username;
         setUserImg(user.admin, user.disabled, $("u"+ user.id +"Img"));
     }
@@ -459,6 +478,15 @@
               <td class="formField"><select id="usersProfilesList" onchange="checkProfile()">
               </select></td>
             </tr>
+            </tbody>
+            <tr>
+             <td class="formLabelRequired"><fmt:message key="user.view.enableFullScreen"/></td>
+             <td class="formField"><input type="checkbox" id="enableFullScreen" /></td>
+            </tr>
+            <tr>
+             <td class="formLabelRequired"><fmt:message key="user.view.hideShortcutDisableFullScreen"/></td>
+             <td class="formField"><input type="checkbox" id="hideShortcutDisableFullScreen" /></td>
+            </tr>
             </div>
 
             <tbody id="dataSources" style="display:none;">

WebContent/WEB-INF/jsp/views.jsp

@@ -45,11 +45,13 @@
     <script type="text/javascript" src="resources/node_modules/sweetalert2/dist/sweetalert2.min.js"></script>
 
 	<script type="text/javascript">
-	
+
 	jQuery.noConflict();
 
 	shortcut.add("Ctrl+Shift+F",function() {
-	    closeFullScreen();
+	    var forceFullScreenMode = ${forceFullScreenMode};
+	    if(!forceFullScreenMode || ${isAdmin})
+	        closeFullScreen();
 	});
 
 	//check replace alert
@@ -182,6 +184,9 @@
 
 	function checkFullScreen(){
 		var check = getCookie("fullScreen");
+		var forceFullScreenMode = ${forceFullScreenMode};
+        var enableFullScreenMode = ${enableFullScreenMode};
+        check = forceFullScreenMode || enableFullScreenMode ? 'yes' : check;
 		if(check!=null && check!=""){
 			if(check=="yes"){
 				openFullScreen();
@@ -194,18 +199,28 @@
 
 	function openFullScreen() {
 		setCookie("fullScreen","yes");
-		document.getElementById('fsOut').style.display = "block";
+		var hideShortcutDisableFullScreenFromSystemSettings = ${hideShortcutDisableFullScreenFromSystemSettings};
+		var hideShortcutDisableFullScreenFromUser = ${hideShortcutDisableFullScreenFromUser};
+		if(hideShortcutDisableFullScreenFromSystemSettings || hideShortcutDisableFullScreenFromUser) {
+            document.getElementById('fsOut').style.display = "none";
+		} else {
+		    document.getElementById('fsOut').style.display = "block";
+            jQuery('#fsOut').fadeOut(5000, function(){});
+		}
 		document.getElementById('mainHeader').style.display = "none";
 		document.getElementById('subHeader').style.display = "none";
 		document.getElementById('graphical').style.display = "none";
-		jQuery('#fsOut').fadeOut(5000, function(){});
+		document.getElementById('sltsContent').style = "padding-top: 0px !important;";
+		document.getElementById('fullScreenOut').style = "padding: 0px !important;";
 	}
 
 	function closeFullScreen() {
 		setCookie("fullScreen","no");
 		document.getElementById('mainHeader').style.display = "flex";
 		document.getElementById('subHeader').style.display = "flex";
 		document.getElementById('graphical').style.display = "table";
+		document.getElementById('sltsContent').style = "";
+		document.getElementById('fullScreenOut').style = "";
 	}
 
 	function keyListen(e) {
@@ -233,7 +248,6 @@
 			<c:if test="${fn:length(views) != 0}">
 				<td>
 					<tag:img png="arrow_out" title="viewEdit.fullScreen" onclick="fullScreen()" />
-					<!-- <input type="button" name="buttonFull" value="Full Screen" onClick="fullScreen();" /> -->
 				</td>
 			</c:if>
 			<td align="right"><sst:select value="${currentView.id}"
@@ -259,7 +273,7 @@
 
 	</table>
 
-	<table>
+	<table id="fullScreenOut">
 		<tr>
 			<td class="smallTitle" id="fsOut">
 				<fmt:message key="fullScreenOut"/>

WebContent/WEB-INF/jsp/watchList.jsp

@@ -461,6 +461,8 @@
     	  jQuery("#imageChartLiveImg").attr('src', 'images/control_play_blue.png');
           var width = dojo.html.getContentBox($("imageChartDiv")).width - 20;
           var height = dojo.html.getContentBox($("chartContainer")).height - 80;
+          width = Math.ceil(Math.abs(width));
+          height = Math.ceil(Math.abs(height));
     	  height = height < 100 ? 100 : height;
           startImageFader($("imageChartImg"));
           WatchListDwr.getImageChartData(getChartPointList(), $get("fromYear"), $get("fromMonth"), $get("fromDay"),

WebContent/WEB-INF/spring-security.xml

@@ -23,6 +23,23 @@
         <session-management session-fixation-protection="newSession" />
     </http>
 
+    <http use-expressions="true" disable-url-rewriting="true" pattern="/httpds/**"
+          authentication-manager-ref="authenticationManager" entry-point-ref="basicAuthenticationEntryPoint">
+        <headers>
+            <cache-control disabled="true"/>
+            <content-type-options disabled="true"/>
+            <hsts/>
+            <frame-options policy="SAMEORIGIN"/>
+            <xss-protection/>
+            <header ref="headersFromSystemSettingsWriter"/>
+        </headers>
+        <csrf disabled="true"/>
+        <intercept-url pattern="/**" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" requires-channel="https"/>
+
+        <custom-filter position="BASIC_AUTH_FILTER" ref="basicAuthFilter"/>
+        <session-management session-fixation-protection="newSession" />
+    </http>
+
     <http use-expressions="true" disable-url-rewriting="true"
           authentication-manager-ref="authenticationManager">
         <headers>

WebContent/assets/layout.css

@@ -201,6 +201,8 @@ input[type="submit"], input[type="button"] {
 	position:relative;
 	margin: 0px;
 	padding: 0px;
+	overflow-x: auto;
+	max-width: 100%;
 }
 #viewContent img {
 	display: block;
@@ -432,4 +434,9 @@ form.view-edit-form {
 }
 textarea#cssEditor {
     white-space: pre-wrap !important;
+}
+
+#viewContent input[type='button'] {
+    text-align: center;
+    vertical-align: middle;
 }

scadalts-ui/src/locales/en.json

@@ -1048,5 +1048,10 @@
 	"systemsettings.misc.dataPointRuntimeValueSynchronized.all": "All",
 	"systemsettings.misc.dataPointRuntimeValueSynchronized.partial": "Partial",
 	"systemsettings.misc.dataPointRuntimeValueSynchronized.none": "None",
-	"systemsettings.http.response.headers": "HTTP response headers"
+	"systemsettings.http.response.headers": "HTTP response headers",
+	"systemsettings.view.forceFullScreen": "Force full screen mode",
+	"systemsettings.view.hideShortcutDisableFullScreen": "Hide shortcut to disable full screen",
+	"userDetails.view.forceAdminTitle": "The function is enforced by the Admin",
+	"userDetails.view.enableFullScreen": "Enable full screen mode",
+	"userDetails.view.hideShortcutDisableFullScreen": "Hide shortcut to disable full screen"
 }

scadalts-ui/src/store/users/index.js

@@ -16,6 +16,10 @@ const storeUsers = {
 			theme: 'DEFAULT',
 			hideMenu: false,
 			userProfile: -1,
+			enableFullScreen: false,
+			hideShortcutDisableFullScreen: false,
+			forceFullScreenMode: false,
+			forceHideShortcutDisableFulLScreen: false
 		}
 	},
 

scadalts-ui/src/views/Alarms/EventList.vue

@@ -708,12 +708,12 @@ export default {
 		async fetchEventList() {
 			this.loading = true;
 			const result = await this.$store.dispatch('searchEvents', { ...this.searchFilters, itemsPerPage: this.options.itemsPerPage });
-
-			if (result.length > this.options.itemsPerPage) {
-				this.eventList = result.slice(0,this.options.itemsPerPage);
+            const rows = result.rows;
+			if (rows.length > this.options.itemsPerPage) {
+				this.eventList = rows.slice(0,this.options.itemsPerPage);
 				this.totalEvents = this.options.itemsPerPage * this.options.page +1
 			} else {
-				this.eventList = result;
+				this.eventList = rows;
 				this.totalEvents = this.options.itemsPerPage * this.options.page
 			}
 			// document.getElementsByClassName('v-data-footer__pagination')[0].innerHTML=''

scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue

@@ -30,6 +30,20 @@
                             :label="$t('systemsettings.misc.dataPointRuntimeValueSynchronized')"
                             dense
                         ></v-select>
+                    </v-col>
+                    <v-col cols="12">
+                        <v-switch
+                            v-model="miscSettings.enableFullScreen"
+                            :label="$t('systemsettings.view.forceFullScreen')"
+                            @change="watchDataChange()"
+                        ></v-switch>
+                    </v-col>
+                    <v-col cols="12">
+                        <v-switch
+                            v-model="miscSettings.hideShortcutDisableFullScreen"
+                            :label="$t('systemsettings.view.hideShortcutDisableFullScreen')"
+                            @change="watchDataChange()"
+                        ></v-switch>
                     </v-col>
 				</v-row>
 			</v-card-text>