# HG changeset patch # User Sascha L. Teichmann # Date 1308066391 0 # Node ID 1d20533a4ae3e659bb7e29de7ff153af8e718671 # Parent d9fc58e30a5309a3cd7252159ec64834459865ae Bring Oberkante and Unterkante into UI. flys-client/trunk@2116 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r d9fc58e30a53 -r 1d20533a4ae3 flys-client/ChangeLog --- a/flys-client/ChangeLog Tue Jun 14 14:19:45 2011 +0000 +++ b/flys-client/ChangeLog Tue Jun 14 15:46:31 2011 +0000 @@ -1,3 +1,17 @@ +2011-06-14 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/client/shared/model/DistanceInfoRecord.java: + Adjusted table model. + + * src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java, + src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java: + Bring 'Oberkante' and 'Unterkante' into UI. + + * src/main/java/de/intevation/flys/client/client/FLYSConstants.java, + src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: + i18n. Repaired a few wrong encoded strings, too. + 2011-06-14 Sascha L. Teichmann * src/main/java/de/intevation/flys/client/server/DistanceInfoServiceImpl.java, diff -r d9fc58e30a53 -r 1d20533a4ae3 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Tue Jun 14 14:19:45 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Tue Jun 14 15:46:31 2011 +0000 @@ -249,5 +249,9 @@ String error_no_meta_data_found(); String error_chart_info_service(); + + String bottom_edge(); + + String top_edge(); } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r d9fc58e30a53 -r 1d20533a4ae3 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Tue Jun 14 14:19:45 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Tue Jun 14 15:46:31 2011 +0000 @@ -39,6 +39,8 @@ from = From to = To riverside = Riverside +bottom_edge = Bottom edge +top_edge = Top edge name = Name type = Type wq_value = W/Q/D diff -r d9fc58e30a53 -r 1d20533a4ae3 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Jun 14 14:19:45 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Jun 14 15:46:31 2011 +0000 @@ -19,7 +19,7 @@ new_project = Neues Projekt new_calculation = Neue Berechnung module_selection = Modul -river_selection = Gewässer +river_selection = Gew\u00e4sser winfo = WINFO minfo = MINFO map = Neue Karte @@ -27,7 +27,7 @@ databasket = Datenkorb fix = Fixierungsanalyse next = Weiter -location_distance_state = Berechnungsort/strecke wählen +location_distance_state = Berechnungsort/strecke w\u00e4hlen location = Ort distance = Strecke unitFrom = km - @@ -38,17 +38,19 @@ description = Beschreibung from = von to = bis +bottom_edge = Unterkante +top_edge = Oberkante riverside = Flussseite name = Name type = Typ wq_value = W/Q/D river_km = Fluss-Km -wqTitle = Eingabe für W/Q Daten -wqadaptedTitle = Eingabe für W/Q Daten +wqTitle = Eingabe f\u00fcr W/Q Daten +wqadaptedTitle = Eingabe f\u00fcr W/Q Daten calcTableTitle = Berechnungsausgabe wqW = W am Pegel [cm] -wqQ = Q [m³/s] +wqQ = Q [m\u00b3/s] wqSingle = Einzelwerte wqRange = Wertebereich unitWNN = W [NN+m] @@ -56,15 +58,15 @@ unitWFrom = cm - unitWTo = cm a unitWStep = cm -unitQSingle = m³/s -unitQFrom = m³/s - -unitQTo = m³/s a -unitQStep = m³/s +unitQSingle = m\u00b3/s +unitQFrom = m\u00b3/s - +unitQTo = m\u00b3/s a +unitQStep = m\u00b3/s footerHome = Home footerContact = Kontakt footerImpressum = Impressum -buttonNext = Übernehmen +buttonNext = \u00dcbernehmen imageBack = images/back_de.png imageSave = images/save.gif theme_top = images/theme_top.png diff -r d9fc58e30a53 -r 1d20533a4ae3 flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java Tue Jun 14 14:19:45 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java Tue Jun 14 15:46:31 2011 +0000 @@ -195,7 +195,7 @@ ListGridField addDistance = new ListGridField ("", ""); addDistance.setType (ListGridFieldType.ICON); - addDistance.setWidth ("30"); + addDistance.setWidth (20); addDistance.addRecordClickHandler (new RecordClickHandler () { public void onRecordClick (RecordClickEvent e) { if (!isLocationMode ()) { @@ -235,16 +235,27 @@ ddescr.setWidth("*"); ListGridField from = new ListGridField("from", MESSAGES.from()); from.setType(ListGridFieldType.TEXT); - from.setWidth(75); + from.setWidth(40); ListGridField to = new ListGridField("to", MESSAGES.to()); to.setType(ListGridFieldType.TEXT); - to.setWidth(75); + to.setWidth(40); ListGridField dside = new ListGridField("riverside", MESSAGES.riverside()); dside.setType(ListGridFieldType.TEXT); - dside.setWidth(60); + dside.setWidth(40); - distanceTable.setFields(addDistance, ddescr, from, to, dside); + ListGridField bottom = + new ListGridField("bottom", MESSAGES.bottom_edge()); + bottom.setType(ListGridFieldType.TEXT); + bottom.setWidth(30); + + ListGridField top = + new ListGridField("top", MESSAGES.top_edge()); + top.setType(ListGridFieldType.TEXT); + top.setWidth(30); + + distanceTable.setFields( + addDistance, ddescr, from, to, dside, bottom, top); } @@ -260,7 +271,8 @@ ListGridField addLocation = new ListGridField ("", ""); addLocation.setType (ListGridFieldType.ICON); - addLocation.setWidth ("30"); + addLocation.setWidth (20); + addLocation.addRecordClickHandler (new RecordClickHandler () { public void onRecordClick (RecordClickEvent e) { ListGridRecord[] records = locationsTable.getSelection(); @@ -290,11 +302,22 @@ ListGridField lside = new ListGridField("riverside", MESSAGES.riverside()); lside.setType(ListGridFieldType.TEXT); - lside.setWidth(60); + lside.setWidth(40); ListGridField loc = new ListGridField("from", MESSAGES.location()); loc.setType(ListGridFieldType.TEXT); - loc.setWidth(80); - locationsTable.setFields(addLocation, ldescr, loc, lside); + loc.setWidth(40); + + ListGridField bottom = + new ListGridField("bottom", MESSAGES.bottom_edge()); + bottom.setType(ListGridFieldType.TEXT); + bottom.setWidth(30); + + ListGridField top = + new ListGridField("top", MESSAGES.top_edge()); + top.setType(ListGridFieldType.TEXT); + top.setWidth(30); + + locationsTable.setFields(addLocation, ldescr, loc, lside, bottom, top); } @@ -312,12 +335,12 @@ ListGridField addfrom = new ListGridField ("", ""); addfrom.setType (ListGridFieldType.ICON); - addfrom.setWidth ("30"); + addfrom.setWidth (20); addfrom.setCellIcon (IMAGES.markerGreen ().getURL ()); ListGridField addto2 = new ListGridField ("", ""); addto2.setType (ListGridFieldType.ICON); - addto2.setWidth ("30"); + addto2.setWidth (20); addto2.setCellIcon (IMAGES.markerRed ().getURL ()); @@ -328,10 +351,10 @@ ListGridField lside = new ListGridField("riverside", MESSAGES.riverside()); lside.setType(ListGridFieldType.TEXT); - lside.setWidth(60); + lside.setWidth(40); ListGridField loc = new ListGridField("from", MESSAGES.location()); loc.setType(ListGridFieldType.TEXT); - loc.setWidth(80); + loc.setWidth(40); locationDistanceTable.addCellClickHandler (new CellClickHandler () { public void onCellClick (CellClickEvent e) { if (e.getColNum() == 0) { @@ -348,7 +371,18 @@ } } }); - locationDistanceTable.setFields(addfrom, addto2, ldescr, loc, lside); + ListGridField bottom = + new ListGridField("bottom", MESSAGES.bottom_edge()); + bottom.setType(ListGridFieldType.TEXT); + bottom.setWidth(30); + + ListGridField top = + new ListGridField("top", MESSAGES.top_edge()); + top.setType(ListGridFieldType.TEXT); + top.setWidth(30); + + locationDistanceTable.setFields( + addfrom, addto2, ldescr, loc, lside, bottom, top); } diff -r d9fc58e30a53 -r 1d20533a4ae3 flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java Tue Jun 14 14:19:45 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java Tue Jun 14 15:46:31 2011 +0000 @@ -123,6 +123,7 @@ * This method creates a table that contains the location values. */ protected void createLocationTable() { + GWT.log("---------- I WAS HERE ---------"); locationTable.setWidth100(); locationTable.setShowRecordComponents(true); locationTable.setShowRecordComponentsByCell(true); @@ -131,7 +132,7 @@ ListGridField addLocation = new ListGridField ("", ""); addLocation.setType (ListGridFieldType.ICON); - addLocation.setWidth ("30"); + addLocation.setWidth (20); addLocation.addRecordClickHandler (new RecordClickHandler () { public void onRecordClick (RecordClickEvent e) { ListGridRecord[] records = locationTable.getSelection(); @@ -149,11 +150,24 @@ ListGridField lside = new ListGridField("riverside", MESSAGES.riverside()); lside.setType(ListGridFieldType.TEXT); - lside.setWidth(60); + lside.setWidth(40); + ListGridField loc = new ListGridField("from", MESSAGES.location()); loc.setType(ListGridFieldType.TEXT); - loc.setWidth(80); - locationTable.setFields(addLocation, ldescr, loc, lside); + loc.setWidth(40); + + ListGridField bottom = + new ListGridField("bottom", MESSAGES.bottom_edge()); + bottom.setType(ListGridFieldType.TEXT); + bottom.setWidth(30); + + ListGridField top = + new ListGridField("top", MESSAGES.top_edge()); + top.setType(ListGridFieldType.TEXT); + top.setWidth(30); + + locationTable.setFields( + addLocation, ldescr, loc, lside, bottom, top); } diff -r d9fc58e30a53 -r 1d20533a4ae3 flys-client/src/main/java/de/intevation/flys/client/shared/model/DistanceInfoRecord.java --- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/DistanceInfoRecord.java Tue Jun 14 14:19:45 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/DistanceInfoRecord.java Tue Jun 14 15:46:31 2011 +0000 @@ -30,6 +30,8 @@ else setTo(info.getFrom()); setRiverside(info.getRiverside()); + setBottom(info.getBottom()); + setTop(info.getTop()); } @@ -81,6 +83,22 @@ return getAttributeAsString("riverside"); } + public void setBottom(Double bottom) { + setAttribute("bottom", bottom != null ? bottom.toString() : "-"); + } + + public String getBottom() { + return getAttributeAsString("bottom"); + } + + public void setTop(Double top) { + setAttribute("top", top != null ? top.toString() : "-"); + } + + public String getTop() { + return getAttributeAsString("top"); + } + public DistanceInfoObject getDistanceInfo() { return distanceInfo;