#2497 Add display format as Hex numbers or binary numbers #3146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Patrykb0802 wants to merge 56 commits into release/2.8.0 from feature/#2497_Add_display_format_as_Hex_numbers_or_binary_numbers

WebContent/META-INF/context.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -33,4 +33,7 @@ @@
               connectionProperties="useSSL=false;allowPublicKeyRetrieval=true"
               url="jdbc:mysql://localhost:3306/scadalts"
              />
+        <CookieProcessor
+                className="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
+                sameSiteCookies="Strict" />
     </Context>

WebContent/WEB-INF/dwr.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -245,6 +245,10 @@ @@
         <convert converter="exception" match="java.lang.Exception">
           <param name="include" value="message"/>
         </convert>
+        <convert converter="bean" match="org.scada_lts.dao.model.UserIdentifier"/>
+        <convert converter="bean" match="org.scada_lts.web.mvc.api.dto.MailingListJson"/>
+        <convert converter="bean" match="org.scada_lts.web.mvc.api.dto.EmailRecipientJson"/>
       </allow>
       <signatures>
         <![CDATA[
@@ Expand Down @@

WebContent/WEB-INF/jsp/mailingLists.jsp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -25,7 +25,7 @@
  
      <script>

        var users = new Array();

        var editingMailingList;

        var nextAddressEntryId = 1;

        var nextAddressEntryId;

        function init() {

            MailingListsDwr.init(function(response) {

    @@ -60,7 +60,7 @@
  
                    if (entry.recipientType == <c:out value="<%= EmailRecipient.TYPE_USER %>"/>)

                        appendUserEntry(entry);

                    else if (entry.recipientType == <c:out value="<%= EmailRecipient.TYPE_ADDRESS %>"/>) {

                        entry.referenceId = nextAddressEntryId++;

                        entry.referenceId = (nextAddressEntryId = nextInt());

                        appendAddressEntry(entry);

                    }

                }

    @@ -222,7 +222,7 @@
  
            }

            var addressEntry = {

                recipientType : <c:out value="<%= EmailRecipient.TYPE_ADDRESS %>"/>,

                referenceId : nextAddressEntryId++,

                referenceId : (nextAddressEntryId = nextInt()),

                referenceAddress : addr

            };

            editingMailingList.entries[editingMailingList.entries.length] = addressEntry;

    @@ -439,6 +439,16 @@
  
                hide("dailyLimitSentEmailsNumberTr");

            }

        }

        function nextInt() {

            return getRandomInt(10000, 10000000);

        }

        function getRandomInt(min, max) {

            let ceil = Math.ceil(min);

            let floor = Math.floor(max);

            return Math.floor(Math.random() * (floor - ceil) + ceil);

        }

      </script>

      <table class="subPageHeader">

WebContent/WEB-INF/jsp/pointEdit/textRenderer.jsp

-Original file line number
+Diff line change
@@ Expand Up / @@ -160,6 +160,10 @@ @@
             <td class="formField"><input id="textRendererTimeConversionExponent" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.conversionExponent}" /></c:catch>"/></td>
           </tr>
         </tbody>
+        <tbody id="textRendererBinaryNumber" style="display:none;">
+        </tbody>
+        <tbody id="textRendererHexadecimal" style="display:none;">
+        </tbody>
       </table>
     </div>
@@ Expand Down Expand Up / @@ -248,6 +252,10 @@ @@
               } else if (typeName == "textRendererTime")
                   DataPointEditDwr.setTimeTextRenderer($get("textRendererTimeFormat"),
                           $get("textRendererTimeConversionExponent"), callback);
+              else if (typeName == "textRendererHexadecimal")
+                DataPointEditDwr.setHexadecimalRenderer(callback);
+              else if (typeName == "textRendererBinaryNumber")
+                DataPointEditDwr.setBinaryRenderer(callback);
               else
                   callback();
           };
@@ Expand Down @@

WebContent/WEB-INF/jsp/scripting.jsp

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,21 +30,33 @@ @@
       	var myLocation = getAppLocation();
         var urlGetDataPoints = "api/datapoint/getAll";
-        function executeScript(){
-        	var xid = jQuery("#xid");
-        	// saveScript() nie zdarzy zapisac !!!
-        	jQuery.ajax({
-        		url: myLocation+"script/execute/"+xid[0].value,
-        		type:"POST",
-        		success: function(){
+        function executeScript() {
+            let payload = {}
+            payload.id = -1;
+            payload.script = $get("script");
+            let toSave = this.scriptPointsContext.convertToSave();
+            payload.pointsOnContext = convertPointsOnContext(toSave);
+            payload.datapointContext = objectsContextArray[0] ? objectsContextArray[0].value : "";
+            payload.datasourceContext = objectsContextArray[1] ? objectsContextArray[1].value : "";
+            jQuery.ajax({
+                url: myLocation+"api/scripts/execute-test",
+                type: "POST",
+                contentType: "application/json; charset=utf-8",
+                dataType: "json",
+                data: JSON.stringify(payload),
+                success: function() {
                   setUserMessage("<spring:message code="script.execute.success"/> ")
-            	},
-            	error: function(XMLHttpRequest, textStatus, errorThrown) {
-            		console.log(textStatus);
-            		console.log(XMLHttpRequest);
-            		setUserMessage("<spring:message code="script.execute.error"/> "+XMLHttpRequest.responseText);
-            	}
-        	});
+                },
+                error: function(XMLHttpRequest, textStatus, errorThrown) {
+                    console.log(textStatus);
+                    console.log(XMLHttpRequest);
+                    console.log(errorThrown);
+                    setUserMessage("<spring:message code="script.execute.error"/> "+XMLHttpRequest.responseText);
+                }
+            });
         };
         var pointsArray = new Array();
@@ Expand All / @@ -65,6 +77,35 @@ @@
     		});
         }
+        function getDataPointById(id) {
+            for(let i = 0; i < pointsArray.length; i++) {
+                if(pointsArray[i].id === id) {
+                    return pointsArray[i];
+                }
+            }
+            return null;
+        }
+        function convertPointsOnContext(toSave) {
+            let pointsOnContext = [];
+            for(let i = 0; i < toSave.length; i++) {
+                let entry = toSave[i];
+                let dataPoint = getDataPointById(entry.key);
+                if(dataPoint) {
+                    let dataPointXid = dataPoint.xid;
+                    let varName = entry.value;
+                    let object = {
+                        dataPointXid: dataPointXid,
+                        varName: varName
+                    };
+                    pointsOnContext[pointsOnContext.length] = object;
+                } else {
+                    throw new Error();
+                }
+            }
+            return pointsOnContext;
+        }
         function getPointsCB()
         {
             jQuery.ajax({
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#2497 Add display format as Hex numbers or binary numbers #3146

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

#2497 Add display format as Hex numbers or binary numbers #3146

Are you sure you want to change the base?

Uh oh!

#2497 Add display format as Hex numbers or binary numbers #3146

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!