statool/statoolinfosweb
statool/statoolinfosweb
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Activity

Fixed n/a sort and date sort.

Browse source
This commit is contained in:
Christian P. MOMON 2021-06-04 16:51:50 +02:00
parent b1434d284b
commit cccd606ac7
4 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/fr/devinsy/statoolinfos/htmlize/FederationPage.java
View file

@ -128,26 +128,8 @@ public class FederationPage
data.setEscapedAttribute("organizationListLine", index, "organizationListLineUrlLink", "href", organization.getWebsite()); data.setEscapedAttribute("organizationListLine", index, "organizationListLineUrlLink", "href", organization.getWebsite());
data.setContent("organizationListLine", index, "organizationListLineServiceCount", organization.getServiceCount()); data.setContent("organizationListLine", index, "organizationListLineServiceCount", organization.getServiceCount());
data.setContent("organizationListLine", index, "organizationListLineUserCount", organization.getPreviousMonthUserCount());
long count = organization.getPreviousMonthUserCount(); data.setContent("organizationListLine", index, "organizationListLineVisitCount", organization.getPreviousMonthVisitCount());
if (count == 0)
{
data.setContent("organizationListLine", index, "organizationListLineUserCount", "n/a");
}
else
{
data.setContent("organizationListLine", index, "organizationListLineUserCount", count);
}
count = organization.getPreviousMonthVisitCount();
if (count == 0)
{
data.setContent("organizationListLine", index, "organizationListLineVisitCount", "n/a");
}
else
{
data.setContent("organizationListLine", index, "organizationListLineVisitCount", count);
}
data.setContent("organizationListLine", index, "organizationListLineDate", organization.getCrawledDate().format(DateTimeFormatter.ofPattern("dd/MM/YYYY"))); data.setContent("organizationListLine", index, "organizationListLineDate", organization.getCrawledDate().format(DateTimeFormatter.ofPattern("dd/MM/YYYY")));
data.setAttribute("organizationListLine", index, "organizationListLineDate", "title", organization.getCrawledDate().format(DateTimeFormatter.ofPattern("HH:mm:ss"))); data.setAttribute("organizationListLine", index, "organizationListLineDate", "title", organization.getCrawledDate().format(DateTimeFormatter.ofPattern("HH:mm:ss")));

4
src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
View file

@ -85,6 +85,10 @@ public class ServiceListView
data.setEscapedContent("serviceListLine", index, "serviceListLineSoftwareLink", service.getSoftwareName()); data.setEscapedContent("serviceListLine", index, "serviceListLineSoftwareLink", service.getSoftwareName());
data.setAttribute("serviceListLine", index, "serviceListLineSoftwareLink", "href", "software-" + service.getSoftwareTechnicalName() + ".xhtml"); data.setAttribute("serviceListLine", index, "serviceListLineSoftwareLink", "href", "software-" + service.getSoftwareTechnicalName() + ".xhtml");
data.setContent("serviceListLine", index, "serviceListLineUserCount", service.getPreviousMonthUserCount());
data.setContent("serviceListLine", index, "serviceListLineVisitCount", service.getPreviousMonthVisitCount());
data.setEscapedContent("serviceListLine", index, "serviceListLineDate", service.getCrawledDate().format(DateTimeFormatter.ofPattern("dd/MM/YYYY"))); data.setEscapedContent("serviceListLine", index, "serviceListLineDate", service.getCrawledDate().format(DateTimeFormatter.ofPattern("dd/MM/YYYY")));
data.setEscapedAttribute("serviceListLine", index, "serviceListLineDate", "title", service.getCrawledDate().format(DateTimeFormatter.ofPattern("HH:mm:ss"))); data.setEscapedAttribute("serviceListLine", index, "serviceListLineDate", "title", service.getCrawledDate().format(DateTimeFormatter.ofPattern("HH:mm:ss")));

3
src/fr/devinsy/statoolinfos/htmlize/federation.xhtml
View file

@ -50,7 +50,8 @@
paging: false, paging: false,
ordering: true, ordering: true,
"order": [[ 2, "desc" ]], "order": [[ 2, "desc" ]],
language: dataTableFrench language: dataTableFrench,
"columns": [null, null, null, null, null, { "sType": "date" } ]
}); });
</script> </script>
</body> </body>

8
src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
View file

@ -11,7 +11,7 @@
<script src="Chart.bundle.min.js"></script> <script src="Chart.bundle.min.js"></script>
</head> </head>
<body> <body>
<div class="center_table" style="width: 1450px;"> <div class="center_table" style="width: 1500px;">
<br/> <br/>
<div class="center">Nombre de services : <span id="serviceCount">n/a</span></div> <div class="center">Nombre de services : <span id="serviceCount">n/a</span></div>
@ -53,6 +53,7 @@
<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 class="" style="width: 100px;">Utilisateurs mensuels</th>
<th class="" style="width: 10px;">Visites mensuelles</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>
@ -79,6 +80,7 @@
<a href="#" id="serviceListLineSoftwareLink" title="">n/a</a> <a href="#" id="serviceListLineSoftwareLink" title="">n/a</a>
</td> </td>
<td id="serviceListLineUserCount" class="td_number">n/a</td> <td id="serviceListLineUserCount" class="td_number">n/a</td>
<td id="serviceListLineVisitCount" class="td_number">n/a</td>
<td id="" class="td_icon_alone"> <td id="" class="td_icon_alone">
<img id="serviceStatusImg" src="status-void.png" title="n/a"/> <img id="serviceStatusImg" src="status-void.png" title="n/a"/>
@ -136,7 +138,9 @@
paging: false, paging: false,
ordering: true, ordering: true,
"order": [[ 2, "desc" ]], "order": [[ 2, "desc" ]],
language: dataTableFrench language: dataTableFrench,
"columns": [null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, { "sType": "date" } ]
}); });
</script> </script>
</body> </body>