Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6ac3a215 by tchemit at 2019-07-23T12:04:47Z Impossible de supprimer une activité LL - Closes #1361 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java ===================================== @@ -24,7 +24,10 @@ package fr.ird.observe.client.ui.actions.content.data.ll.delete; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.open.DeleteOpenDataUIActionSupport; +import fr.ird.observe.client.ui.content.data.ll.logbook.ActivityLonglineLogbookUI; import fr.ird.observe.client.ui.content.data.ps.common.TripSeineUI; +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookDto; +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookReference; import fr.ird.observe.dto.data.ps.common.TripSeineDto; import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.navigation.model.edit.ObserveEditNode; @@ -38,7 +41,7 @@ import static io.ultreia.java4all.i18n.I18n.n; * * @author Tony Chemit - dev@tchemit.fr */ -public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActionSupport<TripSeineDto, TripSeineReference, TripSeineUI> { +public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActionSupport<ActivityLonglineLogbookDto, ActivityLonglineLogbookReference, ActivityLonglineLogbookUI> { public static final String ACTION_NAME = DeleteActivityLonglineLogbookUIAction.class.getName(); private static final Logger log = LogManager.getLogger(DeleteActivityLonglineLogbookUIAction.class); @@ -48,7 +51,7 @@ public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActio } @Override - protected void doDelete(TripSeineUI ui, TripSeineDto bean, ObserveEditNode<TripSeineDto> editNode) { + protected void doDelete(ActivityLonglineLogbookUI ui, ActivityLonglineLogbookDto bean, ObserveEditNode<ActivityLonglineLogbookDto> editNode) { log.info("Will delete Activity " + bean.getId()); String tripId = editNode.getParent().getId(); getServicesProvider().getActivityLonglineLogbookService().delete(bean.getId()); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java ===================================== @@ -24,7 +24,11 @@ package fr.ird.observe.client.ui.actions.content.data.ll.delete; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.open.DeleteOpenDataUIActionSupport; +import fr.ird.observe.client.ui.content.data.ll.observation.ActivityLonglineObsUI; import fr.ird.observe.client.ui.content.data.ps.common.TripSeineUI; +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookDto; +import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsDto; +import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference; import fr.ird.observe.dto.data.ps.common.TripSeineDto; import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.navigation.model.edit.ObserveEditNode; @@ -38,7 +42,7 @@ import static io.ultreia.java4all.i18n.I18n.n; * * @author Tony Chemit - dev@tchemit.fr */ -public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSupport<TripSeineDto, TripSeineReference, TripSeineUI> { +public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSupport<ActivityLonglineObsDto, ActivityLonglineObsReference, ActivityLonglineObsUI> { public static final String ACTION_NAME = DeleteActivityLonglineObsUIAction.class.getName(); private static final Logger log = LogManager.getLogger(DeleteActivityLonglineObsUIAction.class); @@ -48,7 +52,7 @@ public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSup } @Override - protected void doDelete(TripSeineUI ui, TripSeineDto bean, ObserveEditNode<TripSeineDto> editNode) { + protected void doDelete(ActivityLonglineObsUI ui, ActivityLonglineObsDto bean, ObserveEditNode<ActivityLonglineObsDto> editNode) { log.info("Will delete Activity " + bean.getId()); String tripId = editNode.getParent().getId(); getServicesProvider().getActivityLonglineObsService().delete(bean.getId()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6ac3a215e68acd464c1e24b1b53a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6ac3a215e68acd464c1e24b1b53a... You're receiving this email because of your account on gitlab.com.