statool/statoolinfos
statool/statoolinfos
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Refactored service list view.

Browse source
This commit is contained in:
Christian P. MOMON 2020-10-04 00:36:21 +02:00
parent 30f84673e1
commit cd6708592a
8 changed files with 179 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/fr/devinsy/statoolinfos/htmlize/CategoryPage.java
View file

@ -22,7 +22,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.statoolinfos.core.Category;
import fr.devinsy.statoolinfos.core.Service;
import fr.devinsy.statoolinfos.core.Services;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
import fr.devinsy.xidyn.XidynException;
@ -61,25 +60,7 @@ public class CategoryPage
data.setContent("categoryDescription", category.getDescription());
data.setContent("categorySoftwares", category.getSoftwares().sort().toStringWithFrenchCommas());
data.setContent("serviceCount", services.size());
int index = 0;
for (Service service : services.sortByName())
{
data.setAttribute("serviceListLine", index, "serviceListLineNameLink", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
data.setAttribute("serviceListLine", index, "serviceListLineLogo", "src", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-logo.png");
data.setEscapedContent("serviceListLine", index, "serviceListLineNameValue", service.getName());
data.setAttribute("serviceListLine", index, "serviceListLineOrganizationLink", "href", service.getOrganization().getTechnicalName() + ".xhtml");
data.setAttribute("serviceListLine", index, "serviceListLineOrganizationLogo", "src", service.getOrganization().getTechnicalName() + "-logo.png");
data.setEscapedContent("serviceListLine", index, "serviceListLineOrganizationValue", service.getOrganization().getName());
data.setEscapedContent("serviceListLine", index, "serviceListLineUrlLink", service.getWebsite());
data.setEscapedContent("serviceListLine", index, "serviceListLineWebsiteLink", service.getWebsite());
data.setAttribute("serviceListLine", index, "serviceListLineWebsiteLink", "href", service.getWebsite());
data.setEscapedContent("serviceListLine", index, "serviceListLineSoftware", service.getSoftwareName());
index += 1;
}
data.setContent("serviceListView", ServiceListView.build(services.sortByName()));
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/category.xhtml", data).toString();

20
src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
View file

@ -22,9 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.statoolinfos.core.Organization;
import fr.devinsy.statoolinfos.core.Service;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
import fr.devinsy.statoolinfos.core.StatoolInfosUtils;
import fr.devinsy.xidyn.XidynException;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
@ -61,23 +59,7 @@ public class OrganizationPage
data.setEscapedContent("organizationName", organization.get("organization.name"));
data.setEscapedContent("organizationDescription", organization.get("organization.description"));
data.setContent("serviceCount", organization.getServices().size());
int index = 0;
for (Service service : organization.getServices().sortByName())
{
data.setAttribute("serviceListLine", index, "serviceListLineNameLink", "href", organization.getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
data.setAttribute("serviceListLine", index, "serviceListLineLogo", "src", organization.getTechnicalName() + "-" + service.getTechnicalName() + "-logo.png");
data.setEscapedContent("serviceListLine", index, "serviceListLineNameValue", service.getName());
data.setEscapedContent("serviceListLine", index, "serviceListLineWebsiteLink", service.getWebsite());
data.setAttribute("serviceListLine", index, "serviceListLineWebsiteLink", "href", service.getWebsite());
data.setAttribute("serviceListLine", index, "serviceListLineSoftwareLink", "href", "software-" + StatoolInfosUtils.toTechnicalName(service.getSoftwareName()) + ".xhtml");
data.setEscapedContent("serviceListLine", index, "serviceListLineSoftwareValue", service.getSoftwareName());
data.setEscapedContent("serviceListLine", index, "serviceListLineDate", service.getCrawledDate().toString());
index += 1;
}
data.setContent("serviceListView", ServiceListView.build(organization.getServices().sortByName()));
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/organization.xhtml", data).toString();

111
src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java Normal file
View file

@ -0,0 +1,111 @@
/*
* Copyright (C) 2020 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
* StatoolInfos is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* StatoolInfos is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.htmlize;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.statoolinfos.core.Service;
import fr.devinsy.statoolinfos.core.Services;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
import fr.devinsy.xidyn.XidynException;
import fr.devinsy.xidyn.data.DisplayMode;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
import fr.devinsy.xidyn.utils.XidynUtils;
/**
* The Class ServiceListView.
*/
public class ServiceListView
{
private static Logger logger = LoggerFactory.getLogger(ServiceListView.class);
/**
* Builds the.
*
* @param services
* the services
* @return the string
* @throws StatoolInfosException
* the statool infos exception
*/
public static String build(final Services services) throws StatoolInfosException
{
String result;
try
{
logger.debug("Building service list view.");
TagDataManager data = new TagDataManager();
int index = 0;
for (Service service : services.sortByName())
{
data.setAttribute("serviceListLine", index, "serviceListLineLogo", "src", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-logo.png");
data.setEscapedContent("serviceListLine", index, "serviceListLineNameValue", service.getName());
data.setAttribute("serviceListLine", index, "serviceListLineNameLink", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
data.setAttribute("serviceListLine", index, "serviceListLineOrganizationLink", "href", service.getOrganization().getTechnicalName() + ".xhtml");
data.setAttribute("serviceListLine", index, "serviceListLineOrganizationLogo", "src", service.getOrganization().getTechnicalName() + "-logo.png");
data.setEscapedContent("serviceListLine", index, "serviceListLineOrganizationValue", service.getOrganization().getName());
data.setEscapedContent("serviceListLine", index, "serviceListLineUrlLink", service.getWebsite());
data.setEscapedContent("serviceListLine", index, "serviceListLineWebsiteLink", service.getWebsite());
data.setAttribute("serviceListLine", index, "serviceListLineWebsiteLink", "href", service.getWebsite());
data.setEscapedContent("serviceListLine", index, "serviceListLineSoftware", service.getSoftwareName());
data.setEscapedContent("serviceListLine", index, "serviceListLineDate", service.getCrawledDate().toString());
if (service.isRegistrationNone())
{
data.setAttribute("serviceListLine", index, "serviceListLineRegistrationNoneImg", "class", "toto");
data.getIdData("serviceListLine", index, "serviceListLineRegistrationNoneImg").getAttribute("class").setMode(DisplayMode.REPLACE);
}
if (service.isRegistrationFree())
{
data.setAttribute("serviceListLine", index, "serviceListLineRegistrationFreeImg", "class", "");
data.getIdData("serviceListLine", index, "serviceListLineRegistrationFreeImg").getAttribute("class").setMode(DisplayMode.REPLACE);
}
if (service.isRegistrationMember())
{
data.setAttribute("serviceListLine", index, "serviceListLineRegistrationMemberImg", "class", "");
data.getIdData("serviceListLine", index, "serviceListLineRegistrationMemberImg").getAttribute("class").setMode(DisplayMode.REPLACE);
}
if (service.isRegistrationClient())
{
data.setAttribute("serviceListLine", index, "serviceListLineRegistrationClientImg", "class", "");
data.getIdData("serviceListLine", index, "serviceListLineRegistrationClientImg").getAttribute("class").setMode(DisplayMode.REPLACE);
}
index += 1;
}
result = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml", data).toString();
result = XidynUtils.extractBodyContent(result);
}
catch (XidynException exception)
{
throw new StatoolInfosException("Error building service page: " + exception.getMessage(), exception);
}
//
return result;
}
}

44
src/fr/devinsy/statoolinfos/htmlize/ServicesPage.java
View file

@ -21,11 +21,9 @@ package fr.devinsy.statoolinfos.htmlize;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.statoolinfos.core.Service;
import fr.devinsy.statoolinfos.core.Services;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
import fr.devinsy.xidyn.XidynException;
import fr.devinsy.xidyn.data.DisplayMode;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
@ -56,47 +54,7 @@ public class ServicesPage
TagDataManager data = new TagDataManager();
data.setContent("serviceCount", services.size());
int index = 0;
for (Service service : services.sortByName())
{
data.setAttribute("serviceListLine", index, "serviceListLineLogo", "src", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-logo.png");
data.setEscapedContent("serviceListLine", index, "serviceListLineNameValue", service.getName());
data.setAttribute("serviceListLine", index, "serviceListLineNameLink", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
data.setAttribute("serviceListLine", index, "serviceListLineOrganizationLink", "href", service.getOrganization().getTechnicalName() + ".xhtml");
data.setAttribute("serviceListLine", index, "serviceListLineOrganizationLogo", "src", service.getOrganization().getTechnicalName() + "-logo.png");
data.setEscapedContent("serviceListLine", index, "serviceListLineOrganizationValue", service.getOrganization().getName());
data.setEscapedContent("serviceListLine", index, "serviceListLineUrlLink", service.getWebsite());
data.setEscapedContent("serviceListLine", index, "serviceListLineWebsiteLink", service.getWebsite());
data.setAttribute("serviceListLine", index, "serviceListLineWebsiteLink", "href", service.getWebsite());
data.setEscapedContent("serviceListLine", index, "serviceListLineSoftware", service.getSoftwareName());
data.setEscapedContent("serviceListLine", index, "serviceListLineDate", service.getCrawledDate().toString());
if (service.isRegistrationNone())
{
data.setAttribute("serviceListLine", index, "serviceListLineRegistrationNoneImg", "class", "toto");
data.getIdData("serviceListLine", index, "serviceListLineRegistrationNoneImg").getAttribute("class").setMode(DisplayMode.REPLACE);
}
if (service.isRegistrationFree())
{
data.setAttribute("serviceListLine", index, "serviceListLineRegistrationFreeImg", "class", "");
data.getIdData("serviceListLine", index, "serviceListLineRegistrationFreeImg").getAttribute("class").setMode(DisplayMode.REPLACE);
}
if (service.isRegistrationMember())
{
data.setAttribute("serviceListLine", index, "serviceListLineRegistrationMemberImg", "class", "");
data.getIdData("serviceListLine", index, "serviceListLineRegistrationMemberImg").getAttribute("class").setMode(DisplayMode.REPLACE);
}
if (service.isRegistrationClient())
{
data.setAttribute("serviceListLine", index, "serviceListLineRegistrationClientImg", "class", "");
data.getIdData("serviceListLine", index, "serviceListLineRegistrationClientImg").getAttribute("class").setMode(DisplayMode.REPLACE);
}
index += 1;
}
data.setContent("serviceListView", ServiceListView.build(services));
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/services.xhtml", data).toString();

31
src/fr/devinsy/statoolinfos/htmlize/category.xhtml
View file

@ -19,36 +19,7 @@
<div>Logiciels : <span id="categorySoftwares">Bla bla logiciels</span></div>
<div>Nombre de services : <span id="serviceCount">n/a</span></div>
</div>
<table class="table_classic sortable left">
<thead>
<tr>
<th class="" style="width: 200px;">Nom du service</th>
<th class="" style="width: 200px;">Organisation</th>
<th class="" style="width: 200px;">URL</th>
<th class="" style="width: 200px;">Logiciel</th>
<th class="" style="width: 100px;">Utilisateurs mensuels</th>
</tr>
</thead>
<tbody>
<tr id="serviceListLine">
<td id="serviceListLineName" style="padding-top: 0; padding-bottom: 0;">
<a href="#" id="serviceListLineNameLink">
<img id="serviceListLineLogo" src="" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
&#160;<span id="serviceListLineNameValue">n/a</span>
</a>
</td>
<td id="serviceListLineOrganization" style="padding-top: 0; padding-bottom: 0;">
<a href="#" id="serviceListLineOrganizationLink">
<img id="serviceListLineOrganizationLogo" src="" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
&#160;<span id="serviceListLineOrganizationValue">n/a</span>
</a>
</td>
<td id="serviceListLineWebsite"><a href="#" id="serviceListLineWebsiteLink">n/a</a></td>
<td id="serviceListLineSoftware">n/a</td>
<td id="serviceListLineUserCount" class="td_number">n/a</td>
</tr>
</tbody>
</table>
<div id="serviceListView" />
</div>
</body>
</html>

30
src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
View file

@ -21,35 +21,7 @@
<p id="organizationDescription">Bla bla description</p>
<div>Nombre de services : <span id="serviceCount">n/a</span></div>
</div>
<table class="table_classic sortable left" >
<thead>
<tr>
<th class="" style="width: 200px;">Nom du service</th>
<th class="">URL</th>
<th class="">Logiciel</th>
<th class="" style="width: 100px;">Utilisateurs mensuels</th>
<th class="" style="width: 100px;">Date</th>
</tr>
</thead>
<tbody>
<tr id="serviceListLine">
<td id="serviceListLineName" style="padding-top: 0; padding-bottom: 0;">
<a href="#" id="serviceListLineNameLink">
<img id="serviceListLineLogo" src="" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
&#160;<span id="serviceListLineNameValue">n/a</span>
</a>
</td>
<td id="serviceListLineWebsite"><a href="#" id="serviceListLineWebsiteLink">n/a</a></td>
<td id="serviceListLineSoftware">
<a href="#" id="serviceListLineSoftwareLink">
<span id="serviceListLineSoftwareValue">n/a</span>
</a>
</td>
<td id="serviceListLineUserCount" class="td_number">n/a</td>
<td id="serviceListLineDate" class="center">n/a</td>
</tr>
</tbody>
</table>
<div id="serviceListView" />
</div>
</body>
</html>

62
src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml Normal file
View file

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>StatoolInfos</title>
<meta charset="UTF-8" />
<meta name="keywords" content="statoolinfos,devinsy,federation" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="statoolinfos.css" />
<script src="sorttable.js" />
<script src="Chart.bundle.min.js"></script>
</head>
<body>
<div class="center_table" style="width: 1000px;">
<table class="table_classic sortable left">
<thead>
<tr>
<th class="" style="width: 200px;">Nom du service</th>
<th class="" style="width: 200px;">Organisation</th>
<th class="">URL</th>
<th class="">Logiciel</th>
<th class="" style="width: 100px;">Utilisateurs mensuels</th>
<th class="" style="width: 25px;" colspan="4">Registration</th>
<th class="" style="width: 100px;">Date</th>
</tr>
</thead>
<tbody>
<tr id="serviceListLine">
<td id="serviceListLineName" style="padding-top: 0; padding-bottom: 0;">
<a href="#" id="serviceListLineNameLink">
<img id="serviceListLineLogo" src="" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
&#160;<span id="serviceListLineNameValue">n/a</span>
</a>
</td>
<td id="serviceListLineOrganization" style="padding-top: 0; padding-bottom: 0;">
<a href="#" id="serviceListLineOrganizationLink">
<img id="serviceListLineOrganizationLogo" src="" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
&#160;<span id="serviceListLineOrganizationValue">n/a</span>
</a>
</td>
<td id="serviceListLineWebsite"><a href="#" id="serviceListLineWebsiteLink">n/a</a></td>
<td id="serviceListLineSoftware">n/a</td>
<td id="serviceListLineUserCount" class="td_number">n/a</td>
<td id="serviceListLineRegistrationNone" class="td_center" style="padding-top: 0; padding-bottom: 0;">
<img id="serviceListLineRegistrationNoneImg" src="circle-icons/mono/global.png" class="disabled" style="width: 25px; height: 25px; padding-top:0; padding-bottom: 0; vertical-align: middle;" title="Sans compte"/>
</td>
<td id="serviceListLineRegistrationFree" class="td_center" style="padding-top: 0; padding-bottom: 0;">
<img id="serviceListLineRegistrationFreeImg" src="circle-icons/mono/profile.png" class="disabled" style="width: 25px; height: 25px; padding-top:0; padding-bottom: 0; vertical-align: middle;" title="Compte libre"/>
</td>
<td id="serviceListLineRegistrationMember" class="td_center" style="padding-top: 0; padding-bottom: 0;">
<img id="serviceListLineRegistrationMemberImg" src="circle-icons/mono/money.png" class="disabled" style="width: 25px; height: 25px; padding-top:0; padding-bottom: 0; vertical-align: middle;" title="Réservé aux adhérents"/>
</td>
<td id="serviceListLineRegistrationClient" class="td_center" style="padding-top: 0; padding-bottom: 0;">
<img id="serviceListLineRegistrationClientImg" src="circle-icons/mono/creditcard.png" class="disabled" style="width: 25px; height: 25px; padding-top:0; padding-bottom: 0; vertical-align: middle;" title="Réservé aux clients"/>
</td>
<td id="serviceListLineDate" class="center">n/a</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>

46
src/fr/devinsy/statoolinfos/htmlize/services.xhtml
View file

@ -17,51 +17,7 @@
<div>Nombre de services : <span id="serviceCount">n/a</span></div>
</div>
<table class="table_classic sortable left">
<thead>
<tr>
<th class="" style="width: 200px;">Nom du service</th>
<th class="" style="width: 200px;">Organisation</th>
<th class="">URL</th>
<th class="">Logiciel</th>
<th class="" style="width: 100px;">Utilisateurs mensuels</th>
<th class="" style="width: 25px;" colspan="4">Registration</th>
<th class="" style="width: 100px;">Date</th>
</tr>
</thead>
<tbody>
<tr id="serviceListLine">
<td id="serviceListLineName" style="padding-top: 0; padding-bottom: 0;">
<a href="#" id="serviceListLineNameLink">
<img id="serviceListLineLogo" src="" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
&#160;<span id="serviceListLineNameValue">n/a</span>
</a>
</td>
<td id="serviceListLineOrganization" style="padding-top: 0; padding-bottom: 0;">
<a href="#" id="serviceListLineOrganizationLink">
<img id="serviceListLineOrganizationLogo" src="" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
&#160;<span id="serviceListLineOrganizationValue">n/a</span>
</a>
</td>
<td id="serviceListLineWebsite"><a href="#" id="serviceListLineWebsiteLink">n/a</a></td>
<td id="serviceListLineSoftware">n/a</td>
<td id="serviceListLineUserCount" class="td_number">n/a</td>
<td id="serviceListLineRegistrationNone" class="td_center" style="padding-top: 0; padding-bottom: 0;">
<img id="serviceListLineRegistrationNoneImg" src="circle-icons/mono/global.png" class="disabled" style="width: 25px; height: 25px; padding-top:0; padding-bottom: 0; vertical-align: middle;" title="Sans compte"/>
</td>
<td id="serviceListLineRegistrationFree" class="td_center" style="padding-top: 0; padding-bottom: 0;">
<img id="serviceListLineRegistrationFreeImg" src="circle-icons/mono/profile.png" class="disabled" style="width: 25px; height: 25px; padding-top:0; padding-bottom: 0; vertical-align: middle;" title="Compte libre"/>
</td>
<td id="serviceListLineRegistrationMember" class="td_center" style="padding-top: 0; padding-bottom: 0;">
<img id="serviceListLineRegistrationMemberImg" src="circle-icons/mono/money.png" class="disabled" style="width: 25px; height: 25px; padding-top:0; padding-bottom: 0; vertical-align: middle;" title="Réservé aux adhérents"/>
</td>
<td id="serviceListLineRegistrationClient" class="td_center" style="padding-top: 0; padding-bottom: 0;">
<img id="serviceListLineRegistrationClientImg" src="circle-icons/mono/creditcard.png" class="disabled" style="width: 25px; height: 25px; padding-top:0; padding-bottom: 0; vertical-align: middle;" title="Réservé aux clients"/>
</td>
<td id="serviceListLineDate" class="center">n/a</td>
</tr>
</tbody>
</table>
<div id="serviceListView" />
</div>
</body>
</html>