Manual.rst: update Form-Editor-Usage

Documentation/Manual.rst

@@ -8257,57 +8257,58 @@ has the form be used. The following report includes the regular `form-editor`_ a
    #
    # Form
    #
-   # a) List of forms: {{form:S}}='', {{formIdHistory:S}}='', {{formAllUsage:S}}=''
+   # 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) Usage of all forms: {{formAllUsage:S0}}=1 - first and last use (=save), total count, pages where the form has been used.
-   # d) Details usage of a given form: {{formIdHistory:S}}
+   # c) Use history of a given form: {{formIdHistory:S}}
    #
    # {{form:S}}
    # {{formIdHistory:S0}} - usage history of form '{{formIdHistory:S}}'
-   # {{formAllUsage:S0}}=1
 
    form={{form:SE}}
 
    10.sql = SELECT '<p>'
-                  , '{{pageAlias:T0}}&form=copyFormFromExt|Copy Form from ExtForm||| btn btn-default ' AS _Page
+                  , 'p:{{pageAlias:T0}}&form=copyFormFromExt|t:Copy Form from ExtForm|b:btn btn-default|s' AS _page
                   , '</p>'
               FROM (SELECT '') AS fake
               WHERE  '{{form:SE}}'=''
                 AND {{formIdHistory:S0}}=0
-                AND {{formAllUsage:S0}}=0
 
 
    20 {
      # 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" width="90px"><div class="btn-group" role="group">'
+     sql = SELECT '<th data-sorter="false" class="filter-false">'
                     , CONCAT('p:{{pageAlias:T}}&form=Form&') as _pagen
-                    , CONCAT('p:{{pageAlias:T}}&formAllUsage=1|s|G:glyphicon-info-sign|o:Usage of all forms') as _link
-                  , '</div></th><th>#'
                   , '</th><th>Name'
                   , '</th><th>Title'
                   , '</th><th>Table'
-                  , '</th><th class="filter-false sorter-false">'
-                  , '</th><th class="filter-false sorter-false">History</th>'
+                  , '</th><th>#'
+                  , '</th><th>First'
+                  , '</th><th>Last'
+                  , '</th><th>PageId</th>'
               FROM (SELECT '') AS fake
               WHERE  '{{form:SE}}'=''
                 AND {{formIdHistory:S0}}=0
-                AND {{formAllUsage: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>
-     tail = </table>
+     rend = </tr></thead><tbody>
+     tail = </tbody></table>
 
      30 {
        # All forms
        sql = SELECT CONCAT('p:{{pageAlias:T}}&form=Form&r=', f.id) as _pagee
-                    , f.id
                     , f.name
                     , QMORE(f.title,50)
-                    , f.tableName, CONCAT('form=Form&r=', f.id) as _Paged
-                    , CONCAT('p:{{pageAlias:T}}&formIdHistory=', f.id, '|s|G:glyphicon-signal') as _link
+                    , 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
+                    , MIN(fsl.created)
+                    , MAX(fsl.created)
+                    , GROUP_CONCAT(DISTINCT fsl.pageId ORDER BY fsl.pageId)
                  FROM Form AS f
-                 WHERE {{formIdHistory:S0}}=0 AND {{formAllUsage:S0}}=0
+                 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>
@@ -8317,48 +8318,30 @@ has the form be used. The following report includes the regular `form-editor`_ a
    }
 
    40 {
-     # History of Form {{formIdHistory:S0}}
+     # 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
-     head = <table class="table table-hover qfq-table-50 tablesorter tablesorter-filter" id="{{pageAlias:T}}-formHistory">
-            <thead><tr><th>Form</th><th>feUser</th><th>recordId</th><th>pageId</th><th>created</th></tr></thead>
-     tail = </table>
-     rbeg = <tr>
-     rend = </tr>
-     fbeg = <td>
-     fend = </td>
-   }
 
-   50 {
-     # Usage of Form {{formAllUsage:S0}}
-     sql = SELECT f.name
-                  , COUNT(fsl.id)
-                  , MIN(fsl.created)
-                  , MAX(fsl.created)
-                  , GROUP_CONCAT(DISTINCT fsl.pageId ORDER BY fsl.pageId)
-              FROM Form AS f
-              LEFT JOIN FormSubmitLog AS fsl
-                ON fsl.formId=f.id
-              WHERE {{formAllUsage:S0}}=1
-              GROUP BY fsl.formId
-              ORDER BY f.name
      head = <table class="table table-hover qfq-table-50 tablesorter tablesorter-filter" id="{{pageAlias:T}}-formHistory">
-            <thead><tr><th>Form open:</th><th>#</th><th>First</th><th>Last</th><th>on pageId</th></tr></thead>
-     tail = </table>
+            <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>')
    }
 
 
+
 .. _`autocron`:
 
 AutoCron