Merge branch 'F12015useAdvancedFormEditor' into 'develop'

Refs #12015 Use advanced form editor by default

See merge request !320

extension/Resources/Private/Report/formEditor.qfqr

-# If there is a form given by SIP: show
-form={{form:SE}}
+#
+# Form
+#
+# a) List of forms: {{form:S}}='', {{formIdHistory:S}}=''
+# b) Edit Form: {{form:S}} - Open form {{form:S}} with record {{r:S}} - typically the FormEditor
+# c) Use history of a given form: {{formIdHistory:S}}
+#
+# {{form:S}}
+# {{formIdHistory:S0}} - usage history of form '{{formIdHistory:S}}'
 
-# In case indexQfq != indexData, set dbIndex=indexQfq.
-dbIndex = {{indexQfq:Y}}
+form={{form:SE}}
 
 10 {
-    # Table header.
-    sql = SELECT CONCAT('p:{{pageAlias:T}}&form=form|A:data-reference=newForm') as _pagen, '#', 'Name', 'Title', 'Table', ''
-    head = {{'b|p:id={{pageAlias:T}}&form=copyFormFromExt|t:Copy form from ExtForm|A:data-reference=copyForm' AS _link}}
-           <table class="table table-hover qfq-table-50 tablesorter tablesorter-filter" id="{{pageAlias:T}}-form">
-    tail = </table>
-    rbeg = <thead class="qfq-sticky"><tr>
-    rend = </tr></thead>
-    fbeg = <th>
-    fend = </th>
+  # List of Forms: Do not show this list of forms if there is a form given by SIP.
+  # Table header.
+  sql = SELECT '<th data-sorter="false" class="filter-false">'
+               , CONCAT('p:{{pageAlias:T}}&form=Form&') as _pagen
+               , '</th><th>Name'
+               , '</th><th>Title'
+               , '</th><th>Table'
+               , '</th><th>#'
+               , '</th><th><em>First</em>'
+               , '</th><th><em>Last</em>'
+               , '</th><th><em>PageId</em></th>'
+           FROM (SELECT '') AS fake
+           WHERE {{formIdHistory:S0}}=0
+  head = <table class="table table-hover qfq-table-50 tablesorter tablesorter-filter" id="{{pageAlias:T}}-form">
+  rbeg = <thead class="qfq-sticky"><tr>
+  rend = </tr></thead><tbody>
+  tail = </tbody></table>
+
+  20 {
+    # All forms
+    sql = SELECT CONCAT('p:{{pageAlias:T}}&form=Form&r=', f.id) as _pagee
+                 , CONCAT(f.name, ' <span class="text-muted">(', f.id, ')</span>')
+                 , QMORE(strip_tags(f.title),50)
+                 , f.tableName
+                 , CONCAT('p:{{pageAlias:T}}&formIdHistory=', f.id, '|s|b|t:<span class="badge">', COUNT(fsl.id), '</span>'
+                          , IF(COUNT(fsl.id)=0, '|r:3','')  ) as _link
+                 , CONCAT( '<em><span title="',MIN(fsl.created), '">', DATE_FORMAT( MIN( fsl.created), '%d.%m.%Y'), '</span></em>')
+                 , CONCAT( '<em><span title="',MAX(fsl.created), '">', DATE_FORMAT( MAX( fsl.created), '%d.%m.%Y'), '</span></em>')
+                 , CONCAT('<em>', GROUP_CONCAT(DISTINCT fsl.pageId ORDER BY fsl.pageId), '<em>')
+              FROM Form AS f
+              LEFT JOIN FormSubmitLog AS fsl
+                ON fsl.formId=f.id
+              WHERE {{formIdHistory:S0}}=0
+              GROUP BY f.id
+              ORDER BY f.name
+    rbeg = <tr>
+    rend = </tr>
+    fbeg = <td>
+    fend = </td>
+  }
+}
+
+30 {
+  # History of a Form {{formIdHistory:S0}}
+  sql = SELECT f.name
+               , fsl.feUser
+               , fsl.recordId
+               , fsl.pageId
+               , fsl.created
+
+           FROM FormSubmitLog AS fsl, Form AS f
+           WHERE fsl.formId={{formIdHistory:S0}}
+             AND fsl.formId=f.id
+           ORDER BY fsl.created DESC
 
-    10 {
-        # All forms
-        sql = SELECT CONCAT('p:{{pageAlias:T}}&form=form&r=', f.id, '|A:data-reference=editForm', f.name) as _pagee
-                     , f.id, f.name, QMORE(strip_tags(f.title), 50), f.tableName
-                     , CONCAT('U:form=form&r=', f.id, '|A:data-reference=deletForm') as _paged
-                  FROM Form AS f
-                  ORDER BY f.name
-        rbeg = <tr>
-        rend = </tr>
-        fbeg = <td>
-        fend = </td>
-    }
+  head = <table class="table table-hover qfq-table-50 tablesorter tablesorter-filter" id="{{pageAlias:T}}-formHistory">
+         <thead class="qfq-sticky"><tr><th>Form</th><th>feUser</th><th>recordId</th><th>pageId</th><th>Submit</th></tr></thead><tbody>
+  tail = </tbody></table>
+  rbeg = <tr>
+  rend = </tr>
+  fbeg = <td>
+  fend = </td>
+  altsql = SELECT IF('{{formIdHistory:S0}}'='0', '', '<div class="alert alert-warning">History is empty</div>')
 }
\ No newline at end of file