From aa7806282474e802218e2f229182f80d0caaa68a Mon Sep 17 00:00:00 2001 From: Miled Rousset Date: Fri, 30 Jun 2017 09:32:48 +0200 Subject: [PATCH] =?UTF-8?q?reglage=20des=20pr=C3=A9f=C3=A9rences=20pour=20?= =?UTF-8?q?les=20images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opentheso/SelectedBeans/CurrentUser.java | 1 + .../trd/opentheso/SelectedBeans/FileBean.java | 3 +++ .../SelectedBeans/SelectedThesaurus.java | 2 +- .../bdd/helper/nodes/PreferencesHelper.java | 27 +++++++++++++++++++ src/main/resources/language/site.properties | 2 +- .../resources/language/site_de.properties | 4 +-- .../resources/language/site_en.properties | 4 +-- .../resources/language/site_es.properties | 4 +-- .../resources/language/site_it.properties | 4 +-- src/main/webapp/dialogs/prefDlg.xhtml | 2 +- src/main/webapp/panelDroite/image/image.xhtml | 4 +-- 11 files changed, 44 insertions(+), 13 deletions(-) diff --git a/src/main/java/mom/trd/opentheso/SelectedBeans/CurrentUser.java b/src/main/java/mom/trd/opentheso/SelectedBeans/CurrentUser.java index 353e7b7..7e3e3a8 100644 --- a/src/main/java/mom/trd/opentheso/SelectedBeans/CurrentUser.java +++ b/src/main/java/mom/trd/opentheso/SelectedBeans/CurrentUser.java @@ -463,6 +463,7 @@ public void editAllPref() { FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, langueBean.getMsg("error") + " :", langueBean.getMsg("error.BDD"))); return; } + initUserNodePref(idTheso); FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(langueBean.getMsg("info") + " :", langueBean.getMsg("user.info6"))); } diff --git a/src/main/java/mom/trd/opentheso/SelectedBeans/FileBean.java b/src/main/java/mom/trd/opentheso/SelectedBeans/FileBean.java index 0ebe6e8..6ac4cc9 100644 --- a/src/main/java/mom/trd/opentheso/SelectedBeans/FileBean.java +++ b/src/main/java/mom/trd/opentheso/SelectedBeans/FileBean.java @@ -512,6 +512,8 @@ public void chargeImage(FileUploadEvent event) { String suffix = FilenameUtils.getExtension(file.getFileName()); InputStream input = file.getInputstream(); String path = selectedTerme.getUser().nodePreference.getPathImage();//pathImage; + + SimpleDateFormat dateFormatDirectory = new SimpleDateFormat(" dd-MM-yyyy HH-mm-ss"); String dateDirectory = dateFormatDirectory.format(new Date()); @@ -535,6 +537,7 @@ public void chargeImage(FileUploadEvent event) { resizeImage(image.getName()); addFiligrane(image.getName(), source, suffix); + addFiligrane(selectedTerme.getUser().nodePreference.getDossierResize() /*dossierResize*/ + "/" + image.getName(), source, suffix); diff --git a/src/main/java/mom/trd/opentheso/SelectedBeans/SelectedThesaurus.java b/src/main/java/mom/trd/opentheso/SelectedBeans/SelectedThesaurus.java index f77c89c..146e525 100644 --- a/src/main/java/mom/trd/opentheso/SelectedBeans/SelectedThesaurus.java +++ b/src/main/java/mom/trd/opentheso/SelectedBeans/SelectedThesaurus.java @@ -401,7 +401,7 @@ public SelectedThesaurus() { } - private void majPref() { + public void majPref() { if(user == null || user.getNodePreference() == null) return; cheminSite = user.getNodePreference().getCheminSite();//bundlePref.getString("cheminSite"); diff --git a/src/main/java/mom/trd/opentheso/bdd/helper/nodes/PreferencesHelper.java b/src/main/java/mom/trd/opentheso/bdd/helper/nodes/PreferencesHelper.java index 771b530..530478b 100644 --- a/src/main/java/mom/trd/opentheso/bdd/helper/nodes/PreferencesHelper.java +++ b/src/main/java/mom/trd/opentheso/bdd/helper/nodes/PreferencesHelper.java @@ -210,6 +210,7 @@ public boolean updateAllPreferenceUser(HikariDataSource ds, NodePreference np, S boolean status = false; StringPlus stringPlus = new StringPlus(); + np = normalizeDatas(np); try { conn = ds.getConnection(); @@ -260,6 +261,32 @@ public boolean updateAllPreferenceUser(HikariDataSource ds, NodePreference np, S return status; } + /** + * permet de nettoyer les "/" et préparer les paramètres correctement + * @param nodePreference + * @return + */ + private NodePreference normalizeDatas(NodePreference nodePreference) { + + // vérification des "/" à la fin + if(!nodePreference.getCheminSite().isEmpty()) { + if(!nodePreference.getCheminSite().substring(nodePreference.getCheminSite().length() - 1, nodePreference.getCheminSite().length()).equalsIgnoreCase("/")) { + nodePreference.setCheminSite(nodePreference.getCheminSite() + "/"); + } + } + if(!nodePreference.getServeurArk().isEmpty()) { + if(!nodePreference.getServeurArk().substring(nodePreference.getServeurArk().length() - 1, nodePreference.getServeurArk().length()).equalsIgnoreCase("/")) { + nodePreference.setServeurArk(nodePreference.getServeurArk() + "/"); + } + } + if(!nodePreference.getPathImage().isEmpty()) { + if(!nodePreference.getPathImage().substring(nodePreference.getPathImage().length() - 1, nodePreference.getPathImage().length()).equalsIgnoreCase("/")) { + nodePreference.setPathImage(nodePreference.getPathImage() + "/"); + } + } + return nodePreference; + } + } diff --git a/src/main/resources/language/site.properties b/src/main/resources/language/site.properties index b1cad3e..128309c 100644 --- a/src/main/resources/language/site.properties +++ b/src/main/resources/language/site.properties @@ -607,7 +607,7 @@ gps.delete=Supprimer les coordonn\u00e9s image.add=Ajouter une image image.delete=Supprimer import.total=total -conf.modifPref=Modifier les pr\u00e9f\u00e9rences +conf.modifPref=Pr\u00e9f\u00e9rences conf.newId=Reg\u00e9n\u00e9rer de nouveaux indentifiants conf.newIdExplication=Remplace tous les id des concepts et des groupes par des nouveaux id concept.setId=modifier l'identifiant diff --git a/src/main/resources/language/site_de.properties b/src/main/resources/language/site_de.properties index 57408a1..2bda833 100644 --- a/src/main/resources/language/site_de.properties +++ b/src/main/resources/language/site_de.properties @@ -578,7 +578,7 @@ gps.delete=l\u00f6schen koordiniert image.add=Bild hinzuf\u00fcgen image.delete=entfernen import.total=gesamt -conf.modifPref=Modifier les pr\u00e9f\u00e9rences +conf.modifPref=Einstellung conf.newId=Regenerieren Sie neue indentifiants conf.newIdExplication=Ersetzt alle ID-Konzepte und Gruppen mit neuen id -concept.setId=modifier l'identifiant +concept.setId=\u00c4ndern des Identifizierers diff --git a/src/main/resources/language/site_en.properties b/src/main/resources/language/site_en.properties index 2ba2704..ce7f3db 100644 --- a/src/main/resources/language/site_en.properties +++ b/src/main/resources/language/site_en.properties @@ -577,7 +577,7 @@ gps.delete=Remove coordinates image.add=Add image image.delete=Delete import.total=totale -conf.modifPref=Modifier les pr\u00e9f\u00e9rences +conf.modifPref=Setting conf.newId=Regenerating new identifiers conf.newIdExplication=Replaces all ids of concepts and groups with new ids -concept.setId=modifier l'identifiant +concept.setId=Modify the identifier diff --git a/src/main/resources/language/site_es.properties b/src/main/resources/language/site_es.properties index 057d38f..5188d52 100644 --- a/src/main/resources/language/site_es.properties +++ b/src/main/resources/language/site_es.properties @@ -578,7 +578,7 @@ gps.delete=eliminar coordinada image.add=Agregar imagen image.delete=Quitar import.total=total -conf.modifPref=Modifier les pr\u00e9f\u00e9rences +conf.modifPref=preferencias conf.newId=Regenerar nuevos indentifiants conf.newIdExplication=Reemplaza todos los conceptos de identidad y grupos con nueva identificaci\u00f3n -concept.setId=modifier l'identifiant +concept.setId=modificar el identificador diff --git a/src/main/resources/language/site_it.properties b/src/main/resources/language/site_it.properties index 75e7822..27f4508 100644 --- a/src/main/resources/language/site_it.properties +++ b/src/main/resources/language/site_it.properties @@ -577,7 +577,7 @@ gps.delete=Eliminare coordinato image.add=Aggiungi immagine image.delete=rimuovere import.total=totale -conf.modifPref=Modifier les pr\u00e9f\u00e9rences +conf.modifPref=preferenze conf.newId=Rigenerare nuove indentifiants conf.newIdExplication=Sostituisce tutti gli id delli concept e gruppi con nuovo ID -concept.setId=modifier l'identifiant +concept.setId=modificare l'identificatore diff --git a/src/main/webapp/dialogs/prefDlg.xhtml b/src/main/webapp/dialogs/prefDlg.xhtml index 0ed791b..6fb255e 100644 --- a/src/main/webapp/dialogs/prefDlg.xhtml +++ b/src/main/webapp/dialogs/prefDlg.xhtml @@ -129,7 +129,7 @@ - + diff --git a/src/main/webapp/panelDroite/image/image.xhtml b/src/main/webapp/panelDroite/image/image.xhtml index d54d33d..dd364b7 100644 --- a/src/main/webapp/panelDroite/image/image.xhtml +++ b/src/main/webapp/panelDroite/image/image.xhtml @@ -31,7 +31,7 @@ - @@ -49,7 +49,7 @@
- +