erp5_web_project_ui: drop string queries

bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.js

@@ -26,6 +26,25 @@
   const PORTAL_TYPE_LIST = ["Task", "Bug", "Task Report"];
   const VALID_STATE_LIST = ["planned", "auto_planned", "ordered", "confirmed", "ready", "stopped", "started", "submitted", "validated"];
 
+  function createMultipleSimpleOrQuery(key, value_list) {
+    var i,
+      search_query,
+      query_list = [];
+    for (i = 0; i < value_list.length; i += 1) {
+      query_list.push(new SimpleQuery({
+        key: key,
+        operator: "",
+        type: "simple",
+        value: value_list[i]
+      }));
+    }
+    return new ComplexQuery({
+      operator: "OR",
+      query_list: query_list,
+      type: "complex"
+    });
+  }
+
   function getProjectId(id) {
     var segments = id.split("/");
     if (segments.length === 2) {
@@ -62,20 +81,31 @@
   }
 
   function getProjectDocumentList(gadget, limit_date) {
-    var document_query;
-    document_query = Query.objectToSearchText(new SimpleQuery({
+    var query_list = [],
+      document_query;
+    query_list.push(new SimpleQuery({
       key: "source_project__validation_state",
       operator: "=",
       type: "simple",
       value: "validated"
     }));
-    document_query += ' AND simulation_state: ("' + VALID_STATE_LIST.join('", "') + '")';
-    document_query += ' AND portal_type: ("' + PORTAL_TYPE_LIST.join('", "') + '")';
+    query_list.push(createMultipleSimpleOrQuery('portal_type', PORTAL_TYPE_LIST));
+    query_list.push(createMultipleSimpleOrQuery('simulation_state', VALID_STATE_LIST));
     if (limit_date) {
-      document_query += ' AND modification_date: < "' + limit_date + '"';
+      query_list.push(new SimpleQuery({
+        key: "modification_date",
+        operator: "<",
+        type: "simple",
+        value: limit_date
+      }));
     }
+    document_query = new ComplexQuery({
+      operator: "AND",
+      query_list: query_list,
+      type: "complex"
+    });
     return gadget.jio_allDocs({
-      query: document_query,
+      query: Query.objectToSearchText(document_query),
       limit: QUERY_LIMIT,
       select_list: ['source_project__relative_url', 'portal_type', 'count(*)'],
       group_by: ['portal_type', 'source_project__relative_url'],
@@ -352,16 +382,22 @@
       var gadget = this,
         i,
         test_list,
-        test_result_query = Query.objectToSearchText(
-          getComplexQuery({"portal_type" : "Test Result",
-                            "source_project__validation_state" : "validated"},
-                          "AND")),
+        query_list = [],
+        test_result_query,
         test_state_list = ["failed", "stopped", "public_stopped"];
-      test_result_query += ' AND simulation_state: ("' + test_state_list.join('", "') + '")';
+      query_list.push(getComplexQuery({"portal_type" : "Test Result",
+                                       "source_project__validation_state" : "validated"},
+                                      "AND"));
+      query_list.push(createMultipleSimpleOrQuery('simulation_state', test_state_list));
+      test_result_query = new ComplexQuery({
+        operator: "AND",
+        query_list: query_list,
+        type: "complex"
+      });
       return gadget.jio_allDocs({
-        query: test_result_query,
+        query: Query.objectToSearchText(test_result_query),
         limit: QUERY_LIMIT,
-        select_list: ['source_project__relative_url', 'portal_type'],
+        select_list: ['source_project__relative_url', 'portal_type', 'modification_date'],
         group_by: ['source_project__relative_url'],
         sort_on: [["modification_date", "descending"]]
       })

bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.xml

@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>982.9532.59635.1928</string> </value>
+                      <value> <string>982.9608.57814.23773</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1582894107.51</float>
+                              <float>1582898723.9</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_js.js

@@ -39,6 +39,25 @@
     return view_list.filter(d => d.name === name)[0].href;
   }
 
+  function createMultipleSimpleOrQuery(key, value_list) {
+    var i,
+      search_query,
+      query_list = [];
+    for (i = 0; i < value_list.length; i += 1) {
+      query_list.push(new SimpleQuery({
+        key: key,
+        operator: "",
+        type: "simple",
+        value: value_list[i]
+      }));
+    }
+    return new ComplexQuery({
+      operator: "OR",
+      query_list: query_list,
+      type: "complex"
+    });
+  }
+
   function setLatestTestResult(gadget, svg_element, project_jio_key) {
     var query = createProjectQuery(project_jio_key,
                  [["portal_type", "Test Result"]]);
@@ -146,17 +165,17 @@
       type: "simple",
       value: "publication_section/" + publication_section
     }));
-    query = Query.objectToSearchText(new ComplexQuery({
+    query_list.push(createMultipleSimpleOrQuery('validation_state', VALID_STATE_LIST));
+    query = new ComplexQuery({
       operator: "AND",
       query_list: query_list,
       type: "complex"
-    }));
-    query += ' AND validation_state: ("' + VALID_STATE_LIST.join('", "') + '")';
+    });
     return gadget.getUrlFor({command: 'push_history', options: {page: "project_redirector"}})
       .push(function (url) {
         redirector_ulr = url;
         return gadget.jio_allDocs({
-          query: query,
+          query: Query.objectToSearchText(query),
           select_list: ['text_content']
         });
       })

bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_js.xml

@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>982.9357.4568.20411</string> </value>
+                      <value> <string>982.9606.8399.22101</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1582883478.48</float>
+                              <float>1582898299.44</float>
                               <string>UTC</string>
                             </tuple>
                           </state>