hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	templates/web/report/report_layout_child.html.twig
This commit is contained in:
Nicolas Le Goff
2014-02-13 11:12:26 +01:00
parent 302e87714f 3870489db6
commit f4f063ad3e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Controller/Report/Root.php
View File

@@ -184,6 +184,8 @@ class Root implements ControllerProviderInterface
$cnx->setHasLimit(false); $cnx->setHasLimit(false);
$cnx->setPrettyString(false); $cnx->setPrettyString(false);
$this->doReport($app, $request, $cnx, $conf);
try { try {
$csv = \format::arr_to_csv($cnx->getResult(), $cnx->getDisplay()); $csv = \format::arr_to_csv($cnx->getResult(), $cnx->getDisplay());
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -249,6 +251,8 @@ class Root implements ControllerProviderInterface
$questions->setHasLimit(false); $questions->setHasLimit(false);
$questions->setPrettyString(false); $questions->setPrettyString(false);
$this->doReport($app, $request, $questions, $conf);
try { try {
$csv = \format::arr_to_csv($questions->getResult(), $questions->getDisplay()); $csv = \format::arr_to_csv($questions->getResult(), $questions->getDisplay());
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -323,6 +327,8 @@ class Root implements ControllerProviderInterface
$download->setHasLimit(false); $download->setHasLimit(false);
$download->setPrettyString(false); $download->setPrettyString(false);
$this->doReport($app, $request, $download, $conf);
try { try {
$csv = \format::arr_to_csv($download->getResult(), $download->getDisplay()); $csv = \format::arr_to_csv($download->getResult(), $download->getDisplay());
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -393,6 +399,8 @@ class Root implements ControllerProviderInterface
$document->setHasLimit(false); $document->setHasLimit(false);
$document->setPrettyString(false); $document->setPrettyString(false);
$this->doReport($app, $request, $document, $conf, 'record_id');
try { try {
$csv = \format::arr_to_csv($document->getResult(), $document->getDisplay()); $csv = \format::arr_to_csv($document->getResult(), $document->getDisplay());
} catch (\Exception $e) { } catch (\Exception $e) {

4
templates/web/report/report_layout_child.html.twig
View File

@@ -168,8 +168,8 @@
<label for="NOBESTOF-input">{{ "report:: questions sans reponses" | trans }}</label> <label for="NOBESTOF-input">{{ "report:: questions sans reponses" | trans }}</label>
</div> </div>
<div> <div>
<input name="tbl" type="radio" value="SITEACTIVITY" data-action="{{ path('report_activity_questions_nobestof') }}" id="SITEACTIVITY-input" class="formsubmiter" /> <input name="tbl" type="radio" value="SITEACTIVITY" data-action="{{ path('report_activity_instance_hours') }}" id="SITEACTIVITY-input" class="formsubmiter" />
<label for="SITEACTIVITY-input">{{ "report:: activite du site" | trans }}</label> <label for="SITEACTIVITY-input">{{{ "report:: activite du site" | trans }}</label>
</div> </div>
<div> <div>
<input name="tbl" type="radio" value="WDOC" data-action="{{ path('report_activity_documents_pushed') }}" id="WDOC" class="formsubmiter" /> <input name="tbl" type="radio" value="WDOC" data-action="{{ path('report_activity_documents_pushed') }}" id="WDOC" class="formsubmiter" />