From 41f83dd7f286a002338e5bb8f653f1d4df42fa7a Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Sat, 3 Oct 2020 06:30:47 +0200 Subject: [PATCH] Improved service page. --- src/fr/devinsy/statoolinfos/core/Service.java | 100 ++++++++++++++++++ .../statoolinfos/htmlize/Htmlizer.java | 48 +++++---- .../statoolinfos/htmlize/ServicePage.java | 53 +++++++++- .../statoolinfos/htmlize/service.xhtml | 58 +++++----- .../stuff/circle-icons/color/document.png | Bin 0 -> 2192 bytes .../stuff/circle-icons/mono/document.png | Bin 0 -> 2094 bytes .../htmlize/stuff/statoolinfos.css | 26 +++++ .../properties/PathPropertyList.java | 55 ++++++++-- 8 files changed, 271 insertions(+), 69 deletions(-) create mode 100644 src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/document.png create mode 100644 src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/document.png diff --git a/src/fr/devinsy/statoolinfos/core/Service.java b/src/fr/devinsy/statoolinfos/core/Service.java index 8699311..b2b6ad2 100644 --- a/src/fr/devinsy/statoolinfos/core/Service.java +++ b/src/fr/devinsy/statoolinfos/core/Service.java @@ -57,6 +57,36 @@ public class Service extends PathPropertyList super(properties); } + /** + * Gets the contact email. + * + * @return the contact email + */ + public String getContactEmail() + { + String result; + + result = get("service.contact.email"); + + // + return result; + } + + /** + * Gets the contact website. + * + * @return the contact website + */ + public String getContactWebsite() + { + String result; + + result = get("service.contact.url"); + + // + return result; + } + public LocalDateTime getCrawledDate() { LocalDateTime result; @@ -82,6 +112,21 @@ public class Service extends PathPropertyList return result; } + /** + * Gets the end date. + * + * @return the end date + */ + public String getEndDate() + { + String result; + + result = get("service.enddate", "service.deathdate"); + + // + return result; + } + public File getInputFile() { return this.inputFile; @@ -92,6 +137,21 @@ public class Service extends PathPropertyList return this.inputURL; } + /** + * Gets the legal website. + * + * @return the legal website + */ + public String getLegalWebsite() + { + String result; + + result = get("service.legal.url", "service.legal"); + + // + return result; + } + /** * Gets the logo URL. * @@ -152,6 +212,31 @@ public class Service extends PathPropertyList return result; } + /** + * Gets the start date. + * + * @return the start date + */ + public String getStartDate() + { + String result; + + result = get("service.startdate", "service.birthdate"); + + // + return result; + } + + public String getTechnicalDocWebsite() + { + String result; + + result = get("service.documentation.technical", "service.documentation.technical.url"); + + // + return result; + } + /** * Gets the technical name. * @@ -182,6 +267,21 @@ public class Service extends PathPropertyList return result; } + /** + * Gets the user doc. + * + * @return the user doc + */ + public String getUserDocWebsite() + { + String result; + + result = get("service.documentation.user", "service.documentation.user.url", "service.documentation.tutorial", "service.documentation.tutorial.url"); + + // + return result; + } + /** * Gets the website. * diff --git a/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java index 26dc5f4..3b47959 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java +++ b/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java @@ -127,33 +127,39 @@ public class Htmlizer File mono = new File(targetDirectory, "circle-icons/mono"); mono.mkdirs(); - StatoolInfosUtils.copyRessource(source + "circle-icons/color/global.png", color); - StatoolInfosUtils.copyRessource(source + "circle-icons/mono/global.png", mono); - - StatoolInfosUtils.copyRessource(source + "circle-icons/color/email.png", color); - StatoolInfosUtils.copyRessource(source + "circle-icons/mono/email.png", mono); - - StatoolInfosUtils.copyRessource(source + "circle-icons/color/profile.png", color); - StatoolInfosUtils.copyRessource(source + "circle-icons/mono/profile.png", mono); - - StatoolInfosUtils.copyRessource(source + "circle-icons/color/money.png", color); - StatoolInfosUtils.copyRessource(source + "circle-icons/mono/money.png", mono); - - StatoolInfosUtils.copyRessource(source + "circle-icons/color/creditcard.png", color); - StatoolInfosUtils.copyRessource(source + "circle-icons/mono/creditcard.png", mono); - - StatoolInfosUtils.copyRessource(source + "circle-icons/color/mail.png", color); - StatoolInfosUtils.copyRessource(source + "circle-icons/mono/mail.png", mono); - - StatoolInfosUtils.copyRessource(source + "circle-icons/color/ribbon.png", color); - StatoolInfosUtils.copyRessource(source + "circle-icons/mono/ribbon.png", mono); - StatoolInfosUtils.copyRessource(source + "circle-icons/color/booklet.png", color); StatoolInfosUtils.copyRessource(source + "circle-icons/mono/booklet.png", mono); StatoolInfosUtils.copyRessource(source + "circle-icons/color/bookshelf.png", color); StatoolInfosUtils.copyRessource(source + "circle-icons/mono/bookshelf.png", mono); + StatoolInfosUtils.copyRessource(source + "circle-icons/color/contacts.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/contacts.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/document.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/document.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/creditcard.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/creditcard.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/email.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/email.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/global.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/global.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/mail.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/mail.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/money.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/money.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/profile.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/profile.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/ribbon.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/ribbon.png", mono); + StatoolInfosUtils.copyRessource(source + "circle-icons/color/toolbox.png", color); StatoolInfosUtils.copyRessource(source + "circle-icons/mono/toolbox.png", mono); diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java index ccce023..d1b0ed9 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java +++ b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java @@ -18,6 +18,7 @@ */ package fr.devinsy.statoolinfos.htmlize; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,15 +56,61 @@ public class ServicePage TagDataManager data = new TagDataManager(); - data.setAttribute("serviceRawButton", "href", organization.getTechnicalName() + "-" + service.getTechnicalName() + ".properties"); - data.setAttribute("serviceLogo", "src", organization.getTechnicalName() + "-" + service.getTechnicalName() + "-logo.png"); + data.setEscapedContent("serviceName", service.getName()); + data.setAttribute("serviceName", "href", service.getWebsite()); + + data.setEscapedContent("serviceURL", service.getWebsite()); + data.setAttribute("serviceURL", "href", service.getWebsite()); + + data.setContent("serviceStartDate", service.getStartDate()); + data.setContent("serviceEndDate", service.getEndDate()); data.setEscapedContent("serviceDescription", service.getDescription()); + data.setAttribute("rawLink", "href", organization.getTechnicalName() + "-" + service.getTechnicalName() + ".properties"); + + if (StringUtils.isNotBlank(service.getLegalWebsite())) + { + data.setAttribute("legalLink", "href", service.getLegalWebsite()); + data.setAttribute("legalLinkImg", "class", ""); + data.getIdData("legalLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + if (StringUtils.isNotBlank(service.getContactWebsite())) + { + data.setAttribute("contactLink", "href", service.getContactWebsite()); + data.setAttribute("contactLinkImg", "class", ""); + data.getIdData("contactLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + if (StringUtils.isNotBlank(service.getContactEmail())) + { + data.setAttribute("emailLink", "href", "mailto:" + service.getContactEmail()); + data.setAttribute("emailLinkImg", "class", ""); + data.getIdData("emailLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + if (StringUtils.isNotBlank(service.getContactEmail())) + { + data.setAttribute("contactDocLink", "href", service.getContactWebsite()); + data.setAttribute("contactDocLinkImg", "class", ""); + data.getIdData("contactDocLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + if (StringUtils.isNotBlank(service.getUserDocWebsite())) + { + data.setAttribute("userDocLink", "href", service.getUserDocWebsite()); + data.setAttribute("userDocLinkImg", "class", ""); + data.getIdData("userDocLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + if (StringUtils.isNotBlank(service.getTechnicalDocWebsite())) + { + data.setAttribute("technicalDocLink", "href", service.getTechnicalDocWebsite()); + data.setAttribute("technicalDocLinkImg", "class", ""); + data.getIdData("technicalDocLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + + // if (service.isRegistrationNone()) { - data.setAttribute("registrationNoneImg", "class", "toto"); + data.setAttribute("registrationNoneImg", "class", ""); data.getIdData("registrationNoneImg").getAttribute("class").setMode(DisplayMode.REPLACE); } if (service.isRegistrationFree()) diff --git a/src/fr/devinsy/statoolinfos/htmlize/service.xhtml b/src/fr/devinsy/statoolinfos/htmlize/service.xhtml index a975858..4ffd74f 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/service.xhtml +++ b/src/fr/devinsy/statoolinfos/htmlize/service.xhtml @@ -11,43 +11,33 @@ -
-
-

Service name

-
- Raw +
+
+
+
- -
- - - - +
+
Service name
+
URL n/a
+

Description absente…

+
Ouverture n/a
- -

Bla bla description

-
 
- - - - - - - - - - - - - - - - - - - -
Nom du serviceURLLogicielUtilisateurs mensuelsDate
n/an/an/an/an/a
+
+ + + + +
+
+ + + + + + +
+
diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/document.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/document.png new file mode 100644 index 0000000000000000000000000000000000000000..9b120cf47db2d65e008e2c219d76d6aac544a216 GIT binary patch literal 2192 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 Y08}KaVSo>5c>n+a07*qoM6N<$f~8E$UjP6A literal 0 HcmV?d00001 diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css b/src/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css index 57d0a0b..f0ee410 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css +++ b/src/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css @@ -721,3 +721,29 @@ table > tfoot > tr > th.danger border-collapse: collapse; color: #6f6e60; /* #2e2d30; */ } + +/************************************************/ +.content_title, +.content_title a, +.content_title span +{ + font-family: ITCAvantGardeStd-Md, Arial, Helvetica, sans-serif; + font-weight:normal; + color:#0084FF; + font-size:20px; + margin-top:20px; + margin-bottom:10px; + text-decoration: none; +} + +.content_subtitle, +.content_subtitle a, +.content_subtitle span +{ + color:#0084FF; + font-weight:normal; + font-size:15px; + margin-top:5x; + font-family: ITCAvantGardeStd-Md, Arial, Helvetica, sans-serif; + text-decoration: none; +} diff --git a/src/fr/devinsy/statoolinfos/properties/PathPropertyList.java b/src/fr/devinsy/statoolinfos/properties/PathPropertyList.java index 143b4ce..2df9c10 100644 --- a/src/fr/devinsy/statoolinfos/properties/PathPropertyList.java +++ b/src/fr/devinsy/statoolinfos/properties/PathPropertyList.java @@ -119,6 +119,47 @@ public class PathPropertyList extends ArrayList implements PathPro return result; } + /** + * Gets the. + * + * @param paths + * the paths + * @return the string + */ + public String get(final String... paths) + { + String result; + + boolean ended = false; + result = null; + int index = 0; + while (!ended) + { + if (index < paths.length) + { + String path = paths[index]; + PathProperty property = getProperty(path); + if (property == null) + { + index += 1; + } + else + { + ended = true; + result = property.getValue(); + } + } + else + { + ended = true; + result = null; + } + } + + // + return result; + } + /** * Gets the by prefix. * @@ -188,7 +229,7 @@ public class PathPropertyList extends ArrayList implements PathPro { PathProperty current = this.get(index); - if (StringUtils.equals(current.getPath(), path)) + if (StringUtils.equalsIgnoreCase(current.getPath(), path)) { ended = true; result = index; @@ -298,7 +339,7 @@ public class PathPropertyList extends ArrayList implements PathPro { PathProperty current = iterator.next(); - if (StringUtils.equals(current.getPath(), path)) + if (StringUtils.equalsIgnoreCase(current.getPath(), path)) { ended = true; result = current; @@ -403,28 +444,20 @@ public class PathPropertyList extends ArrayList implements PathPro @Override public void removePath(final String path) { - String result; - boolean ended = false; Iterator iterator = this.iterator(); - result = null; while (!ended) { if (iterator.hasNext()) { PathProperty current = iterator.next(); - if (StringUtils.equals(current.getPath(), path)) + if (StringUtils.equalsIgnoreCase(current.getPath(), path)) { ended = true; iterator.remove(); } } - else - { - ended = true; - result = null; - } } }