Author: kmorin Date: 2013-02-18 16:17:03 +0100 (Mon, 18 Feb 2013) New Revision: 447 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/447 Log: - fixes 2010 [TRAIT] Edition - L'onglet ne se colorise plus ?\195?\160 la s?\195?\169lection de "trait valide" ou "trait invalide" - fixes 2011 [CAMPAGNE] Trier les listes de personnes par ordre des noms de famille Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-02-18 09:57:55 UTC (rev 446) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-02-18 15:17:03 UTC (rev 447) @@ -101,20 +101,20 @@ <cell anchor='west'> <JLabel id='programLabel'/> </cell> - <cell weightx='0.3'> + <cell weightx='1'> <BeanComboBox id='surveyComboBox' constructorParams='this' genericType='Program'/> </cell> <cell anchor='west'> <JLabel id='yearLabel'/> </cell> - <cell weightx='0.3'> + <cell weightx='1'> <NumberEditor id='yearField' constructorParams='this'/> </cell> <cell> <JLabel id='surveyPartLabel'/> </cell> - <cell weightx='0.3'> + <cell weightx='1'> <JTextField id='surveyPartField' onKeyReleased='handler.setText(event, "surveyPart")'/> </cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-18 09:57:55 UTC (rev 446) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-18 15:17:03 UTC (rev 447) @@ -44,6 +44,8 @@ import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import static org.nuiton.i18n.I18n._; @@ -230,6 +232,19 @@ getGearList(model.getVesselType()), model.getGear()); + //TODO kmorin 20130218 remove this sort when the double lists will be sortable + Collections.sort(users, new Comparator<Person>() { + + public int compare(Person o1, Person o2) { + if (o1 == null) { + return -1; + } + if (o2 == null) { + return 1; + } + return o1.getFirstName().compareTo(o2.getFirstName()); + } + }); initBeanList(ui.getHeadOfMissionList(), users, model.getHeadOfMission()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-18 09:57:55 UTC (rev 446) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-18 15:17:03 UTC (rev 447) @@ -411,6 +411,7 @@ #trawlDistanceLabel { text: "tutti.label.fishingOperation.trawlDistance"; labelFor: {trawlDistanceField}; + toolTipText: {getStringValue(model.getTrawlDistance() != null ? model.getTrawlDistance() / 1852 : null)}; } #trawlDistanceField { @@ -419,6 +420,7 @@ useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; enabled: {!model.isFishingOperationRectiligne()}; + toolTipText: {getStringValue(model.getTrawlDistance() != null ? model.getTrawlDistance() / 1852 : null)}; } #durationLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-18 09:57:55 UTC (rev 446) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-18 15:17:03 UTC (rev 447) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; import fr.ifremer.tutti.service.PersistenceService; @@ -44,6 +45,8 @@ import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import java.awt.Color; +import java.awt.Component; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.time.DateUtils; @@ -55,6 +58,8 @@ import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.List; @@ -199,6 +204,26 @@ } }); + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + Boolean valid = (Boolean) evt.getNewValue(); + Color color = null; + Color fontColor = Color.BLACK; + if (valid == Boolean.TRUE) { + color = Color.GREEN; + + } else if (valid == Boolean.FALSE) { + color = Color.RED; + fontColor = Color.WHITE; + } + Component tab = getTabPanel().getTabComponentAt(0); + tab.setForeground(fontColor); + tab.setBackground(color); + } + }); + ui.setContextValue(model); fishingOperationMonitor.setBean(model); @@ -214,8 +239,22 @@ initUI(ui); + List<Person> people = persistenceService.getAllPerson(); + //TODO kmorin 20130218 remove this sort when the double lists will be sortable + Collections.sort(people, new Comparator<Person>() { + + public int compare(Person o1, Person o2) { + if (o1 == null) { + return -1; + } + if (o2 == null) { + return 1; + } + return o1.getFirstName().compareTo(o2.getFirstName()); + } + }); initBeanList(ui.getSaisisseurList(), - persistenceService.getAllPerson(), + people, model.getSaisisseur()); initBeanComboBox(ui.getVesselComboBox(),