[erp5_web_monitoring] load monitoring parameter from json serialized connection parameter

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.js

@@ -260,41 +260,69 @@
       });
   }
 
+  function getParameterDictFromUrl(uri_param) {
+    if (uri_param.has('url') && uri_param.has('password') &&
+        uri_param.has('username') && uri_param.get('url').startsWith('http')) {
+      return {
+        opml_url: uri_param.get('url'),
+        username: uri_param.get('username'),
+        password: uri_param.get('password')
+      };
+    }
+  }
+
+  function getParameterFromconnectionDict(connection_dict) {
+    if (connection_dict["monitor-url"] &&
+        connection_dict["monitor-url"].startsWith('http') &&
+        connection_dict["monitor-user"] &&
+        connection_dict["monitor-password"]) {
+      return {
+        opml_url: connection_dict["monitor-url"],
+        username: connection_dict["monitor-user"],
+        password: connection_dict["monitor-password"]
+      };
+    }
+  }
+
   function readMonitoringParameter(parmeter_xml) {
     var parser = new DOMParser(),
       xmlDoc = parser.parseFromString(parmeter_xml, "text/xml"),
       parameter,
       uri_param,
+      json_parameter,
+      parameter_dict,
       monitor_dict = {};
 
+    json_parameter = xmlDoc.getElementById("_");
+    if (json_parameter !== undefined && json_parameter !== null) {
+      parameter_dict = JSON.parse(json_parameter.textContent);
+      if (parameter_dict.hasOwnProperty("monitor-setup-url")) {
+        return getParameterDictFromUrl(
+          new URLSearchParams(parameter_dict["monitor-setup-url"])
+        );
+      }
+      return getParameterFromconnectionDict(parameter_dict);
+    }
     parameter = xmlDoc.getElementById("monitor-setup-url");
     if (parameter !== undefined && parameter !== null) {
       // monitor-setup-url exists
       uri_param = new URLSearchParams(parameter.textContent);
-      if (uri_param.has('url') && uri_param.has('password') &&
-          uri_param.has('username') && uri_param.get('url').startsWith('http')) {
-        return {
-          opml_url: uri_param.get('url'),
-          username: uri_param.get('username'),
-          password: uri_param.get('password')
-        };
+      return getParameterDictFromUrl(uri_param);
+    }
+    parameter = xmlDoc.getElementById("monitor-url");
+    if (parameter !== undefined && parameter !== null) {
+      monitor_dict.url = parameter.textContent.trim();
+      parameter = xmlDoc.getElementById("monitor-user");
+      if (parameter === undefined && parameter !== null) {
+        return;
       }
-    } else {
-      parameter = xmlDoc.getElementById("monitor-url");
-      if (parameter !== undefined && parameter !== null) {
-        monitor_dict.url = parameter.textContent.trim();
-        parameter = xmlDoc.getElementById("monitor-user");
-        if (parameter === undefined && parameter !== null) {
-          return;
-        }
-        monitor_dict.username = parameter.textContent.trim();
-        parameter = xmlDoc.getElementById("monitor-password");
-        if (parameter === undefined && parameter !== null) {
-          return;
-        }
-        monitor_dict.password = parameter.textContent.trim();
-        return monitor_dict;
+      monitor_dict.username = parameter.textContent.trim();
+      parameter = xmlDoc.getElementById("monitor-password");
+      if (parameter === undefined && parameter !== null) {
+        return;
       }
+      monitor_dict.password = parameter.textContent.trim();
+      return monitor_dict;
     }
   }
 
@@ -629,4 +657,4 @@
           }
         });
     });
-}(window, rJS, RSVP, jsen, Handlebars, atob, btoa, DOMParser, URLSearchParams));
+}(window, rJS, RSVP, jsen, Handlebars, atob, btoa, DOMParser, URLSearchParams));
\ No newline at end of file

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml

@@ -250,7 +250,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>965.42470.47064.30003</string> </value>
+                <value> <string>967.60726.55816.57890</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -268,7 +268,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1519233144.55</float>
+                        <float>1527847350.32</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml

@@ -108,7 +108,7 @@
         <item>
             <key> <string>text_content</string> </key>
             <value> <string>CACHE MANIFEST\n
-# generated on Fri, 21 Fev 2018 10:37:42 +0000\n
+# generated on Fri, 20 May 2018 17:47:45 +0000\n
 # XXX + fonts\n
 # images/ajax-loader.gif\n
 CACHE:\n
@@ -387,7 +387,7 @@ NETWORK:\n
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>965.42293.15886.45994</string> </value>
+                <value> <string>966.64659.26947.45004</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -405,7 +405,7 @@ NETWORK:\n
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1519222522.75</float>
+                        <float>1527847381.11</float>
                         <string>UTC</string>
                       </tuple>
                     </state>