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

Minor report updates

Browse Source
This commit is contained in:
Romain Neutron
2013-09-18 12:07:07 +02:00
parent ff1da1d734
commit 756f6095a7
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/module/report/dashboard.php
View File

@@ -54,7 +54,7 @@ class module_report_dashboard implements module_report_dashboard_componentInterf
* @desc la periode par defaut d'affichage du dashboard * @desc la periode par defaut d'affichage du dashboard
* @var <string> * @var <string>
*/ */
public $periode = '-1 month'; public $periode = '-5 days';
/** /**
* @desc le sbasid de la base ou on effectue le report * @desc le sbasid de la base ou on effectue le report
@@ -168,7 +168,7 @@ class module_report_dashboard implements module_report_dashboard_componentInterf
{ {
return $this->dashboard; return $this->dashboard;
} }
/** /**
* @desc construct the legend for charts * @desc construct the legend for charts
* if dmax === false dmax = now(); * if dmax === false dmax = now();
@@ -276,7 +276,7 @@ class module_report_dashboard implements module_report_dashboard_componentInterf
$listeColl[] = (int) $value['coll_id']; $listeColl[] = (int) $value['coll_id'];
} }
$this->authorizedCollection[] = array( $this->authorizedCollection[(int) $sbas] = array(
'sbas_id' => (int) $sbas, 'sbas_id' => (int) $sbas,
'coll' => implode(',', $listeColl), 'coll' => implode(',', $listeColl),
'name' => phrasea::sbas_labels($sbas, $this->app) 'name' => phrasea::sbas_labels($sbas, $this->app)

7
templates/web/report/ajax_dashboard_content.html.twig
View File

@@ -2,12 +2,9 @@
<div id="title_dash" class="center" style="clear:left;">{% trans "report:: Dashboard" %}</div> <div id="title_dash" class="center" style="clear:left;">{% trans "report:: Dashboard" %}</div>
<div id="periode_dash" class="center" >{{ dashboard.getTitleDate('dmin') }} - {{ dashboard.getTitleDate('dmax') }}</div> <div id="periode_dash" class="center" >{{ dashboard.getTitleDate('dmin') }} - {{ dashboard.getTitleDate('dmax') }}</div>
<div id="liste_dash" class="center"> <div id="liste_dash" class="center">
<em id="em_all" class="selected_em" >Toutes les bases</em>
{% for key in dashboard.authorizedCollection|keys %} {% for key in dashboard.authorizedCollection|keys %}
{% if not loop.first %} <em id="em_{{ key }}" >{{ key|sbas_labels(app) }}</em>
<em id="em_{{ key }}" >{{ key|sbas_labels(app) }}</em>
{% else %}
<em id="em_all" class="selected_em" >Toutes les bases</em>
{% endif %}
{% endfor %} {% endfor %}
</div> </div>
<div id="dashboard-table" > <div id="dashboard-table" >