diff --git a/extension/Resources/Private/Report/formEditor.qfqr b/extension/Resources/Private/Report/formEditor.qfqr index 23dc0be4d7010babd85d4352f31290bd7540b163..c233c99dee55c7b3d4fdd95f8ec721700926fe38 100644 --- a/extension/Resources/Private/Report/formEditor.qfqr +++ b/extension/Resources/Private/Report/formEditor.qfqr @@ -27,10 +27,10 @@ dbIndex={{indexQfq:Y}} 30 { # 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">' + sql = SELECT '<th data-sorter="false" class="filter-false" width="100px;"><div class="btn-group">' , CONCAT('p:{{pageSlug:T}}&form=form&') as _pagen - , CONCAT('p:{{pageSlug:T}}&form=formJson&|t:json') as _pagen - , '</th><th>Name' + , CONCAT('p:{{pageSlug:T}}&form=formJson&|t:json|b|s') as _page + , '</div></th><th>Name' , '</th><th>Title' , '</th><th>Table' , '</th><th>#' @@ -39,31 +39,33 @@ dbIndex={{indexQfq:Y}} , '</th><th><em>PageId</em></th>' FROM (SELECT '') AS fake WHERE {{formIdHistory:S0}}=0 - head = <div style="clear:both;"></div><div class="panel panel-default" style="width: min-content;min-width: fit-content;"><div class="panel-heading"><h2 style="margin:0;">FormEditor<span class="pull-right" style="margin-top:-4px;">{{&switchButton:RE::-}}</span></h2></div><div style="clear:both;"></div><div class="panel-body"> - <table class="table table-hover qfq-table-50 tablesorter tablesorter-filter" id="{{pageSlug:T}}-form"> + head = <div style="clear:both;"></div> + <div class="panel panel-default" style="width: min-content;min-width: fit-content;"> + <div class="panel-heading"> + <h2 style="margin:0;">FormEditor + <span class="pull-right" style="margin-top:-4px;"> + {{'p:{{pageSlug:T}}&stats=1|b|s|t:Statistic' AS _link}} {{&switchButton:RE::-}} + </span> + </h2> + </div> + <div style="clear:both;"></div> + <div class="panel-body"> + <table class="table table-hover qfq-table-50 tablesorter tablesorter-filter" id="{{pageSlug:T}}-form"> rbeg = <thead class="qfq-sticky"><tr> rend = </tr></thead><tbody> tail = </tbody></table></div> 40 { # All forms - sql = SELECT '<td>' + sql = SELECT '<td><div class="btn-group">' , CONCAT('p:{{pageSlug:T}}&form=form&r=', f.id) as _pagee - , CONCAT('p:{{pageSlug:T}}&form=formJson&r=', f.id, '|t:json') as _pagee - , '</td>' + , CONCAT('p:{{pageSlug:T}}&form=formJson&r=', f.id, '|t:json|s|b') as _page + , '</div></td>' , CONCAT(f.name, ' <span class="text-muted">(', f.id, ')</span>') , QMORE(strip_tags(f.title),50) , f.tableName - , CONCAT('p:{{pageSlug: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 + WHERE '{{stats:S0}}'=0 ORDER BY f.name rbeg = <tr> rend = </tr> @@ -71,9 +73,41 @@ dbIndex={{indexQfq:Y}} fend = </td> fskipwrap = 1,2,3,4 } + + 50 { + sql = SELECT '' FROM (SELECT '') AS fake WHERE '{{stats:S0}}'=1 + + 60 { + # All forms + sql = SELECT '<td><div class="btn-group">' + , CONCAT('p:{{pageSlug:T}}&form=form&r=', f.id) as _pagee + , CONCAT('p:{{pageSlug:T}}&form=formJson&r=', f.id, '|t:json|s|b') as _page + , '</div></td>' + , CONCAT(f.name, ' <span class="text-muted">(', f.id, ')</span>') + , QMORE(strip_tags(f.title),50) + , f.tableName + , CONCAT('p:{{pageSlug: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 '{{stats:S0}}'=1 + GROUP BY f.id + ORDER BY f.name + rbeg = <tr> + rend = </tr> + fbeg = <td> + fend = </td> + fskipwrap = 1,2,3,4 + } + } + } -50 { +70 { # History of a Form {{formIdHistory:S0}} sql = SELECT f.name , fsl.feUser