Added date tips in header column with monthly label.
This commit is contained in:
parent
1d36510ac3
commit
1c4b9cfe87
4 changed files with 13 additions and 4 deletions
|
@ -65,6 +65,8 @@ public class OrganizationListView
|
||||||
|
|
||||||
String monthLabel = LocalDate.now().minusMonths(1).format(DateTimeFormatter.ofPattern("MMMM yyyy")).replace(" ", " ");
|
String monthLabel = LocalDate.now().minusMonths(1).format(DateTimeFormatter.ofPattern("MMMM yyyy")).replace(" ", " ");
|
||||||
data.setContent("monthLabel", monthLabel);
|
data.setContent("monthLabel", monthLabel);
|
||||||
|
data.setAttribute("userCountHeaderColumn", "title", monthLabel);
|
||||||
|
data.setAttribute("visitCountHeaderColumn", "title", monthLabel);
|
||||||
|
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for (Organization organization : organizations.sortByReverseServiceCount())
|
for (Organization organization : organizations.sortByReverseServiceCount())
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
*/
|
*/
|
||||||
package fr.devinsy.statoolinfos.htmlize;
|
package fr.devinsy.statoolinfos.htmlize;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
@ -68,6 +69,11 @@ public class ServiceListView
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
String monthLabel = LocalDate.now().minusMonths(1).format(DateTimeFormatter.ofPattern("MMMM yyyy")).replace(" ", " ");
|
||||||
|
data.setContent("monthLabel", monthLabel);
|
||||||
|
data.setAttribute("userCountHeaderColumn", "title", monthLabel);
|
||||||
|
data.setAttribute("visitCountHeaderColumn", "title", monthLabel);
|
||||||
|
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for (Service service : services.sortByName())
|
for (Service service : services.sortByName())
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
<th style="width: 200px;">Membre</th>
|
<th style="width: 200px;">Membre</th>
|
||||||
<th style="width: 250px;">URL</th>
|
<th style="width: 250px;">URL</th>
|
||||||
<th style="width: 10px;">Services</th>
|
<th style="width: 10px;">Services</th>
|
||||||
<th style="width: 10px;">Utilisateurs mensuels<sup>*</sup></th>
|
<th id="userCountHeaderColumn" style="width: 10px;">Utilisateurs mensuels<sup>*</sup></th>
|
||||||
<th style="width: 10px;">Visites mensuelles<sup>*</sup></th>
|
<th id="visitCountHeaderColumn" style="width: 10px;">Visites mensuelles<sup>*</sup></th>
|
||||||
<th style="width: 10px;">Date</th>
|
<th style="width: 10px;">Date</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
|
@ -52,8 +52,8 @@
|
||||||
<th class="" style="width: 225px;">Organisation</th>
|
<th class="" style="width: 225px;">Organisation</th>
|
||||||
<th class="">URL</th>
|
<th class="">URL</th>
|
||||||
<th class="">Logiciel</th>
|
<th class="">Logiciel</th>
|
||||||
<th class="" style="width: 100px;">Utilisateurs mensuels</th>
|
<th id="userCountHeaderColumn" class="" style="width: 100px;">Utilisateurs mensuels<sup>*</sup></th>
|
||||||
<th class="" style="width: 10px;">Visites mensuelles</th>
|
<th id="visitCountHeaderColumn" class="" style="width: 10px;">Visites mensuelles<sup>*</sup></th>
|
||||||
<th class="" style="width: 25px;">Statut</th>
|
<th class="" style="width: 25px;">Statut</th>
|
||||||
<th class="" style="width: 25px;" colspan="5">Inscription</th>
|
<th class="" style="width: 25px;" colspan="5">Inscription</th>
|
||||||
<th class="" style="width: 25px;" colspan="5">Liens</th>
|
<th class="" style="width: 25px;" colspan="5">Liens</th>
|
||||||
|
@ -131,6 +131,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<div id="month_asterisk">(*) chiffres de <span id="monthLabel">n/a</span></div>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function()
|
$(document).ready(function()
|
||||||
|
|
Loading…
Reference in a new issue