Author: tchemit Date: 2012-09-25 12:15:57 +0200 (Tue, 25 Sep 2012) New Revision: 711 Url: http://forge.codelutin.com/repositories/revision/echobase/711 Log: change dashboard column names Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-25 10:15:57 UTC (rev 711) @@ -36,34 +36,44 @@ public enum ImportType implements I18nAble { /** Import a voyage with all his data. */ - VOYAGE(n_("echobase.common.importType.voyage")), + VOYAGE(n_("echobase.common.importType.voyage"), + n_("echobase.common.importType.voyage.short")), /** Import Voyage / Transit / Transect. */ - COMMON_ALL(n_("echobase.common.importType.commonDataAll")), + COMMON_ALL(n_("echobase.common.importType.commonDataAll"), + n_("echobase.common.importType.commonDataAll.short")), /** Import all common data from Transect to Operation. */ - COMMON_TRANSECT(n_("echobase.common.importType.commonDataTransect")), + COMMON_TRANSECT(n_("echobase.common.importType.commonDataTransect"), + n_("echobase.common.importType.commonDataTransect.short")), /** Import operations common data. */ - OPERATION(n_("echobase.common.importType.operation")), + OPERATION(n_("echobase.common.importType.operation"), + n_("echobase.common.importType.operation.short")), /** Import catches data (unsorted, total, but no individual ones). */ - CATCHES(n_("echobase.common.importType.catches")), + CATCHES(n_("echobase.common.importType.catches"), + n_("echobase.common.importType.catches.short")), /** Import accoustic data (Cells ESDU and Elementary). */ - ACOUSTIC(n_("echobase.common.importType.acoustic")), + ACOUSTIC(n_("echobase.common.importType.acoustic"), + n_("echobase.common.importType.acoustic.short")), /** Import results at voyage level. */ - RESULT_VOYAGE(n_("echobase.common.importType.resultsVoyage")), + RESULT_VOYAGE(n_("echobase.common.importType.resultsVoyage"), + n_("echobase.common.importType.resultsVoyage.short")), /** Import esdu results by echotype. */ - RESULT_ESDU(n_("echobase.common.importType.resultsEsdu")), + RESULT_ESDU(n_("echobase.common.importType.resultsEsdu"), + n_("echobase.common.importType.resultsEsdu.short")), /** Import cells Region. */ - RESULT_REGION(n_("echobase.common.importType.resultsRegion")), + RESULT_REGION(n_("echobase.common.importType.resultsRegion"), + n_("echobase.common.importType.resultsRegion.short")), /** Import cells Map. */ - RESULT_MAP(n_("echobase.common.importType.resultsMap")); + RESULT_MAP(n_("echobase.common.importType.resultsMap"), + n_("echobase.common.importType.resultsMap.short")); /** * All common import types. @@ -87,8 +97,11 @@ private final String i18nKey; - ImportType(String i18nKey) { + private final String shortI18nKey; + + ImportType(String i18nKey, String shortI18nKey) { this.i18nKey = i18nKey; + this.shortI18nKey = shortI18nKey; } @Override @@ -96,6 +109,10 @@ return i18nKey; } + public String getShortI18nKey() { + return shortI18nKey; + } + public static ImportType[] getCommonImportType() { return COMMON_IMPORT_TYPES; } Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-25 10:15:57 UTC (rev 711) @@ -1,15 +1,25 @@ echobase.common.driverType.h2=H2 Database echobase.common.driverType.postgres=Postgresql Database echobase.common.importType.acoustic=Acoustic data import +echobase.common.importType.acoustic.short=Acoustic echobase.common.importType.catches=Fishing data import +echobase.common.importType.catches.short=Fishing echobase.common.importType.commonDataAll=Voyage / Transit / Transects import +echobase.common.importType.commonDataAll.short=V/T/T echobase.common.importType.commonDataTransect=Transects import +echobase.common.importType.commonDataTransect.short=Transect echobase.common.importType.operation=Operations data import +echobase.common.importType.operation.short=Operation echobase.common.importType.resultsEsdu=Import the “ESDU” cells results +echobase.common.importType.resultsEsdu.short=R ESDU echobase.common.importType.resultsMap=Import the “map” cells results +echobase.common.importType.resultsMap.short=Map echobase.common.importType.resultsRegion=Import the “region” cells results +echobase.common.importType.resultsRegion.short=Region echobase.common.importType.resultsVoyage=Import the voyage-related results +echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Voyage import +echobase.common.importType.voyage.short=Voyage echobase.config.csv.separator.description=Csv separator character echobase.config.data.directory.description=Path to application data echobase.config.documentationUrl.description=Where to find EchoBase online documentation Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-25 10:15:57 UTC (rev 711) @@ -1,15 +1,25 @@ echobase.common.driverType.h2=Base H2 echobase.common.driverType.postgres=Base Postgresql echobase.common.importType.acoustic=Import des données acoustiques +echobase.common.importType.acoustic.short=Acoustique echobase.common.importType.catches=Import des données de pêche +echobase.common.importType.catches.short=Pêche echobase.common.importType.commonDataAll=Import Voyage / Transit / Transects +echobase.common.importType.commonDataAll.short=V/T/T echobase.common.importType.commonDataTransect=Import Transects +echobase.common.importType.commonDataTransect.short=Transects echobase.common.importType.operation=Import des opérations +echobase.common.importType.operation.short=Opérations echobase.common.importType.resultsEsdu=Import des résultats des cellules de type "ESDU" +echobase.common.importType.resultsEsdu.short=R ESDU echobase.common.importType.resultsMap=Import des cellules de type Carte +echobase.common.importType.resultsMap.short=Carte echobase.common.importType.resultsRegion=Import des cellules de type Région +echobase.common.importType.resultsRegion.short=Région echobase.common.importType.resultsVoyage=Import des résultats du voyage +echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Import Campagne +echobase.common.importType.voyage.short=Campagne echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv echobase.config.data.directory.description=Répertoire des données de l'application echobase.config.documentationUrl.description=Où trouver la documentation en ligne d'EchoBase Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-25 10:15:57 UTC (rev 711) @@ -23,10 +23,12 @@ * #L% */ +import com.google.common.collect.Lists; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import java.util.Map; +import java.io.Serializable; +import java.util.List; /** * DashBoard of existing voyages. @@ -38,16 +40,53 @@ private static final long serialVersionUID = 1L; - protected Map<String, String> importTypes; + protected List<ImportTypeEntry> importTypes; - public Map<String, String> getImportTypes() { + public List<ImportTypeEntry> getImportTypes() { return importTypes; } @Override public String execute() throws Exception { - importTypes = decorateEnums(ImportType.values()); + importTypes = Lists.newLinkedList(); + for (ImportType importType : ImportType.values()) { + ImportTypeEntry entry = new ImportTypeEntry( + importType.name(), + _(importType.getShortI18nKey()), + _(importType.getI18nKey()) + ); + importTypes.add(entry); + } return SUCCESS; } + + public static class ImportTypeEntry implements Serializable { + + private static final long serialVersionUID = 1L; + + protected String name; + + protected String label; + + protected String title; + + public ImportTypeEntry(String name, String label, String title) { + this.name = name; + this.label = label; + this.title = title; + } + + public String getName() { + return name; + } + + public String getLabel() { + return label; + } + + public String getTitle() { + return title; + } + } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-25 10:15:57 UTC (rev 711) @@ -101,6 +101,10 @@ return result; } + function formatVoyageName(cellvalue, options, rowObject) { + return rowObject['id_lbl']; + } + jQuery(document).ready(function () { // display voyage infos @@ -118,12 +122,9 @@ }); $.addEvenAndOddClasses('voyages'); }); - - </script> <title><s:text name="echobase.title.dashboard"/></title> - <s:url id="loadUrl" action="getDashboardImportLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="voyages" dataType="json" href="%{loadUrl}" gridModel="datas" @@ -137,12 +138,13 @@ onCompleteTopics="voyages-clearSelect,voyages-CompleteTopics"> <sjg:gridColumn name="id" title="id" hidden="true"/> - <sjg:gridColumn name="id_lbl" sortable="true" + <sjg:gridColumn name="name" sortable="true" formatter="formatVoyageName" title="%{getText('echobase.common.voyage')}"/> - <s:iterator value="%{importTypes.entrySet()}" var="entry"> - <sjg:gridColumn name="importType.%{#entry.key}" sortable="true" - title="%{#entry.value}" formatter="formatImportLogs"/> + <s:iterator value="%{importTypes}" var="entry"> + <sjg:gridColumn name="importType.%{#entry.name}" sortable="false" + title="%{#entry.label}" tooltip="%{#entry.title}" + formatter="formatImportLogs"/> </s:iterator> </sjg:grid> <br/> @@ -214,7 +216,7 @@ <s:label key='echobase.common.importText' value=''/> <div class="floatLeft"> - <pre id='importLogText' style="font-weight: bold;"></pre> + <pre id='importLogText' style="font-weight: bold;"></pre> </div> <br/>