[Fudaa-svn-commit] SF.net SVN: fudaa:[8596] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 8596
          http://sourceforge.net/p/fudaa/svn/8596
Author:   deniger
Date:     2014-02-03 13:33:27 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
correction erreurs de report

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatTimeKeySimpleToStringTransformer.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatKeySimpleToStringTransformerTest.java

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java	2014-02-03 10:42:53 UTC (rev 8595)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java	2014-02-03 13:33:27 UTC (rev 8596)
@@ -18,6 +18,7 @@
    * Pour les calcul Permanents sera égal à 0
    */
   private final long duree;
+  private final boolean useDay;
   private final String temps;
   private final boolean transitoire;
   public static final ResultatTimeKey NULL_VALUE = new ResultatTimeKey("<NULL>");
@@ -27,6 +28,7 @@
     this.duree = -1;
     temps = StringUtils.EMPTY;
     transitoire = false;
+    useDay = false;
   }
 
   public ResultatTimeKey(String nomCalcul, long duree, boolean useDay) {
@@ -34,8 +36,13 @@
     this.duree = duree;
     temps = DateDurationConverter.durationToDDHHMMSS(new Duration(duree), useDay);
     transitoire = true;
+    this.useDay = useDay;
   }
 
+  public boolean isUseDay() {
+    return useDay;
+  }
+
   public boolean isTransitoire() {
     return transitoire;
   }

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatTimeKeySimpleToStringTransformer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatTimeKeySimpleToStringTransformer.java	2014-02-03 10:42:53 UTC (rev 8595)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatTimeKeySimpleToStringTransformer.java	2014-02-03 13:33:27 UTC (rev 8596)
@@ -13,16 +13,23 @@
  */
 public class ResultatTimeKeySimpleToStringTransformer extends AbstractPropertyToStringTransformer<ResultatTimeKey> {
 
+  public static final String DAY_YES = "DAY";
+  private static final String DAY_NO = "NO_DAY";
+
   public ResultatTimeKeySimpleToStringTransformer() {
     super(ResultatTimeKey.class);
   }
 
+  private static String getDay(ResultatTimeKey key) {
+    return key.isUseDay() ? DAY_YES : DAY_NO;
+  }
+
   @Override
   public String toStringSafe(ResultatTimeKey in) {
     if (in.isPermanent()) {
       return in.getNomCalcul();
     }
-    return in.getNomCalcul() + KeysToStringConverter.MINOR_SEPARATOR + in.getDuree();
+    return in.getNomCalcul() + KeysToStringConverter.MINOR_SEPARATOR + in.getDuree() + KeysToStringConverter.MINOR_SEPARATOR + getDay(in);
   }
 
   @Override
@@ -43,10 +50,14 @@
     if (split.length == 1) {
       return new ResultatTimeKey(nomCalcul);
     }
-    if (split.length == 2) {
+    if (split.length >= 2) {
+      boolean day = false;
+      if (split.length == 3) {
+        day = DAY_YES.equals(split[2]);
+      }
       try {
         Long duree = Long.valueOf(split[1]);
-        return new ResultatTimeKey(nomCalcul, duree);
+        return new ResultatTimeKey(nomCalcul, duree, day);
       } catch (NumberFormatException numberFormatException) {
       }
     }

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java	2014-02-03 10:42:53 UTC (rev 8595)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java	2014-02-03 13:33:27 UTC (rev 8596)
@@ -23,7 +23,7 @@
   @Test
   public void testReadWrite() {
     ReportRunKey current = new ReportRunKey();
-    ResultatTimeKey currentKey = new ResultatTimeKey("calcul", 1234);
+    ResultatTimeKey currentKey = new ResultatTimeKey("calcul", 1234, false);
     KeysToStringConverter converter = new KeysToStringConverter(current);
     AbstractPropertyToStringTransformer<ReportRunVariableTimeKey> transformer = converter.getReportRunVariableTimeKeyConverter();
     ReportRunVariableTimeKey key = new ReportRunVariableTimeKey(current, ReportVariableTypeEnum.READ, "variable", currentKey);
@@ -36,10 +36,11 @@
     ReportRunKey reportRunKeyAlternatif = new ReportRunKey("manager", "run");
     key = new ReportRunVariableTimeKey(reportRunKeyAlternatif, ReportVariableTypeEnum.READ, "variable", currentKey);
     toString = transformer.toString(key);
-    assertEquals("manager;run|variable;read|calcul;1234", toString);
+    assertEquals("manager;run|variable;read|calcul;1234;NO_DAY", toString);
     fromKey = transformer.fromString(toString);
     assertEquals(key, fromKey);
 
 
+
   }
 }

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatKeySimpleToStringTransformerTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatKeySimpleToStringTransformerTest.java	2014-02-03 10:42:53 UTC (rev 8595)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatKeySimpleToStringTransformerTest.java	2014-02-03 13:33:27 UTC (rev 8596)
@@ -28,14 +28,28 @@
   }
 
   @Test
+  public void testForTransitoireOldFormat() {
+    String old = "calcul;1234";
+    ResultatTimeKeySimpleToStringTransformer transformer = new ResultatTimeKeySimpleToStringTransformer();
+    final ResultatTimeKey fromString = transformer.fromString(old);
+    assertFalse(fromString.isUseDay());
+    assertEquals("calcul", fromString.getNomCalcul());
+    assertEquals(1234L, fromString.getDuree());
+
+  }
+
+  @Test
   public void testForTransitoire() {
     ResultatTimeKeySimpleToStringTransformer transformer = new ResultatTimeKeySimpleToStringTransformer();
     final long duree = 12345L;
-    ResultatTimeKey key = new ResultatTimeKey("transitoire", duree);
+    ResultatTimeKey key = new ResultatTimeKey("transitoire", duree, true);
     final String toString = transformer.toString(key);
-    assertEquals(key.getNomCalcul() + KeysToStringConverter.MINOR_SEPARATOR + duree, toString);
+    assertEquals(
+            key.getNomCalcul() + KeysToStringConverter.MINOR_SEPARATOR + duree + KeysToStringConverter.MINOR_SEPARATOR + ResultatTimeKeySimpleToStringTransformer.DAY_YES,
+            toString);
     ResultatTimeKey readKey = transformer.fromString(toString);
     assertEquals(readKey, key);
+    assertTrue(key.isUseDay());
     assertEquals(duree, readKey.getDuree());
     assertTrue(readKey.isTransitoire());
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.