lfa/enh/duration

CHANGELOG.adoc

@@ -13,6 +13,9 @@
 - https://github.com/ObeoNetwork/pepper/issues/52[#52] Change task creation in Gantt from creating a sibling task to a child task.
 - https://github.com/ObeoNetwork/pepper/issues/59[#59] Add concept of unavailability Period on Resource.
 - https://github.com/ObeoNetwork/pepper/issues/89[#89] Make duration (AbstractTask and Workpackage) computed from non working days. For now, it corresponds to week-end and french public holidays 2026.
+- https://github.com/ObeoNetwork/pepper/issues/90[#90] Display the duration of AbstractTask in days, rounding to the nearest half-day.
+- https://github.com/ObeoNetwork/pepper/issues/89[#89] Make duration (AbstractTask and Workpackage) computed from non working days. For now, it corresponds to week-end and french public holidays 2026.
+- https://github.com/ObeoNetwork/pepper/issues/94[#94] Rename the dependency link duration to dependency link delay and display the delay in days
 
 === Bug fixes
 

backend/pepper-edit/src/main/java/pepper/peppermm/provider/DependencyLinkItemProvider.java

@@ -63,7 +63,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 			addTargetKindPropertyDescriptor(object);
 			addSourceKindPropertyDescriptor(object);
 			addSourcePropertyDescriptor(object);
-			addDurationPropertyDescriptor(object);
+			addDelayPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -132,18 +132,19 @@ protected void addSourcePropertyDescriptor(Object object) {
 	}
 
     /**
-	 * This adds a property descriptor for the Duration feature.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This adds a property descriptor for the Delay feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    protected void addDurationPropertyDescriptor(Object object) {
+	protected void addDelayPropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_DependencyLink_duration_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DependencyLink_duration_feature", "_UI_DependencyLink_type"),
-				 PepperPackage.Literals.DEPENDENCY_LINK__DURATION,
+				 getString("_UI_DependencyLink_delay_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_DependencyLink_delay_feature", "_UI_DependencyLink_type"),
+				 PepperPackage.Literals.DEPENDENCY_LINK__DELAY,
 				 true,
 				 false,
 				 false,
@@ -152,7 +153,7 @@ protected void addDurationPropertyDescriptor(Object object) {
 				 null));
 	}
 
-    /**
+				/**
 	 * This returns DependencyLink.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
@@ -200,7 +201,7 @@ public void notifyChanged(Notification notification) {
 			case PepperPackage.DEPENDENCY_LINK__TARGET_KIND:
 			case PepperPackage.DEPENDENCY_LINK__SOURCE_KIND:
 			case PepperPackage.DEPENDENCY_LINK__SOURCE:
-			case PepperPackage.DEPENDENCY_LINK__DURATION:
+			case PepperPackage.DEPENDENCY_LINK__DELAY:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}

backend/pepper-edit/src/main/resources/plugin.properties

@@ -71,8 +71,7 @@ _UI_AbstractTask_assignedPersons_feature = Assigned Persons
 _UI_AbstractTask_assignedTeams_feature = Assigned Teams
 _UI_AbstractTask_subTasks_feature = Sub Tasks
 _UI_AbstractTask_calculationOption_feature = Calculation Option
-_UI_AbstractTask_durationDelay_feature = Delay (H)
-_UI_AbstractTask_duration_feature = Duration (Hours)
+_UI_AbstractTask_duration_feature = Duration (Days)
 _UI_TagFolder_name_feature = Name
 _UI_TagFolder_ownedTags_feature = Owned Tags
 _UI_TagFolder_subFolders_feature = Sub Folders
@@ -123,7 +122,7 @@ _UI_Workpackage_ownedTasks_feature = Owned Tasks
 _UI_Workpackage_ownedObjectives_feature = Owned Objectives
 _UI_Workpackage_progress_feature = Progress
 _UI_Workpackage_calculationOption_feature = Calculation Option
-_UI_Workpackage_dependencyDelay_feature = Delay (D)
+_UI_Workpackage_dependencyDelay_feature = Delay (Days)
 _UI_Workpackage_duration_feature = Duration (Days)
 _UI_WorkpackageArtefact_name_feature = Name
 _UI_WorkpackageArtefact_description_feature = Description
@@ -147,9 +146,8 @@ _UI_DependencyLink_targetKind_feature = Target Kind
 _UI_DependencyLink_sourceKind_feature = Source Kind
 _UI_DependencyLink_source_feature = Source
 _UI_DependencyLink_target_feature = Target
-_UI_DependencyLink_duration_feature = Duration
-_UI_DependencyLink_durationDay_feature = (Days)
-_UI_DependencyLink_durationHours_feature = (Hours)
+_UI_DependencyLink_delay_feature=Delay (Days)
+_UI_DependencyLink_delayDayUnit = Days
 _UI_DependencyRelatedObject_dependencies_feature = Dependencies
 _UI_TaskTimeBoundariesConstraint_StartEnd_feature = Start - End
 _UI_TaskTimeBoundariesConstraint_EndDuration_feature = End - Duration

backend/pepper-edit/src/main/resources/plugin_fr.properties

@@ -70,8 +70,7 @@ _UI_AbstractTask_assignedPersons_feature = Personnes Assign\u00E9es
 _UI_AbstractTask_assignedTeams_feature = Equipes Assign\u00E9es
 _UI_AbstractTask_subTasks_feature = Sous t\u00E2ches
 _UI_AbstractTask_calculationOption_feature = Option de calcul
-_UI_AbstractTask_durationDelay_feature = Délais (H)
-_UI_AbstractTask_duration_feature = Dur\u00E9e (Heures)
+_UI_AbstractTask_duration_feature = Dur\u00E9e (Jours)
 _UI_TagFolder_name_feature = Nom
 _UI_TagFolder_ownedTags_feature = Tags
 _UI_TagFolder_subFolders_feature = Sous r\u00E9pertoires
@@ -122,7 +121,7 @@ _UI_Workpackage_ownedTasks_feature = Taches
 _UI_Workpackage_ownedObjectives_feature = Objectifs
 _UI_Workpackage_progress_feature = Progr\u00E8s
 _UI_Workpackage_calculationOption_feature = Option de calcul
-_UI_Workpackage_dependencyDelay_feature = Délais (J)
+_UI_Workpackage_dependencyDelay_feature = Délai (Jours)
 _UI_Workpackage_duration_feature = Durée (Jours)
 _UI_WorkpackageArtefact_name_feature = Nom
 _UI_WorkpackageArtefact_description_feature = Description
@@ -146,9 +145,8 @@ _UI_DependencyLink_targetKind_feature = Type cible
 _UI_DependencyLink_sourceKind_feature = Type source
 _UI_DependencyLink_source_feature = Source
 _UI_DependencyLink_target_feature = Cible
-_UI_DependencyLink_duration_feature = Durée
-_UI_DependencyLink_durationDay_feature = (Jours)
-_UI_DependencyLink_durationHours_feature = (Heures)
+_UI_DependencyLink_delay_feature=Délai (Jours)
+_UI_DependencyLink_delayDayUnit = Jours
 _UI_DependencyRelatedObject_dependencies_feature = Dépendances
 _UI_TaskTimeBoundariesConstraint_StartEnd_feature = Début - Fin
 _UI_TaskTimeBoundariesConstraint_EndDuration_feature = Fin - Durée

backend/pepper-mm/src/main/java/pepper/peppermm/DependencyLink.java

@@ -24,7 +24,7 @@
  *   <li>{@link pepper.peppermm.DependencyLink#getTargetKind <em>Target Kind</em>}</li>
  *   <li>{@link pepper.peppermm.DependencyLink#getSourceKind <em>Source Kind</em>}</li>
  *   <li>{@link pepper.peppermm.DependencyLink#getSource <em>Source</em>}</li>
- *   <li>{@link pepper.peppermm.DependencyLink#getDuration <em>Duration</em>}</li>
+ *   <li>{@link pepper.peppermm.DependencyLink#getDelay <em>Delay</em>}</li>
  * </ul>
  *
  * @see pepper.peppermm.PepperPackage#getDependencyLink()
@@ -110,25 +110,25 @@ public interface DependencyLink extends EObject {
     void setSource(DependencyRelatedObject value);
 
     /**
-	 * Returns the value of the '<em><b>Duration</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the value of the '<em>Duration</em>' attribute.
-	 * @see #setDuration(int)
-	 * @see pepper.peppermm.PepperPackage#getDependencyLink_Duration()
+	 * Returns the value of the '<em><b>Delay</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Delay</em>' attribute.
+	 * @see #setDelay(int)
+	 * @see pepper.peppermm.PepperPackage#getDependencyLink_Delay()
 	 * @model
 	 * @generated
 	 */
-    int getDuration();
+	int getDelay();
 
-    /**
-     * Sets the value of the '{@link DependencyLink#getDuration <em>Duration</em>}' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @param value
-     *            the new value of the '<em>Duration</em>' attribute.
-     * @see #getDuration()
-     * @generated
-     */
-    void setDuration(int value);
+				/**
+	 * Sets the value of the '{@link pepper.peppermm.DependencyLink#getDelay <em>Delay</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Delay</em>' attribute.
+	 * @see #getDelay()
+	 * @generated
+	 */
+	void setDelay(int value);
 
 } // DependencyLink

backend/pepper-mm/src/main/java/pepper/peppermm/PepperPackage.java

@@ -1611,14 +1611,15 @@ public interface PepperPackage extends EPackage {
     int DEPENDENCY_LINK__SOURCE = 2;
 
     /**
-	 * The feature id for the '<em><b>Duration</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Delay</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-    int DEPENDENCY_LINK__DURATION = 3;
+	int DEPENDENCY_LINK__DELAY = 3;
 
-    /**
+				/**
 	 * The number of structural features of the '<em>Dependency Link</em>' class.
 	 * <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -2928,16 +2929,17 @@ public interface PepperPackage extends EPackage {
     EReference getDependencyLink_Source();
 
     /**
-	 * Returns the meta object for the attribute '{@link pepper.peppermm.DependencyLink#getDuration <em>Duration</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration</em>'.
-	 * @see pepper.peppermm.DependencyLink#getDuration()
+	 * Returns the meta object for the attribute '{@link pepper.peppermm.DependencyLink#getDelay <em>Delay</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Delay</em>'.
+	 * @see pepper.peppermm.DependencyLink#getDelay()
 	 * @see #getDependencyLink()
 	 * @generated
 	 */
-    EAttribute getDependencyLink_Duration();
+	EAttribute getDependencyLink_Delay();
 
-    /**
+				/**
 	 * Returns the meta object for class '{@link pepper.peppermm.DependencyRelatedObject <em>Dependency Related Object</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Dependency Related Object</em>'.
@@ -4048,14 +4050,14 @@ interface Literals {
         EReference DEPENDENCY_LINK__SOURCE = eINSTANCE.getDependencyLink_Source();
 
         /**
-		 * The meta object literal for the '<em><b>Duration</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+		 * The meta object literal for the '<em><b>Delay</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-        EAttribute DEPENDENCY_LINK__DURATION = eINSTANCE.getDependencyLink_Duration();
+		EAttribute DEPENDENCY_LINK__DELAY = eINSTANCE.getDependencyLink_Delay();
 
-        /**
+								/**
 		 * The meta object literal for the '{@link pepper.peppermm.DependencyRelatedObject <em>Dependency Related Object</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see pepper.peppermm.DependencyRelatedObject

backend/pepper-mm/src/main/java/pepper/peppermm/impl/DependencyLinkImpl.java

@@ -91,26 +91,26 @@ public class DependencyLinkImpl extends MinimalEObjectImpl.Container implements
     protected DependencyRelatedObject source;
 
     /**
-	 * The default value of the '{@link #getDuration() <em>Duration</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-	 * @see #getDuration()
+	 * The default value of the '{@link #getDelay() <em>Delay</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDelay()
 	 * @generated
 	 * @ordered
 	 */
-    protected static final int DURATION_EDEFAULT = 0;
+	protected static final int DELAY_EDEFAULT = 0;
 
-    /**
-	 * The cached value of the '{@link #getDuration() <em>Duration</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-	 * @see #getDuration()
+				/**
+	 * The cached value of the '{@link #getDelay() <em>Delay</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDelay()
 	 * @generated
 	 * @ordered
 	 */
-    protected int duration = DURATION_EDEFAULT;
+	protected int delay = DELAY_EDEFAULT;
 
-    /**
+				/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -207,27 +207,29 @@ public void setSource(DependencyRelatedObject newSource) {
 	}
 
     /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    @Override
-    public int getDuration() {
-		return duration;
+	@Override
+	public int getDelay() {
+		return delay;
 	}
 
-    /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+				/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    @Override
-    public void setDuration(int newDuration) {
-		int oldDuration = duration;
-		duration = newDuration;
+	@Override
+	public void setDelay(int newDelay) {
+		int oldDelay = delay;
+		delay = newDelay;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PepperPackage.DEPENDENCY_LINK__DURATION, oldDuration, duration));
+			eNotify(new ENotificationImpl(this, Notification.SET, PepperPackage.DEPENDENCY_LINK__DELAY, oldDelay, delay));
 	}
 
-    /**
+				/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -241,8 +243,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
 			case PepperPackage.DEPENDENCY_LINK__SOURCE:
 				if (resolve) return getSource();
 				return basicGetSource();
-			case PepperPackage.DEPENDENCY_LINK__DURATION:
-				return getDuration();
+			case PepperPackage.DEPENDENCY_LINK__DELAY:
+				return getDelay();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -263,8 +265,8 @@ public void eSet(int featureID, Object newValue) {
 			case PepperPackage.DEPENDENCY_LINK__SOURCE:
 				setSource((DependencyRelatedObject)newValue);
 				return;
-			case PepperPackage.DEPENDENCY_LINK__DURATION:
-				setDuration((Integer)newValue);
+			case PepperPackage.DEPENDENCY_LINK__DELAY:
+				setDelay((Integer)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -286,8 +288,8 @@ public void eUnset(int featureID) {
 			case PepperPackage.DEPENDENCY_LINK__SOURCE:
 				setSource((DependencyRelatedObject)null);
 				return;
-			case PepperPackage.DEPENDENCY_LINK__DURATION:
-				setDuration(DURATION_EDEFAULT);
+			case PepperPackage.DEPENDENCY_LINK__DELAY:
+				setDelay(DELAY_EDEFAULT);
 				return;
 		}
 		super.eUnset(featureID);
@@ -306,8 +308,8 @@ public boolean eIsSet(int featureID) {
 				return sourceKind != SOURCE_KIND_EDEFAULT;
 			case PepperPackage.DEPENDENCY_LINK__SOURCE:
 				return source != null;
-			case PepperPackage.DEPENDENCY_LINK__DURATION:
-				return duration != DURATION_EDEFAULT;
+			case PepperPackage.DEPENDENCY_LINK__DELAY:
+				return delay != DELAY_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -325,8 +327,8 @@ public String toString() {
 		result.append(targetKind);
 		result.append(", sourceKind: ");
 		result.append(sourceKind);
-		result.append(", duration: ");
-		result.append(duration);
+		result.append(", delay: ");
+		result.append(delay);
 		result.append(')');
 		return result.toString();
 	}